Changeset 81e420c in nscp for modules/NRPEServer

Timestamp:

09/01/11 07:05:41 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

3b11e65

Parents:

1307e3f5

Message:

• Added support for loading same plugin twice (in different sessions)
• Added preliminary support for routing passive checks

Location:

modules/NRPEServer

Files:

• NRPEServer.cpp (modified) (2 diffs)
• NRPEServer.h (modified) (2 diffs)

modules/NRPEServer/NRPEServer.cpp

@@ -32 +32 @@
 namespace sh = nscapi::settings_helper;
 
-NRPEListener gNRPEListener;
 
 NRPEListener::NRPEListener() : info_(boost::shared_ptr<nrpe::server::handler>(new handler_impl(1024))) {
@@ -183 +182 @@
 }
 
-
-
-
-// void NRPEListener::onAccept(simpleSocket::Socket *client) 
-// {
-//  if (!allowedHosts.inAllowedHosts(client->getAddr())) {
-//    NSC_LOG_ERROR(_T("Unauthorize access from: ") + client->getAddrString());
-//    client->close();
-//    return;
-//  }
-//  try {
-//    simpleSocket::DataBuffer block;
-//    int i;
-//    int maxWait = socketTimeout_*10;
-//    for (i=0;i<maxWait;i++) {
-//      bool lastReadHasMore = false;
-//      try {
-//        lastReadHasMore = client->readAll(block, 1048);
-//      } catch (simpleSocket::SocketException e) {
-//        NSC_LOG_MESSAGE(_T("Could not read NRPE packet from socket :") + e.getMessage());
-//        client->close();
-//        return;
-//      }
-//      if (block.getLength() >= NRPEPacket::getBufferLength(buffer_length_))
-//        break;
-//      if (!lastReadHasMore) {
-//        NSC_LOG_MESSAGE(_T("Could not read a full NRPE packet from socket, only got: ") + strEx::itos(block.getLength()));
-//        client->close();
-//        return;
-//      }
-//      Sleep(100);
-//    }
-//    if (i >= maxWait) {
-//      NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout), we only got: ") + strEx::itos(block.getLength()));
-//      client->close();
-//      return;
-//    }
-//    if (block.getLength() == NRPEPacket::getBufferLength(buffer_length_)) {
-//      try {
-//        NRPEPacket out = handlePacket(NRPEPacket(block.getBuffer(), block.getLength(), buffer_length_));
-//        block.copyFrom(out.getBuffer(), out.getBufferLength());
-//      } catch (NRPEPacket::NRPEPacketException e) {
-//        NSC_LOG_ERROR_STD(_T("NRPESocketException: ") + e.getMessage());
-//        try {
-//          NRPEPacket err(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("Could not construct return paket in NRPE handler check clientside (nsclient.log) logs..."), buffer_length_);
-//          block.copyFrom(err.getBuffer(), err.getBufferLength());
-//        } catch (NRPEPacket::NRPEPacketException e) {
-//          NSC_LOG_ERROR_STD(_T("NRPESocketException (again): ") + e.getMessage());
-//          client->close();
-//          return;
-//        }
-//      }
-//      int maxWait = socketTimeout_*10;
-//      for (i=0;i<maxWait;i++) {
-//        bool lastReadHasMore = false;
-//        try {
-//          if (client->canWrite())
-//            lastReadHasMore = client->sendAll(block);
-//        } catch (simpleSocket::SocketException e) {
-//          NSC_LOG_MESSAGE(_T("Could not send NRPE packet from socket :") + e.getMessage());
-//          client->close();
-//          return;
-//        }
-//        if (!lastReadHasMore) {
-//          client->close();
-//          return;
-//        }
-//        Sleep(100);
-//      }
-//      if (i >= maxWait) {
-//        NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout)"));
-//        client->close();
-//        return;
-//      }
-//    } else {
-//      NSC_LOG_ERROR_STD(_T("We got more then we wanted ") + strEx::itos(NRPEPacket::getBufferLength(buffer_length_)) + _T(", we only got: ") + strEx::itos(block.getLength()));
-//      client->close();
-//      return;
-//    }
-//  } catch (simpleSocket::SocketException e) {
-//    NSC_LOG_ERROR_STD(_T("SocketException: ") + e.getMessage());
-//  } catch (NRPEException e) {
-//    NSC_LOG_ERROR_STD(_T("NRPEException: ") + e.getMessage());
-//  } catch (...) {
-//    NSC_LOG_ERROR_STD(_T("Unhandled Exception in NRPE listner..."));
-//  }
-//  client->close();
-// }
-// 
-// NRPEPacket NRPEListener::handlePacket(NRPEPacket p) {
-//  if (p.getType() != NRPEPacket::queryPacket) {
-//    NSC_LOG_ERROR(_T("Request is not a query."));
-//    throw NRPEException(_T("Invalid query type: ") + strEx::itos(p.getType()));
-//  }
-//  if (p.getVersion() != NRPEPacket::version2) {
-//    NSC_LOG_ERROR(_T("Request had unsupported version."));
-//    throw NRPEException(_T("Invalid version"));
-//  }
-//  if (!p.verifyCRC()) {
-//    NSC_LOG_ERROR(_T("Request had invalid checksum."));
-//    throw NRPEException(_T("Invalid checksum"));
-//  }
-//  strEx::token cmd = strEx::getToken(p.getPayload(), '!');
-//  if (cmd.first == _T("_NRPE_CHECK")) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnOK, _T("I (") + NSCModuleHelper::getApplicationVersionString() + _T(") seem to be doing fine..."), buffer_length_);
-//  }
-//  std::wstring msg, perf;
-// 
-//  if (allowArgs_) {
-//    if (!cmd.second.empty()) {
-//      NSC_LOG_ERROR(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
-//      throw NRPEException(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
-//    }
-//  }
-//  if (allowNasty_) {
-//    if (cmd.first.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-//      NSC_LOG_ERROR(_T("Request command contained illegal metachars!"));
-//      throw NRPEException(_T("Request command contained illegal metachars!"));
-//    }
-//    if (cmd.second.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-//      NSC_LOG_ERROR(_T("Request arguments contained illegal metachars!"));
-//      throw NRPEException(_T("Request command contained illegal metachars!"));
-//    }
-//  }
-//  //TODO REMOVE THIS
-//  //return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("TEST TEST TEST"), buffer_length_);
-// 
-//  NSCAPI::nagiosReturn ret = -3;
-//  try {
-//    ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
-//  } catch (...) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("UNKNOWN: Internal exception"), buffer_length_);
-//  }
-//  switch (ret) {
-//    case NSCAPI::returnInvalidBufferLen:
-//      msg = _T("UNKNOWN: Return buffer to small to handle this command.");
-//      ret = NSCAPI::returnUNKNOWN;
-//      break;
-//    case NSCAPI::returnIgnored:
-//      msg = _T("UNKNOWN: No handler for that command");
-//      ret = NSCAPI::returnUNKNOWN;
-//      break;
-//    case NSCAPI::returnOK:
-//    case NSCAPI::returnWARN:
-//    case NSCAPI::returnCRIT:
-//    case NSCAPI::returnUNKNOWN:
-//      break;
-//    default:
-//      msg = _T("UNKNOWN: Internal error.");
-//      ret = NSCAPI::returnUNKNOWN;
-//  }
-//  if (msg.length() >= buffer_length_-1) {
-//    NSC_LOG_ERROR(_T("Truncating returndata as it is bigger then NRPE allowes :("));
-//    msg = msg.substr(0,buffer_length_-2);
-//  }
-//  if (perf.empty()||noPerfData_) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg, buffer_length_);
-//  } else {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg + _T("|") + perf, buffer_length_);
-//  }
-// }
-
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNRPEListener);
+NSC_WRAPPERS_MAIN_DEF(NRPEListener);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/NRPEServer/NRPEServer.h

@@ -48 +48 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef USE_SSL
     return _T("NRPE server");
@@ -55 +55 @@
 #endif
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple server that listens for incoming NRPE connection and handles them.\nNRPE is preferred over NSClient as it is more flexible. You can of cource use both NSClient and NRPE.");
   }