Changeset e7dbac9 in nscp

Timestamp:

09/06/09 22:28:33 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

1fc246c

Parents:

308b6f5

Message:

2009-09-06 MickeM

+ Added new option to [NSCA Agent] string_length=<size> of the NSCA_MAX_PLUGINOUTPUT_LENGTH option on the NSCA server.

• Readded all the "installer configuration" crap which I accidentaly removed when I fixed the installer... *sigh*

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (1 diff)
• debug-in.bat (modified) (1 diff)
• helpers/installer_dll/installer_helper.hpp (modified) (1 diff)
• helpers/installer_dll_fw/Jamfile (modified) (1 diff)
• include/config.h (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.cpp (modified) (2 diffs)
• modules/NSCAAgent/NSCAThread.h (modified) (3 diffs)
• release-build.bat (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,7,257
-#define PRODUCTVER     0,3,7,257
-#define STRFILEVER     _T("0.3.7.257")
-#define STRPRODUCTVER  _T("0.3.7.257")
+#define FILEVER        0,3,7,279
+#define PRODUCTVER     0,3,7,279
+#define STRFILEVER     _T("0.3.7.279")
+#define STRPRODUCTVER  _T("0.3.7.279")
 #define STRPRODUCTDATE  _T("2009-09-06")
 #endif // AUTOBUILD_H

changelog

@@ -6 +6 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2009-09-06 MickeM
+ + Added new option to [NSCA Agent] string_length=<size> of the NSCA_MAX_PLUGINOUTPUT_LENGTH option on the NSCA server.
+ * Readded all the "installer configuration" crap which I accidentaly removed when I fixed the installer... *sigh*
 
 2009-08-30 MickeM

debug-in.bat

@@ -1 @@
-dir /O:-D /A:-D /B stage\installer\*x64* > tmp.txt
+rem dir /O:-D /A:-D /B stage\installer\*x64* > tmp.txt
+echo dir /O:-D /A:-D /B stage\%2installer\*%1* 
+dir /O:-D /A:-D /B stage\%2installer\*%1* > tmp.txt
 Set /P _INST=<tmp.txt
 echo Install: %_INST%
-msiexec /l* installer.txt /i stage\installer\%_INST%
+msiexec /l* installer.txt /i stage\%2installer\%_INST%

helpers/installer_dll/installer_helper.hpp

@@ -84 +84 @@
   */
   void setupMyProperty(std::wstring key, std::wstring val) {
+    logMessage(_T("Setting old values: ") + key + _T("_OLD=") + val);
+    setPropertyIfEmpty(key+_T("_OLD"), val);
     std::wstring oldDef = getPropery(key+_T("_DEFAULT"));
     if (!oldDef.empty())
       val = oldDef;
-    else
-      setProperty(key+_T("_DEFAULT"), val);
-    setPropertyIfEmpty(key+_T("_OLD"), val);
     if (val == MY_EMPTY)
       val = _T("");
+    logMessage(_T("Setting old values: ") + key + _T("=") + val);
     setPropertyIfEmpty(key, val);
   }

helpers/installer_dll_fw/Jamfile

@@ -15 +15 @@
   <runtime-link>static
   <threading>multi
-# <include>"D:/Program/Microsoft Platform SDK for Windows Server 2003 R2/Include"
-  <include>"C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/Include/Atl"
+  <include>"D:/Program/Microsoft Platform SDK for Windows Server 2003 R2/Include"
+# <include>"C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/Include/Atl"
 
   : # default build

include/config.h

@@ -190 +190 @@
 #define NSCA_READ_TIMEOUT _T("socket_timeout")
 #define NSCA_READ_TIMEOUT_DEFAULT 30
+#define NSCA_STRLEN _T("string_length")
+#define NSCA_STRLEN_DEFAULT 512
 
 #define C_SYSTEM_SVC_ALL_0 _T("check_all_services[SERVICE_BOOT_START]")

modules/NSCAAgent/NSCAThread.cpp

@@ -80 +80 @@
   nscahost_ = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_SERVER, NSCA_SERVER_DEFAULT);
   nscaport_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_PORT, NSCA_PORT_DEFAULT);
+  payload_length_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_STRLEN, NSCA_STRLEN_DEFAULT);
   read_timeout_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_READ_TIMEOUT, NSCA_READ_TIMEOUT_DEFAULT);
   std::wstring report = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_REPORT, NSCA_REPORT_DEFAULT);
@@ -303 +304 @@
       for (std::list<Command::Result>::const_iterator cit = results.begin(); cit != results.end(); ++cit) {
         try {
-          socket.send((*cit).getBuffer(crypt_inst, timeDelta_));
+          socket.send((*cit).getBuffer(crypt_inst, timeDelta_, payload_length_));
         } catch (NSCAPacket::NSCAException &e) {
           NSC_LOG_ERROR_STD(_T("Failed to make command: ") + e.getMessage() );

modules/NSCAAgent/NSCAThread.h

@@ -160 +160 @@
     }
 
-    simpleSocket::DataBuffer getBuffer(nsca_encrypt &crypt_inst, __time32_t time_delta) const {
+    simpleSocket::DataBuffer getBuffer(nsca_encrypt &crypt_inst, __time32_t time_delta, unsigned int pluginoutput_length) const {
       std::string s = strEx::wstring_to_string(service);
       std::string r = strEx::wstring_to_string(result);
       std::string h = strEx::wstring_to_string(host);
 
-      unsigned int buffer_len = sizeof(NSCAPacket::data_packet);
+      unsigned int buffer_len = sizeof(NSCAPacket::data_packet)-NSCA_MAX_PLUGINOUTPUT_LENGTH+pluginoutput_length;
       unsigned char* buffer = crypt_inst.get_rand_buffer(buffer_len);
       NSCAPacket::data_packet *data = reinterpret_cast<NSCAPacket::data_packet*>(buffer);
@@ -179 +179 @@
         throw NSCAPacket::NSCAException(_T("description to long"));
       strncpy_s(data->svc_description, NSCA_MAX_DESCRIPTION_LENGTH, s.c_str(), s.length());
-      if (r.length() >= NSCA_MAX_PLUGINOUTPUT_LENGTH)
+      if (r.length() >= pluginoutput_length)
         throw NSCAPacket::NSCAException(_T("result to long"));
-      strncpy_s(data->plugin_output, NSCA_MAX_PLUGINOUTPUT_LENGTH, r.c_str(), r.length());
+      strncpy_s(data->plugin_output, pluginoutput_length, r.c_str(), r.length());
 
       unsigned int calculated_crc32=calculate_crc32(buffer,buffer_len);
@@ -229 +229 @@
   std::wstring nscahost_;
   unsigned int nscaport_;
+  unsigned int payload_length_;
   bool cacheNscaHost_;
   std::wstring nscaaddr_;

release-build.bat

@@ -15 +15 @@
 
 REM build x64 (Amd64, Emt64) binary
-rem SET version=x64
-rem SET cmdline=build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
-rem call build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
-rem if %ERRORLEVEL% == -1 goto :error
+ SET version=x64
+ SET cmdline=build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
+ call build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
+ if %ERRORLEVEL% == -1 goto :error