Changeset 689bf4a in nscp

Timestamp:

10/12/09 19:10:24 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

d681048

Parents:

dbc22d8

Message:

Added argument support for NRPE client as well as fixed "assert" (now uses throw) and some more fixes to the build subsystem (sigh, I hate boost build)

Files:

• AutoBuild.h (modified) (1 diff)
• Jamroot (modified) (1 diff)
• NSClient++.cpp (modified) (2 diffs)
• bjam/zip.jam (modified) (1 diff)
• changelog (modified) (1 diff)
• helpers/build-source/Jamfile (modified) (1 diff)
• modules/NRPEClient/NRPEClient.cpp (modified) (3 diffs)
• modules/NRPEClient/NRPEClient.h (modified) (2 diffs)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,7,452
-#define PRODUCTVER     0,3,7,452
-#define STRFILEVER     _T("0.3.7.452")
-#define STRPRODUCTVER  _T("0.3.7.452")
-#define STRPRODUCTDATE  _T("2009-10-07")
+#define FILEVER        0,3,7,480
+#define PRODUCTVER     0,3,7,480
+#define STRFILEVER     _T("0.3.7.480")
+#define STRPRODUCTVER  _T("0.3.7.480")
+#define STRPRODUCTDATE  _T("2009-10-11")
 #endif // AUTOBUILD_H

Jamroot

@@ -283 +283 @@
     }
   }
-    if <variant>debug in $(properties) {
-    tag = "$(tag)-debug" ;
-  }
+    #if <variant>debug in $(properties) {
+  # tag = "$(tag)-debug" ;
+  #}
   return $(tag) ;
 }

NSClient++.cpp

@@ -26 +26 @@
 #include <Lmcons.h>
 //#ifdef DEBUG
-#include <assert.h>
+#include <crtdbg.h>
 //#endif
 
@@ -456 +456 @@
 //#ifdef DEBUG
         } else if (s == _T("assert")) {
-          assert(false);
+          throw "test";
 //#endif
         } else if (std::cin.peek() < 15) {

bjam/zip.jam

@@ -17 +17 @@
 
 actions make-zip {
-  echo 7z.exe a -tzip -bd "$(<)" "$(FLAGS)" "$(SOURCE_FOLDER)" "-x!$(EXCLUDES)"
-  7z.exe a -tzip -bd "$(<)" "$(FLAGS)" "$(SOURCE_FOLDER)" "-x!$(EXCLUDES)"
+  echo 7z a -tzip -bd "$(<)" "$(FLAGS)" "$(SOURCE_FOLDER)" "-x!$(EXCLUDES)"
+  7z a -tzip -bd "$(<)" "$(FLAGS)" "$(SOURCE_FOLDER)" "-x!$(EXCLUDES)"
 } 

changelog

@@ -6 +6 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2009-10-11 MickeM
+ + Added argument support to NRPE Client
+   This is temporarily enabled by the same options under the NRPE section. BUT this will change int he future so be ware when using them.
 
 2009-09-20 MickeM

helpers/build-source/Jamfile

@@ -14 +14 @@
 }
 
-use-project master : ../.. ;
-
-zip $(target) : /master//NSClient++ : 
+zip $(target) : test.foo : 
   <tag>@format-name 
   <source-folder>../../*.c*

modules/NRPEClient/NRPEClient.cpp

@@ -109 +109 @@
   if (cit == commands.end())
     return NSCAPI::returnIgnored;
-  nrpe_result_data r = execute_nrpe_command((*cit).second);
+
+  std::wstring args = (*cit).second.arguments;
+  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT) == 1) {
+    arrayBuffer::arrayList arr = arrayBuffer::arrayBuffer2list(argLen, char_args);
+    arrayBuffer::arrayList::const_iterator cit2 = arr.begin();
+    int i=1;
+
+    for (;cit2!=arr.end();cit2++,i++) {
+      if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0) {
+        if ((*cit2).find_first_of(NASTY_METACHARS) != std::wstring::npos) {
+          NSC_LOG_ERROR(_T("Request string contained illegal metachars!"));
+          return NSCAPI::returnIgnored;
+        }
+      }
+      strEx::replace(args, _T("$ARG") + strEx::itos(i) + _T("$"), (*cit2));
+    }
+  }
+
+  NSC_DEBUG_MSG_STD(_T("Rewrote command arguments: ") + args);
+  nrpe_result_data r = execute_nrpe_command((*cit).second, args);
   message = r.text;
   return r.result;
@@ -180 +199 @@
     }
 
-    nrpe_result_data result = execute_nrpe_command(get_ConectionData(vm));
+    NRPEClient::nrpe_connection_data command = get_ConectionData(vm);
+    nrpe_result_data result = execute_nrpe_command(command, command.arguments);
     std::wcout << result.text << std::endl;
     return result.result;
@@ -191 +211 @@
 #endif
 }
-NRPEClient::nrpe_result_data NRPEClient::execute_nrpe_command(nrpe_connection_data con) {
+NRPEClient::nrpe_result_data NRPEClient::execute_nrpe_command(nrpe_connection_data con, std::wstring arguments) {
   try {
     NRPEPacket packet;
     if (con.ssl) {
 #ifdef USE_SSL
-      packet = send_ssl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(), con.buffer_length));
+      packet = send_ssl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(arguments), con.buffer_length));
 #else
       return nrpe_result_data(NSCAPI::returnUNKNOWN, _T("SSL support not available (compiled without USE_SSL)!"));
 #endif
     } else
-      packet = send_nossl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(), con.buffer_length));
+      packet = send_nossl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(arguments), con.buffer_length));
     return nrpe_result_data(packet.getResult(), packet.getPayload());
   } catch (NRPEPacket::NRPEPacketException &e) {

modules/NRPEClient/NRPEClient.h

@@ -53 +53 @@
       buffer_length(buffer_length_) 
     {}
-    std::wstring get_cli() {
+    std::wstring get_cli(std::wstring arguments_) {
       if (command_line.empty()) {
         command_line = command;
         if (command_line.empty())
           command_line = _T("_NRPE_CHECK");
-        if (!arguments.empty())
+        if (!arguments_.empty())
+          command_line += _T("!") + arguments_;
+        else if (!arguments.empty())
           command_line += _T("!") + arguments;
       }
@@ -121 +123 @@
 
 private:
-  nrpe_result_data  execute_nrpe_command(nrpe_connection_data con);
+  nrpe_result_data  execute_nrpe_command(nrpe_connection_data con, std::wstring arguments);
   NRPEPacket send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet);
   NRPEPacket send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet);