Changeset f7a074d in nscp

Timestamp:

11/06/11 22:04:48 (19 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

0d9eed6

Parents:

58f0e80

Message:

• Had some "vacation" so no updates for a while
• A lot of fixes to the NSCA parts (now 100% compatible with old settings file)
• Added option to read sections (to plugin API)
• Fixed issues in settings wrapper so child paths are also mapped (not just keys)
• Many fixes related to NRPE/NSCA/*
• "RC quality" expect RC within the week (only need to fix default config file somehow)
• Upgraded all unit test to use the simplified API
• Fixed a some unicode issues in PythonScript module
• Improved threading a bit
• Fixed CheckSystem (service check)
• Fixed duplicate keys (when replacing) in old settings client

Files:

• files/old-settings.map (modified) (1 diff)
• helpers/installers/installer/Product.wxs (modified) (5 diffs)
• include/NSCAPI.h (modified) (1 diff)
• include/client/command_line_parser.cpp (modified) (1 diff)
• include/nrpe/packet.hpp (modified) (1 diff)
• include/nrpe/server/connection.cpp (modified) (1 diff)
• include/nsca/nsca_packet.hpp (modified) (2 diffs)
• include/nsca/nsca_socket.hpp (modified) (1 diff)
• include/nscapi/functions.hpp (modified) (5 diffs)
• include/nscapi/nscapi_core_wrapper.cpp (modified) (2 diffs)
• include/nscapi/nscapi_core_wrapper.hpp (modified) (3 diffs)
• include/nscapi/settings_proxy.hpp (modified) (1 diff)
• include/settings/client/settings_client.cpp (modified) (1 diff)
• include/settings/client/settings_client.hpp (modified) (4 diffs)
• include/settings/settings_old.hpp (modified) (2 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (4 diffs)
• modules/NRPEClient/NRPEClient.cpp (modified) (1 diff)
• modules/NRPEServer/handler_impl.hpp (modified) (1 diff)
• modules/NSCAClient/NSCAClient.cpp (modified) (8 diffs)
• modules/NSCAClient/NSCAClient.h (modified) (3 diffs)
• modules/PythonScript/PythonScript.cpp (modified) (3 diffs)
• modules/PythonScript/script_wrapper.cpp (modified) (2 diffs)
• modules/PythonScript/script_wrapper.hpp (modified) (3 diffs)
• modules/Scheduler/Scheduler.cpp (modified) (2 diffs)
• scripts/python/lib/test_helper.py (modified) (2 diffs)
• scripts/python/test_eventlog.py (modified) (3 diffs)
• scripts/python/test_nsca.py (modified) (11 diffs)
• scripts/python/test_sample.py (added)
• service/NSCPlugin.h (modified) (1 diff)
• service/NSClient++.cpp (modified) (4 diffs)
• service/core_api.cpp (modified) (2 diffs)
• service/core_api.h (modified) (1 diff)
• service/logger.hpp (modified) (1 diff)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

files/old-settings.map

@@ -12 +12 @@
 modules/CheckNSCP.dll=/modules/CheckNSCP
 modules/CheckExternalScripts.dll=/modules/CheckExternalScripts
-modules/NSCAAgent.dll=/modules/NSCAAgent
+modules/NSCAAgent.dll=/modules/NSCAClient
 modules/NSCAAgent.dll=/modules/Scheduler
 modules/LUAScript.dll=/modules/LUAScript

helpers/installers/installer/Product.wxs

@@ -118 +118 @@
             </Component>
             <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NSCAAgentDLL" Name="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" />
+              <File Id="NSCAClientDLL" Name="NSCAClient.dll" DiskId="1" Source="$(var.Source)/modules/NSCAClient.dll" Vital="no" />
+              <File Id="NSCAServerDLL" Name="NSCAServer.dll" DiskId="1" Source="$(var.Source)/modules/NSCAServer.dll" Vital="no" />
               <File Id="SchedulerDLL" Name="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
+            </Component>
+            <Component Id="NSCP" Guid="B185B8F1-3718-4e8e-ADA4-38049A0721EA" Win64="$(var.Win64)">
+              <File Id="NSCPClientDLL" Name="NSCPClient.dll" DiskId="1" Source="$(var.Source)/modules/NSCPClient.dll" Vital="no" />
+              <File Id="NSCPServerDLL" Name="NSCPServer.dll" DiskId="1" Source="$(var.Source)/modules/NSCPServer.dll" Vital="no" />
             </Component>
             <Component Id="PythonScript" Guid="8820A304-C696-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
@@ -125 +130 @@
             </Component>
             <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <!-- NOT PORTED MODULES !
-                <File Id="ModRemoteConfiguration.dll" Name="RmtCfg.dll" LongName="RemoteConfiguration.dll" DiskId="1" Source="$(var.Source)/modules/RemoteConfiguration.dll" Vital="no" />
-                <File Id="ModSysTray.dll" Name="SysTray.dll" LongName="SysTray.dll" DiskId="1" Source="$(var.Source)/modules/SysTray.dll" Vital="no" />
-                <File Id="A_DebugLogMetrics.dll" Name="ADebug.dll" LongName="A_DebugLogMetrics.dll" DiskId="1" Source="$(var.Source)/modules/A_DebugLogMetrics.dll" Vital="no" />
-              -->
               <File Id="ModCheckEventLog.dll" Name="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" />
               <File Id="ModCheckExternalScripts.dll" Name="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" />
@@ -147 +147 @@
               <File Id="script001" Name="check_60s.bat" DiskId="1" Source="$(var.Source)/scripts/check_60s.bat" Vital="no" />
               <File Id="script002" Name="check_battery.vbs" DiskId="1" Source="$(var.Source)/scripts/check_battery.vbs" Vital="no" />
-              <File Id="script003" Name="check_no_rdp.bat" DiskId="1" Source="$(var.Source)/scripts/check_no_rdp.bat" Vital="no" />
-              <File Id="script004" Name="check_printer.vbs" DiskId="1" Source="$(var.Source)/scripts/check_printer.vbs" Vital="no" />
-              <File Id="script005" Name="check_ok.bat" DiskId="1" Source="$(var.Source)/scripts/check_ok.bat" Vital="no" />
-              <File Id="script006" Name="check_files.vbs" DiskId="1" Source="$(var.Source)/scripts/check_files.vbs" Vital="no" />
+              <File Id="script003" Name="check_files.vbs" DiskId="1" Source="$(var.Source)/scripts/check_files.vbs" Vital="no" />
+              <File Id="script004" Name="check_no_rdp.bat" DiskId="1" Source="$(var.Source)/scripts/check_no_rdp.bat" Vital="no" />
+              <File Id="script005" Name="check_printer.vbs" DiskId="1" Source="$(var.Source)/scripts/check_printer.vbs" Vital="no" />
+              <File Id="script006" Name="check_ok.bat" DiskId="1" Source="$(var.Source)/scripts/check_ok.bat" Vital="no" />
               <File Id="script007" Name="check_ping.bat" DiskId="1" Source="$(var.Source)/scripts/check_ping.bat" Vital="no" />
               <File Id="script008" Name="check_updates.vbs" DiskId="1" Source="$(var.Source)/scripts/check_updates.vbs" Vital="no" />
-              <File Id="sample002" Name="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" />
-              <File Id="sample003" Name="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" />
+              <File Id="sample001" Name="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" />
+              <File Id="sample002" Name="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" />
               <!--
                 Scripts missing
+              <File Id="sample003" Name="check_test.bat" DiskId="1" Source="$(var.Source)/scripts/check_test.bat" Vital="no" />
               <File Id="lua001" Name="test.lua" LongName="test.lua" DiskId="1" Source="$(var.Source)/scripts/test.lua" Vital="no" />
               -->
@@ -168 +169 @@
             <Directory Id="INSTALLLOCATION_SCRIPTS_PYTHON" Name="python">
               <Component Id="PythonScripts" Guid="8820A304-C697-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="P_script_001" Name="test.py" DiskId="1" Source="$(var.Source)/scripts/python/test.py" Vital="no" />
-                <File Id="P_script_002" Name="test_pb.py" DiskId="1" Source="$(var.Source)/scripts/python/test_pb.py" Vital="no" />
+                <File Id="P_script_001" Name="test_eventlog.py" DiskId="1" Source="$(var.Source)/scripts/python/test_eventlog.py" Vital="no" />
+                <File Id="P_script_002" Name="test_nsca.py" DiskId="1" Source="$(var.Source)/scripts/python/test_nsca.py" Vital="no" />
+                <File Id="P_script_003" Name="test_pb.py" DiskId="1" Source="$(var.Source)/scripts/python/test_pb.py" Vital="no" />
+                <File Id="P_script_004" Name="test_sample.py" DiskId="1" Source="$(var.Source)/scripts/python/test_sample.py" Vital="no" />
               </Component>
             </Directory>
@@ -253 +256 @@
           <ComponentRef Id="NSCA" />
         </Feature>
+        <Feature Id="NSCPPlugin" Title="NSCP plugin (experimental)" Description="Plugin to submit passive results to an NSCP server" Level="1" Absent="disallow">
+          <ComponentRef Id="NSCP" />
+        </Feature>
         <Feature Id="PythonScript" Title="Python Scripting" Description="Python scripting requires python to be installed)" Level="1" Absent="disallow">
           <ComponentRef Id="PythonScript" />

include/NSCAPI.h

@@ -144 +144 @@
     typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsBool)(const wchar_t*, const wchar_t*, int);
     typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsSection)(const wchar_t*, wchar_t***, unsigned int *);
+    typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsSections)(const wchar_t*, wchar_t***, unsigned int *);
     typedef NSCAPI::errorReturn (*lpNSAPIReleaseSettingsSectionBuffer)(wchar_t***, unsigned int *);
     typedef void (*lpNSAPIMessage)(const char*, unsigned int);

include/client/command_line_parser.cpp

@@ -246 +246 @@
   nscapi::functions::destination_container myself = config.data->host_self;
   if (!header->has_recipient_id()) {
+    if (recipient.id.empty())
+      recipient.id = "TODO missing id";
     nscapi::functions::add_host(header, recipient);
     header->set_recipient_id(recipient.id);

include/nrpe/packet.hpp

@@ -73 +73 @@
   };
 
-  class nrpe_exception {
-    std::wstring error_;
-  public:
-    nrpe_exception(std::wstring error) : error_(error) {}
-    std::wstring getMessage() {
-      return error_;
+  class nrpe_exception : public std::exception {
+    std::string error_;
+  public:
+    nrpe_exception(std::wstring error) : error_(utf8::cvt<std::string>(error)) {}
+    nrpe_exception(std::string error) : error_(utf8::cvt<std::string>(error)) {}
+    ~nrpe_exception() throw() {}
+    const char* what() const throw() {
+      return error_.c_str();
+    }
+    const std::wstring wwhat() const throw() {
+      return utf8::cvt<std::wstring>(error_);
     }
   };

include/nrpe/server/connection.cpp

@@ -75 +75 @@
               nrpe::packet request = parser_.parse();
               response = handler_->handle(request);
-            } catch (nrpe::nrpe_packet_exception &e) {
-              response = handler_->create_error(e.getMessage());
+            } catch (const nrpe::nrpe_packet_exception &e) {
+              response = handler_->create_error(e.wwhat());
+            } catch (const nrpe::nrpe_exception &e) {
+              response = handler_->create_error(e.wwhat());
+            } catch (const std::exception &e) {
+              response = handler_->create_error(_T("Error handling NRPE packet: ") + utf8::cvt<std::wstring>(e.what()));
             } catch (...) {
-              response = handler_->create_error(_T("Unknown error handling packet"));
+              response = handler_->create_error(_T("Unknown error handling NRPE packet"));
             }
 

include/nsca/nsca_packet.hpp

@@ -140 +140 @@
 
     void parse_data(const char* buffer, unsigned int buffer_len) {
-      const nsca::data::data_packet *data = reinterpret_cast<const nsca::data::data_packet*>(buffer);
+      char *tmp = new char[buffer_len];
+      memcpy(tmp, buffer, buffer_len);
+      nsca::data::data_packet *data = reinterpret_cast<nsca::data::data_packet*>(tmp);
       //packet_version=swap_bytes::ntoh<int16_t>(data->packet_version);
       time=swap_bytes::ntoh<u_int32_t>(data->timestamp);
@@ -150 +152 @@
       result= data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length);
 
+      unsigned int crc32 = swap_bytes::ntoh<u_int32_t>(data->crc32_value);
+      data->crc32_value = 0;
+      unsigned int calculated_crc32=calculate_crc32(tmp, buffer_len);
+      delete [] tmp;
+      if (crc32 != calculated_crc32)
+        throw nsca::nsca_exception(_T("Invalid crc: ") + strEx::itos(crc32) + _T(" != ") + strEx::itos(calculated_crc32));
     }
 

include/nsca/nsca_socket.hpp

@@ -74 +74 @@
       std::vector<char> buf(len);
       if (!read_with_timeout(buf, timeout)) {
-        NSC_LOG_ERROR_STD(_T("Failed to read IV from server."));
+        NSC_LOG_ERROR_STD(_T("Failed to read IV from server (using ") + strEx::itos(encryption_method) + _T(", ") + strEx::itos(len) + _T(")."));
         return false;
       }

include/nscapi/functions.hpp

@@ -180 +180 @@
       if (!dst.host.empty())
         host->set_host(dst.host);
+      if (!dst.address.empty())
+        host->set_address(dst.address);
       if (!dst.protocol.empty())
         host->set_protocol(dst.protocol);
@@ -199 +201 @@
         if (host.id() == tag) {
           data.id = tag;
-          data.host = host.host();
-          data.address = host.address();
-          data.protocol = host.protocol();
-          data.comment = host.comment();
+          if (!host.host().empty())
+            data.host = host.host();
+          if (!host.address().empty())
+            data.address = host.address();
+          if (!host.protocol().empty())
+            data.protocol = host.protocol();
+          if (!host.comment().empty())
+            data.comment = host.comment();
           if (expand_meta) {
             for(int j=0;j<host.tags_size(); ++j) {
@@ -219 +225 @@
     //////////////////////////////////////////////////////////////////////////
 
+    static void make_submit_from_query(std::string &message, const std::wstring channel, const std::wstring alias = _T("")) {
+      Plugin::QueryResponseMessage response;
+      response.ParseFromString(message);
+      Plugin::SubmitRequestMessage request;
+      request.mutable_header()->CopyFrom(response.header());
+      request.set_channel(to_string(channel));
+      for (int i=0;i<response.payload_size();++i) {
+        request.add_payload()->CopyFrom(response.payload(i));
+        if (!alias.empty())
+          request.mutable_payload(i)->set_alias(to_string(alias));
+      }
+      message = request.SerializeAsString();
+    }
+
     static void create_simple_query_request(std::wstring command, std::vector<std::wstring> arguments, std::string &buffer) {
       Plugin::QueryRequestMessage message;
@@ -271 +291 @@
       return gbp_to_nagios_status(payload.result());
     }
-    static NSCAPI::errorReturn parse_simple_submit_request_payload(const Plugin::QueryResponseMessage::Response &payload, std::wstring &command, std::wstring &msg, std::wstring &perf) {
+    static NSCAPI::errorReturn parse_simple_submit_request_payload(const Plugin::QueryResponseMessage::Response &payload, std::wstring &alias, std::wstring &command, std::wstring &msg, std::wstring &perf) {
+      alias = utf8::cvt<std::wstring>(payload.alias());
       command = utf8::cvt<std::wstring>(payload.command());
       msg = utf8::cvt<std::wstring>(payload.message());
@@ -361 +382 @@
     }
 
-    static int parse_simple_query_response(std::string &response, std::wstring &msg, std::wstring &perf) {
+    static int parse_simple_query_response(const std::string &response, std::wstring &msg, std::wstring &perf) {
       Plugin::QueryResponseMessage message;
       message.ParseFromString(response);

include/nscapi/nscapi_core_wrapper.cpp

@@ -370 +370 @@
   return ret;
 }
+std::list<std::wstring> nscapi::core_wrapper::getSettingsSections(std::wstring section) {
+  if (!fNSAPIGetSettingsSections)
+    throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
+  array_buffer::arrayBuffer aBuffer = NULL;
+  unsigned int argLen = 0;
+  if (fNSAPIGetSettingsSections(section.c_str(), &aBuffer, &argLen) != NSCAPI::isSuccess) {
+    throw nscapi::nscapi_exception(_T("Settings could not be retrieved."));
+  }
+  std::list<std::wstring> ret = array_buffer::arrayBuffer2list(argLen, aBuffer);
+  if (fNSAPIReleaseSettingsSectionBuffer(&aBuffer, &argLen) != NSCAPI::isSuccess) {
+    throw nscapi::nscapi_exception(_T("Settings could not be destroyed."));
+  }
+  if (aBuffer != NULL)
+    throw nscapi::nscapi_exception(_T("buffer is not null?."));
+  return ret;
+}
 /**
  * Retrieve an int from the settings subsystem (INI-file)
@@ -639 +655 @@
   fNSAPIGetSettingsString = (nscapi::core_api::lpNSAPIGetSettingsString)f(_T("NSAPIGetSettingsString"));
   fNSAPIGetSettingsSection = (nscapi::core_api::lpNSAPIGetSettingsSection)f(_T("NSAPIGetSettingsSection"));
+  fNSAPIGetSettingsSections = (nscapi::core_api::lpNSAPIGetSettingsSections)f(_T("NSAPIGetSettingsSections"));
   fNSAPIReleaseSettingsSectionBuffer = (nscapi::core_api::lpNSAPIReleaseSettingsSectionBuffer)f(_T("NSAPIReleaseSettingsSectionBuffer"));
   fNSAPIMessage = (nscapi::core_api::lpNSAPIMessage)f(_T("NSAPIMessage"));

include/nscapi/nscapi_core_wrapper.hpp

@@ -40 +40 @@
     nscapi::core_api::lpNSAPIGetApplicationVersionStr fNSAPIGetApplicationVersionStr;
     nscapi::core_api::lpNSAPIGetSettingsSection fNSAPIGetSettingsSection;
+    nscapi::core_api::lpNSAPIGetSettingsSections fNSAPIGetSettingsSections;
     nscapi::core_api::lpNSAPIReleaseSettingsSectionBuffer fNSAPIReleaseSettingsSectionBuffer;
     nscapi::core_api::lpNSAPIGetSettingsString fNSAPIGetSettingsString;
@@ -88 +89 @@
       , fNSAPIGetApplicationVersionStr(NULL)
       , fNSAPIGetSettingsSection(NULL)
+      , fNSAPIGetSettingsSections(NULL)
       , fNSAPIReleaseSettingsSectionBuffer(NULL)
       , fNSAPIGetSettingsString(NULL)
@@ -122 +124 @@
     std::wstring getApplicationVersionString(void);
     std::list<std::wstring> getSettingsSection(std::wstring section);
+    std::list<std::wstring> getSettingsSections(std::wstring section);
     std::wstring getSettingsString(std::wstring section, std::wstring key, std::wstring defaultValue);
     std::wstring expand_path(std::wstring value);

include/nscapi/settings_proxy.hpp

@@ -42 +42 @@
 
     virtual string_list get_sections(std::wstring path) {
-      return core_->getSettingsSection(path);
+      return core_->getSettingsSections(path);
     }
     virtual string_list get_keys(std::wstring path) {

include/settings/client/settings_client.cpp

@@ -4 +4 @@
 namespace nscapi {
   namespace settings_helper {
-
-
+/*
+    template<typename T>
+    typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >* wstring_vector_key(T *val, typename T::key_type key, std::wstring def) {
+      typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >* r = new typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >(val, key, def);
+      return r;
+    }
+*/
     wstring_key_type* wstring_key(std::wstring *val, std::wstring def) {
       wstring_key_type* r = new wstring_key_type(val, def);

include/settings/client/settings_client.hpp

@@ -140 +140 @@
     };
 
+    template<class T, class V, class TBase>
+    class typed_key_entry_in_vector : public TBase {
+    public:
+      typed_key_entry_in_vector(V* store_to, typename V::key_type key, const T& v) : TBase(v), store_to_(store_to), key_(key) {}
+
+      virtual void update_target(T *value) const {
+        if (store_to_)
+          (*store_to_)[key_] = *value;
+      }
+    protected:
+      V* store_to_;
+      typename V::key_type key_;
+    };
+
     template<class T, class TBase>
     class typed_key_fun : public TBase {
@@ -152 +166 @@
     };
 
+    template<typename T>
+    typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >* wstring_vector_key(T *val, typename T::key_type key, std::wstring def) {
+      typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >* r = new typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >(val, key, def);
+      return r;
+    }
 
     typedef typed_key_value<std::wstring, typed_string_value<std::wstring> > wstring_key_type;
@@ -160 +179 @@
     typedef typed_key_value<bool, typed_bool_value<bool> > bool_key_type;
 
+    /*
+    template<typename T>
+    typed_key_entry_in_vector<std::wstring, T, typed_string_value<std::wstring> >* wstring_vector_key(T *val, typename T::key_type key, std::wstring def);
+    */
     wstring_key_type* wstring_key(std::wstring *val, std::wstring def = _T(""));
     string_key_type* string_key(std::string *val, std::string def = "");
@@ -232 +255 @@
             std::wstring val = core_->get_string(path, key, _T(""));
             callback_(key, val);
+          }
+          list = core_->get_sections(path);
+          BOOST_FOREACH(std::wstring key, list) {
+            callback_(key, _T(""));
           }
         }

include/settings/settings_old.hpp

@@ -386 +386 @@
       }
       // @todo: this will NOT work for "nodes in paths"
+      std::set<std::wstring> ignore_list;
       BOOST_FOREACH(settings_map::keys_key_type key, map.keys_) {
         if (key.first.first == path) {
           if (has_key_int(key.second.first, key.second.second)) {
             list.push_back(key.first.second);
+            ignore_list.insert(key.second.first + _T("/") + key.second.second);
           }
         }
@@ -402 +404 @@
             it = section_cache_.find(path);
           }
-          list.insert(list.end(), (*it).second.begin(), (*it).second.end());
+          BOOST_FOREACH(std::wstring k, (*it).second) {
+            std::set<std::wstring>::const_iterator cit = ignore_list.find(key.second + _T("/") + k);
+            if (cit == ignore_list.end())
+              list.push_back(k);
+          }
+          //list.insert(list.end(), (*it).second.begin(), (*it).second.end());
         }
       }

modules/CheckSystem/CheckSystem.cpp

@@ -74 +74 @@
   try {
     typedef std::map<std::wstring,std::wstring> counter_map_type;
-    std::map<std::wstring,std::wstring> service_mappings;
     std::map<std::wstring,std::wstring> counters;
     bool default_counters = true;
@@ -84 +83 @@
       (_T("WINDOWS CHECK SYSTEM"), _T("Section for system checks and system settings"))
 
-      (_T("service mapping"), sh::wstring_map_path(&service_mappings)
-      , _T("SERVICE MAPPING SECTION"), _T(""))
+      (_T("service mapping"), _T("SERVICE MAPPING SECTION"), _T("Confiure which services has to be in which state"))
 
       (_T("pdh"), _T("PDH COUNTER INFORMATION"), _T(""))
@@ -91 +89 @@
       (_T("pdh/counters"), sh::wstring_map_path(&counters)
       , _T("PDH COUNTERS"), _T(""))
+
 
       ;
@@ -116 +115 @@
       ;
 
+    //std::map<DWORD,std::wstring>::key_type
+
+    settings.alias().add_key_to_settings()
+
+      (_T("BOOT_START"), sh::wstring_vector_key(&lookups_, SERVICE_BOOT_START, _T("ignored")),
+      _T("SERVICE_BOOT_START"), _T("TODO"))
+
+      (_T("SYSTEM_START"), sh::wstring_vector_key(&lookups_, SERVICE_SYSTEM_START, _T("ignored")),
+      _T("SERVICE_SYSTEM_START"), _T("TODO"))
+
+      (_T("AUTO_START"), sh::wstring_vector_key(&lookups_, SERVICE_AUTO_START, _T("started")),
+      _T("SERVICE_AUTO_START"), _T("TODO"))
+
+      (_T("DEMAND_START"), sh::wstring_vector_key(&lookups_, SERVICE_DEMAND_START, _T("ignored")),
+      _T("SERVICE_DEMAND_START"), _T("TODO"))
+
+      (_T("DISABLED"), sh::wstring_vector_key(&lookups_, SERVICE_DISABLED, _T("stopped")),
+      _T("SERVICE_DISABLED"), _T("TODO"))
+
+      (_T("DELAYED"), sh::wstring_vector_key(&lookups_, NSCP_SERVICE_DELAYED, _T("ignored")),
+      _T("SERVICE_DELAYED"), _T("TODO"))
+
+      ;
 
     settings.register_all();
     settings.notify();
-
-    lookups_[SERVICE_BOOT_START] = service_mappings[_T("BOOT_START")];
-    lookups_[SERVICE_SYSTEM_START] = service_mappings[_T("SYSTEM_START")];
-    lookups_[SERVICE_AUTO_START] = service_mappings[_T("AUTO_START")];
-    lookups_[SERVICE_DEMAND_START] = service_mappings[_T("DEMAND_START")];
-    lookups_[SERVICE_DISABLED] = service_mappings[_T("DISABLED")];
-    lookups_[NSCP_SERVICE_DELAYED] = service_mappings[_T("DELAYED")];
 
     typedef PDHCollector::system_counter_data::counter cnt;

modules/NRPEClient/NRPEClient.cpp

@@ -284 +284 @@
     return nrpe_result_data(packet.getResult(), packet.getPayload());
   } catch (nrpe::nrpe_packet_exception &e) {
-    return nrpe_result_data(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.getMessage());
+    return nrpe_result_data(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.wwhat());
   } catch (std::runtime_error &e) {
     NSC_LOG_ERROR_STD(_T("Socket error: ") + utf8::cvt<std::wstring>(e.what()));

modules/NRPEServer/handler_impl.hpp

@@ -23 +23 @@
 
   nrpe::packet create_error(std::wstring msg) {
-    return nrpe::packet::create_response(4, msg, payload_length_);
+    return nrpe::packet::create_response(3, msg, payload_length_);
   }
 

modules/NSCAClient/NSCAClient.cpp

@@ -67 +67 @@
     sh::settings_registry settings(get_settings_proxy());
     settings.set_alias(_T("NSCA"), alias, _T("client"));
+    target_path = settings.alias().get_settings_path(_T("targets"));
 
     settings.alias().add_path_to_settings()
       (_T("NSCA AGENT SECTION"), _T("Section for NSCA passive check module."))
+
+      (_T("targets"), sh::fun_values_path(boost::bind(&NSCAAgent::add_target, this, _1, _2)), 
+      _T("REMOTE TARGET DEFINITIONS"), _T(""))
+
       ;
 
@@ -95 +100 @@
 
     settings.alias().add_key_to_settings(_T("server"))
+      /*
       (_T("host"), sh::wstring_key(&nscahost_),
       _T("NSCA HOST"), _T("The NSCA server to report results to."))
@@ -101 +107 @@
       _T("NSCA PORT"), _T("The NSCA server port"))
 
-      (_T("encryption method"), sh::int_key(&encryption_method_),
+      (_T("encryption method"), sh::string_key(&encryption_method_),
       _T("ENCRYPTION METHOD"), _T("Number corresponding to the various encryption algorithms (see the wiki). Has to be the same as the server or it wont work at all."))
 
       (_T("password"), sh::string_key(&password_),
       _T("PASSWORD"), _T("The password to use. Again has to be the same as the server or it wont work at all."))
+      */
 
       (_T("timeout"), sh::uint_key(&timeout_, 30),
@@ -158 +165 @@
 }
 
+void NSCAAgent::add_target(std::wstring key, std::wstring arg) {
+  try {
+    targets.add(get_settings_proxy(), target_path , key, arg);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to add target: ") + key);
+  }
+}
 void NSCAAgent::add_local_options(po::options_description &desc, nscp_connection_data &command_data) {
   desc.add_options()
@@ -203 +217 @@
 NSCAPI::nagiosReturn NSCAAgent::handleRAWNotification(const wchar_t* channel, std::string request, std::string &response) {
   try {
+
     client::configuration config;
+    net::wurl url;
+    url.protocol = _T("nsca");
+
+    nscapi::target_handler::optarget target = targets.find_target(_T("default"));
+    if (target) {
+      url.host = target->host;
+      url.port = strEx::stoi(target->options[_T("port")]);
+      config.data->recipient.data["encryption"] = utf8::cvt<std::string>(target->options[_T("encryption")]);
+      config.data->recipient.data["password"] = utf8::cvt<std::string>(target->options[_T("password")]);
+    }
+    config.data->recipient.id = "default";
+    config.data->recipient.address = utf8::cvt<std::string>(url.to_string());
+    config.data->host_self.id = "self";
+    config.data->host_self.host = hostname_;
+
     setup(config, _T(""));
     if (!client::command_line_parser::relay_submit(config, request, response)) {
@@ -230 +260 @@
       return NSCAPI::hasFailed;
     }
-    NSC_LOG_ERROR_STD(_T("Got IV sending data: ") + strEx::itos(packets.size()));
+    NSC_DEBUG_MSG_STD(_T("Got IV sending data: ") + strEx::itos(packets.size()));
     BOOST_FOREACH(const nsca::packet &packet, packets) {
       socket.send_nsca(packet, boost::posix_time::seconds(data.timeout));
@@ -256 +286 @@
 int NSCAAgent::clp_handler_impl::submit(client::configuration::data_type data, ::Plugin::Common_Header* header, const std::string &request, std::string &response) {
   try {
+
     Plugin::SubmitRequestMessage message;
     message.ParseFromString(request);
     std::list<nsca::packet> list;
-
-    std::wstring command, msg, perf;
+    int iii = message.payload_size();
+
+    std::wstring alias, command, msg, perf;
     nscapi::functions::destination_container recipient; // = data->host_default_recipient;
     nscapi::functions::parse_destination(*header, header->recipient_id(), recipient, true);
@@ -268 +300 @@
     for (int i=0;i < message.payload_size(); ++i) {
       nsca::packet packet(source.host, local_data.payload_length, local_data.time_delta);
-      packet.code = nscapi::functions::parse_simple_submit_request_payload(message.payload(i), command, msg, perf);
-      packet.service = utf8::cvt<std::string>(command);
+      packet.code = nscapi::functions::parse_simple_submit_request_payload(message.payload(i), alias, command, msg, perf);
+      if (alias != _T("host_check"))
+        packet.service = utf8::cvt<std::string>(alias);
+      packet.host = source.host;
       packet.result = utf8::cvt<std::string>(msg) + "|" + utf8::cvt<std::string>(perf);
       list.push_back(packet);

modules/NSCAClient/NSCAClient.h

@@ -26 +26 @@
 
 #include <nsca/nsca_packet.hpp>
+#include <nscapi/targets.hpp>
 
 NSC_WRAPPERS_MAIN();
@@ -34 +35 @@
 
   std::string hostname_;
-  std::wstring nscahost_;
-  unsigned int nscaport_;
   unsigned int payload_length_;
   bool cacheNscaHost_;
-  std::string password_;
-  int encryption_method_;
   unsigned int timeout_;
   std::wstring channel_;
   int time_delta_;
+  nscapi::target_handler targets;
+  std::wstring target_path;
 
 
@@ -146 +145 @@
   std::wstring setup(client::configuration &config, const std::wstring &command);
   void add_local_options(boost::program_options::options_description &desc, nscp_connection_data &command_data);
+  void add_target(std::wstring key, std::wstring args);
 
   void set_delay(std::wstring key) {

modules/PythonScript/PythonScript.cpp

@@ -114 +114 @@
 }
 python_script::~python_script(){
-  script_wrapper::thread_locker locker;
   callFunction("shutdown");
 }
@@ -194 +193 @@
     if (!has_init) {
       has_init = true;
+      PyEval_InitThreads();
       Py_Initialize();
-      PyEval_InitThreads();
       do_init = true;
     }
@@ -390 +389 @@
     std::wstring src, cmd, msg, perf;
     int code = nscapi::functions::parse_simple_submit_request(request, src, cmd, msg, perf);
+    NSC_LOG_ERROR_STD(_T(" --- command: ") + cmd);
     int ret = inst->handle_simple_message(chnl, to_string(src), to_string(cmd), code, msg, perf);
     nscapi::functions::create_simple_submit_response(channel, cmd, ret, _T(""), response);

modules/PythonScript/script_wrapper.cpp

@@ -129 +129 @@
 }
 void script_wrapper::sleep(unsigned int seconds) {
-  thread_unlocker unlocker;
-  boost::this_thread::sleep(boost::posix_time::milliseconds(seconds*1000));
+  {
+    thread_unlocker unlocker;
+    {
+      boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
+
+    }
+  }
 }
 /*
@@ -252 +257 @@
       return NSCAPI::returnIgnored;
     }
-
-    py::list l;
-    BOOST_FOREACH(std::wstring a, arguments) {
-      l.append(utf8::cvt<std::string>(a));
-    }
     {
       thread_locker locker;
+
       try {
+        py::list l;
+        BOOST_FOREACH(std::wstring a, arguments) {
+          l.append(utf8::cvt<std::string>(a));
+        }
         tuple ret = boost::python::call<tuple>(boost::python::object(it->second).ptr(), l);
         if (ret.ptr() == Py_None) {

modules/PythonScript/script_wrapper.hpp

@@ -2 +2 @@
 
 #include <boost/python.hpp>
+#include <boost/thread.hpp>
 
 namespace script_wrapper {
@@ -9 +10 @@
   namespace thread_support {
     static bool enabled = true;
+    static boost::shared_mutex mutex;
+
+    struct log_lock {
+      boost::unique_lock<boost::shared_mutex> lock;
+      log_lock() : lock(thread_support::mutex, boost::get_system_time() + boost::posix_time::seconds(2)) {
+        if (!lock.owns_lock())
+          NSC_LOG_ERROR(_T("Failed to get mutex: thread_locker"));
+      }
+    };
+
   }
 
@@ -28 +39 @@
     PyThreadState *state;
     thread_unlocker() {
-      state = PyEval_SaveThread();
+      if (thread_support::enabled)
+        state = PyEval_SaveThread();
     }
     ~thread_unlocker() {
-      PyEval_RestoreThread(state);
-    }
-
-
+      if (thread_support::enabled)
+        PyEval_RestoreThread(state);
+    }
   };
   

modules/Scheduler/Scheduler.cpp

@@ -153 +153 @@
   NSC_LOG_ERROR_STD(error);
 }
-
+#include <nscapi/functions.hpp>
 void Scheduler::handle_schedule(scheduler::target item) {
   try {
@@ -161 +161 @@
       // @todo: allow renaming of commands here item.alias, 
       // @todo this is broken, fix this (uses the wrong message)
+      nscapi::functions::make_submit_from_query(response, item.channel, item.alias);
       std::string result;
       GET_CORE()->submit_message(item.channel, response, result);

scripts/python/lib/test_helper.py

@@ -1 +1 @@
 from NSCP import Settings, Registry, Core, log, log_error, status
+import os
+import inspect
 
 test_manager = None
+
+def install_testcases(tests):
+  test_manager = create_test_manager()
+  test_manager.add(tests)
+  test_manager.install()
+
+def init_testcases(plugin_id, plugin_alias, script_alias, tests):
+  test_manager = create_test_manager(plugin_id, plugin_alias, script_alias)
+  test_manager.add(tests)
+  test_manager.init()
+
+def shutdown_testcases():
+  get_test_manager().shutdown()
 
 def get_test_manager():
@@ -40 +55 @@
 def display_help(arguments = []):
   return (status.OK, 'TODO')
-  
+
 class Callable:
   def __init__(self, anycallable):
     self.__call__ = anycallable
 
+class SingletonHelper:
+  klass = None
+  def __init__(self, klass):
+    self.klass = klass
+  def __call__(self, *args, **kw):
+    if not self.klass._instance:
+      self.klass._instance = self.klass()
+    return self.klass._instance
+
+def setup_singleton(klass, src = None):
+  klass.getInstance = SingletonHelper(klass)
+  log('Setting path: %s'%src)
+  if not src:
+    cf = inspect.currentframe()
+    if cf:
+      bf = cf.f_back
+      if bf:
+        src = bf.f_code.co_filename
+  klass.__source__ = src
+  log('==>%s'%src)
+
+class BasicTest(object):
+
+  _instance = None
+  getInstance = None
+  __source__ = ''
+
+  def desc(self):
+    return 'TODO: Describe: %s'%self.title()
+
+  def title(self):
+    return self._instance.__class__.__name__
+
+  def setup(self, plugin_id, prefix):
+    None
+
+  def teardown(self):
+    None
+
+  def run_test(self):
+    result = TestResult()
+    result.add_message(False, 'TODO add implementation')
+    return result
+
+  def install(self, arguments):
+    conf = Settings.get()
+    conf.set_string('/modules', 'pytest', 'PythonScript')
+    log('==> %s'%self.__source__)
+    fn = os.path.basename(self.__source__)
+    (sn, ext) = os.path.splitext(fn)
+    conf.register_key('/settings/pytest/scripts', sn, 'string', 'UNIT TEST SCRIPT: %s'%self.title(), 'A script for running unittests for: %s'%self.desc(), fn)
+    conf.set_string('/settings/pytest/scripts', sn, fn)
+    
+    conf.save()
+  
+  def uninstall(self):
+    None
+
+  def help(self):
+    None
+
+  def init(self, plugin_id):
+    None
+
+  def shutdown(self):
+    None
+    
+    
 class TestResult:
   class Entry:

scripts/python/test_eventlog.py

@@ -1 +1 @@
 from NSCP import Settings, Registry, Core, log, status, sleep
-from test_helper import Callable, TestResult, get_test_manager, create_test_manager
+from test_helper import BasicTest, TestResult, Callable, setup_singleton, install_testcases, init_testcases, shutdown_testcases
 import plugin_pb2
 from types import *
@@ -6 +6 @@
 import unicodedata
 
-class EventLogTest:
+class EventLogTest(BasicTest):
   instance = None
   key = ''
@@ -107 +107 @@
     None
 
+setup_singleton(EventLogTest)
+
 all_tests = [EventLogTest]
 
 def __main__():
-  test_manager = create_test_manager()
-  test_manager.add(all_tests)
-  test_manager.install()
+  install_testcases(all_tests)
   
 def init(plugin_id, plugin_alias, script_alias):
-  test_manager = create_test_manager(plugin_id, plugin_alias, script_alias)
-  test_manager.add(all_tests)
-
-  test_manager.init()
+  init_testcases(plugin_id, plugin_alias, script_alias, all_tests)
 
 def shutdown():
-  test_manager = get_test_manager()
-  test_manager.shutdown()
+  shutdown_testcases()

scripts/python/test_nsca.py

@@ -1 +1 @@
 from NSCP import Settings, Registry, Core, log, status, log_error, sleep
-from test_helper import Callable, TestResult, get_test_manager, create_test_manager
+from test_helper import BasicTest, TestResult, Callable, setup_singleton, install_testcases, init_testcases, shutdown_testcases
 import plugin_pb2
 from types import *
@@ -6 +6 @@
 import uuid
 import unicodedata
+#import _thread
+#sync = _thread.allocate_lock()
+
+import threading
+sync = threading.RLock()
 
 core = Core.get()
-
-prefix = 'py_'
-plugin_id = 0
-
-def get_help(arguments):
-  return (status.OK, 'help: Get help')
-
 
 def isOpen(ip, port):
@@ -35 +33 @@
 
   def __init__(self, command):
-    try:
-      self.uuid = command.decode('ascii')
-    except UnicodeDecodeError:
+    if type(command) == 'unicode':
+      try:
+        self.uuid = command.decode('ascii', 'replace')
+      except UnicodeDecodeError:
+        self.uuid = command
+    else:
       self.uuid = command
     #self.uuid = unicodedata.normalize('NFKD', command).encode('ascii','ignore')
@@ -44 +45 @@
     return 'Message: %s (%s, %s, %s)'%(self.uuid, self.source, self.command, self.status)
 
-class NSCAServerTest:
+class NSCAServerTest(BasicTest):
   instance = None
   key = ''
   reg = None
-  responses = {}
-  
-  class SingletonHelper:
-    def __call__( self, *args, **kw ) :
-      if NSCAServerTest.instance is None :
-        object = NSCAServerTest()
-        NSCAServerTest.instance = object
-      return NSCAServerTest.instance
-
-  getInstance = SingletonHelper()
-
+  _responses = {}
+  
+  def has_response(self, id):
+    with sync:
+      return id in self._responses
+  
+  def get_response(self, id):
+    with sync:
+      if id in self._responses:
+        return self._responses[id]
+      msg = NSCAMessage(id)
+      self._responses[id] = msg
+      return msg
+
+  def set_response(self, msg):
+    with sync:
+      self._responses[msg.uuid] = msg
+
+  def del_response(self, id):
+    with sync:
+      del self._responses[id]
+      
+  
   def desc(self):
     return 'Testcase for NSCA protocol'
@@ -82 +95 @@
   
   def simple_inbox_handler_wrapped(self, channel, source, command, status, message, perf):
-    log('Got simple message %s on %s'%(command, channel))
-    msg = NSCAMessage(command)
-    if msg.uuid in self.responses:
-      msg = self.responses[msg.uuid]
+    log('Got simple message %s'%command)
+    msg = self.get_response(command)
     msg.source = source
     msg.status = status
@@ -91 +102 @@
     msg.perfdata = perf
     msg.got_simple_response = True
-    self.responses[msg.uuid] = msg
+    self.set_response(msg)
     return True
 
@@ -100 +111 @@
     message.ParseFromString(request)
     command = message.payload[0].command
-    log('Got simple message %s on %s'%(command, channel))
-    
-    msg = NSCAMessage(command)
-    if msg.uuid in self.responses:
-      msg = self.responses[msg.uuid]
+    #log('Got message %s on %s'%(command, channel))
+    
+    msg = self.get_response(command)
     msg.got_response = True
-    self.responses[msg.uuid] = msg
+    self.set_response(msg)
     return (False, '')
     
@@ -139 +148 @@
     found = False
     for i in range(0,10):
-      if uid in self.responses:
-        rmsg = self.responses[uid]
+      if self.has_response(uid):
+        rmsg = self.get_response(uid)
         result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%encryption)
         result.add_message(rmsg.got_simple_response, 'Testing to recieve simple message using %s'%encryption)
@@ -148 +157 @@
         result.assert_contains(rmsg.message, msg, 'Verify that message is sent through')
         result.assert_equals(rmsg.perfdata, perf, 'Verify that performance data is sent through')
-        del self.responses[uid]
+        self.del_response(uid)
         found = True
         break
       else:
-        log('Waiting for %s (%s)'%(uid, self.responses.keys()))
+        log('Waiting for %s'%uid)
         sleep(1)
     if not found:
@@ -178 +187 @@
     # Currently broken: "xor"
     cryptos = ["des", "3des", "cast128", "xtea", "blowfish", "twofish", "rc2", "aes", "serpent", "gost", "none", "3way"]
+    #cryptos = ["none"]
     for c in cryptos:
       result.add_message(True, 'Testing crypto: %s'%c)
@@ -213 +223 @@
     None
 
+setup_singleton(NSCAServerTest)
+
 all_tests = [NSCAServerTest]
 
 def __main__():
-  test_manager = create_test_manager()
-  test_manager.add(all_tests)
-  test_manager.install()
+  install_testcases(all_tests)
   
 def init(plugin_id, plugin_alias, script_alias):
-  test_manager = create_test_manager(plugin_id, plugin_alias, script_alias)
-  test_manager.add(all_tests)
-
-  test_manager.init()
+  init_testcases(plugin_id, plugin_alias, script_alias, all_tests)
 
 def shutdown():
-  test_manager = get_test_manager()
-  test_manager.shutdown()
+  shutdown_testcases()

service/NSCPlugin.h

@@ -157 +157 @@
   bool route_message(const wchar_t *channel, const char* buffer, unsigned int buffer_len, wchar_t **new_channel_buffer, char **new_buffer, unsigned int *new_buffer_len);
 
+  std::wstring get_description() {
+    if (alias_.empty())
+      return getName();
+    return getName() + _T(" (") + alias_ + _T(")");
+  }
   std::wstring get_alias() {
     return alias_;

service/NSClient++.cpp

@@ -371 +371 @@
   BOOST_FOREACH(std::wstring plugin, list) {
     std::wstring alias = settings_manager::get_settings()->get_string(MAIN_MODULES_SECTION, plugin);
-    if (plugin == _T("enabled")) {
+    if (plugin == _T("enabled") || plugin == _T("1")) {
       plugin = alias;
       alias = _T("");
+    } else if (alias == _T("enabled") || alias == _T("1")) {
+        alias = _T("");
     } else if ((active && plugin == _T("disabled")) || (active && alias == _T("disabled")))
       continue;
@@ -387 +389 @@
       alias = tmp;
     }
-    LOG_DEBUG_CORE_STD(_T("Found: ") + plugin + _T(" as ") + alias);
+    if (alias.empty()) {
+      LOG_DEBUG_CORE_STD(_T("Found: ") + plugin);
+    } else {
+      LOG_DEBUG_CORE_STD(_T("Found: ") + plugin + _T(" as ") + alias);
+    }
     if (plugin.length() > 4 && plugin.substr(plugin.length()-4) == _T(".dll"))
       plugin = plugin.substr(0, plugin.length()-4);
@@ -687 +693 @@
       std::wstring file = NSCPlugin::get_plugin_file(v.second);
       std::wstring alias = v.first;
-      LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file + _T(" as ") + alias);
+      if (!alias.empty()) {
+        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file + _T(" as ") + alias);
+      } else {
+        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file);
+      }
       try {
         addPlugin(pluginPath / boost::filesystem::wpath(file), alias);
@@ -921 +931 @@
     }
     for (pluginList::iterator it=plugins_.begin(); it != plugins_.end();) {
-      LOG_DEBUG_CORE_STD(_T("Loading plugin: ") + (*it)->getName() + _T(" as ") + (*it)->get_alias());
+      LOG_DEBUG_CORE_STD(_T("Loading plugin: ") + (*it)->get_description());
       try {
         if (!(*it)->load_plugin(mode)) {

service/core_api.cpp

@@ -148 +148 @@
   return NSCAPI::hasFailed;
 }
+NSCAPI::errorReturn NSAPIGetSettingsSections(const wchar_t* section, wchar_t*** aBuffer, unsigned int * bufLen) {
+  try {
+    unsigned int len = 0;
+    *aBuffer = array_buffer::list2arrayBuffer(settings_manager::get_settings()->get_sections(section), len);
+    *bufLen = len;
+    return NSCAPI::isSuccess;
+  } catch (settings::settings_exception e) {
+    LOG_ERROR_STD(_T("Failed to get section: ") + e.getMessage());
+  } catch (...) {
+    LOG_ERROR_STD(_T("Failed to getSection: ") + section);
+  }
+  return NSCAPI::hasFailed;
+}
 NSCAPI::errorReturn NSAPIReleaseSettingsSectionBuffer(wchar_t*** aBuffer, unsigned int * bufLen) {
   array_buffer::destroyArrayBuffer(*aBuffer, *bufLen);
@@ -436 +449 @@
   if (wcscasecmp(buffer, _T("NSAPIGetSettingsSection")) == 0)
     return reinterpret_cast<LPVOID>(&NSAPIGetSettingsSection);
+  if (wcscasecmp(buffer, _T("NSAPIGetSettingsSections")) == 0)
+    return reinterpret_cast<LPVOID>(&NSAPIGetSettingsSections);
   if (wcscasecmp(buffer, _T("NSAPIReleaseSettingsSectionBuffer")) == 0)
     return reinterpret_cast<LPVOID>(&NSAPIReleaseSettingsSectionBuffer);

service/core_api.h

@@ -41 +41 @@
 NSCAPI::nagiosReturn NSAPIExecCommand(const wchar_t* target, const wchar_t* command, const char *request_buffer, const unsigned int request_buffer_len, char **response_buffer, unsigned int *response_buffer_len);
 NSCAPI::errorReturn NSAPIGetSettingsSection(const wchar_t*, wchar_t***, unsigned int *);
+NSCAPI::errorReturn NSAPIGetSettingsSections(const wchar_t*, wchar_t***, unsigned int *);
 NSCAPI::errorReturn NSAPIReleaseSettingsSectionBuffer(wchar_t*** aBuffer, unsigned int * bufLen);
 NSCAPI::boolReturn NSAPICheckLogMessages(int messageType);

service/logger.hpp

@@ -66 +66 @@
 
     namespace ip = boost::interprocess;
-    const int max_message_size = 4096;
+    const int max_message_size = 40960;
     const std::string queue_name = "logging_queue";
 

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,98
-#define STRPRODUCTVER  "0,4,0,98"
-#define STRPRODUCTDATE "2011-09-06"
+#define PRODUCTVER     0,4,0,107
+#define STRPRODUCTVER  "0,4,0,107"
+#define STRPRODUCTDATE "2011-11-06"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=98
-date=2011-09-06
+build=107
+date=2011-11-06