Changeset b7d17f8 in nscp

Timestamp:

04/11/11 06:33:49 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

d66ccee

Parents:

c391984

Message:

0.4.x: Major update with a lot of fixes and what not.
Now NSCA is working with old config file as well as a brand new http settings store and many many other fixes.

Files:

• CMakeLists.txt (modified) (2 diffs)
• build.cmake (modified) (1 diff)
• build/cmake/wix.cmake (modified) (6 diffs)
• build/python/version.hpp (added)
• files/old-settings.map (modified) (2 diffs)
• helpers/installer-dlls/main_dll/CMakeLists.txt (modified) (1 diff)
• helpers/installer-dlls/main_dll/installer_helper.hpp (modified) (4 diffs)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (5 diffs)
• helpers/installer-dlls/main_dll/main_dll.def (modified) (1 diff)
• helpers/installers/installer/CMakeLists.txt (modified) (1 diff)
• helpers/installers/installer/Product.wxs (modified) (2 diffs)
• helpers/installers/installer/properties.wxs (modified) (1 diff)
• helpers/installers/ui/ConfigureDlg.wxs (added)
• helpers/installers/ui/InvalidConfigureationDlg.wxs (added)
• helpers/installers/ui/SelectConfigurationDlg.wxs (added)
• helpers/installers/ui/WixUI_MondoNSCP.wxs (added)
• helpers/settings_manager/CMakeLists.txt (added)
• helpers/settings_manager/StdAfx.cpp (added)
• helpers/settings_manager/StdAfx.h (added)
• helpers/settings_manager/settings_manager_impl.cpp (added)
• helpers/settings_manager/settings_manager_impl.h (moved) (moved from service/settings_manager_impl.h) (4 diffs)
• include/config.h.in (modified) (2 diffs)
• include/http/client.hpp (added)
• include/net/net.hpp (added)
• include/nsca/nsca_enrypt.hpp (modified) (2 diffs)
• include/nsca/nsca_packet.hpp (modified) (3 diffs)
• include/nscapi/macros.hpp (modified) (3 diffs)
• include/nscapi/nscapi_plugin_wrapper.hpp (modified) (1 diff)
• include/settings/settings_core.hpp (modified) (2 diffs)
• include/settings/settings_handler_impl.hpp (modified) (1 diff)
• include/settings/settings_http.hpp (added)
• include/settings/settings_interface_impl.hpp (modified) (2 diffs)
• include/settings/settings_old.hpp (modified) (9 diffs)
• include/strEx.h (modified) (5 diffs)
• modules/CheckDisk/filter.cpp (modified) (2 diffs)
• modules/NSCAAgent/NSCAAgent.cpp (modified) (1 diff)
• modules/Scheduler/Scheduler.cpp (modified) (2 diffs)
• resources/CMakeLists.txt (added)
• resources/help.ico (added)
• resources/nsclient.ico (added)
• service/CMakeLists.txt (modified) (6 diffs)
• service/NSClient++.cpp (modified) (5 diffs)
• service/core_api.cpp (modified) (1 diff)
• service/settings_logger_impl.hpp (modified) (1 diff)
• service/settings_manager_impl.cpp (deleted)

CMakeLists.txt

@@ -82 +82 @@
 SET(VERSION_TXT ${CMAKE_CURRENT_SOURCE_DIR}/version.txt)
 
-execute_process(
+EXECUTE_PROCESS(
   COMMAND ${PYTHON_EXECUTABLE}
-    "${BUILD_PYTHON_FOLDER}/version.py"
-    --file ${VERSION_TXT}
-    --display
+    "${BUILD_PYTHON_FOLDER}/version.py" 
+    --file ${VERSION_TXT} 
+    --display 
+    --generate-hpp "${BUILD_PYTHON_FOLDER}/version.hpp"
   OUTPUT_VARIABLE TMP_VERSION_OUT
   )
@@ -385 +386 @@
 MESSAGE(STATUS "Build path: ${PROJECT_BINARY_DIR}")
 SET(NSCP_PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR})
+ADD_SUBDIRECTORY("helpers/settings_manager")
 ADD_SUBDIRECTORY("service")
 SET(MAIN_NSCP_TARGET "nscp")

build.cmake

@@ -26 +26 @@
   SET(INC_PROTOBUF_DIR "D:/source/libraries/protobuf-2.4.0a")
 
-  SET(INC_CRYPTOPP_DIR "D:/source/libraries/cryptopp-5.6.1")
+  SET(INC_CRYPTOPP_DIR "D:/source/libraries/crypto++-5.6.1")
 
   SET(INC_LUA_DIR "D:/source/libraries/lua-5.1.4")

build/cmake/wix.cmake

@@ -15 +15 @@
 
 if (WIN32)
-    MACRO(DBG_MSG _MSG)
-        #MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\r\n ${_MSG}")
-    ENDMACRO(DBG_MSG)
+  MACRO(DBG_MSG _MSG)
+#   MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\r\n ${_MSG}")
+  ENDMACRO(DBG_MSG)
 
 
@@ -25 +25 @@
         "$ENV{WIX}"
         "$ENV{WIX_ROOT_DIR}"
+        "$ENV{ProgramFiles}/Windows Installer XML v3.5"
+        "$ENV{ProgramFiles}/Windows Installer XML v3"
         "$ENV{ProgramFiles}/Windows Installer XML"
-        "$ENV{ProgramFiles}/Windows Installer XML v3"
         )
 
@@ -41 +42 @@
         PATHS ${WIX_POSSIBLE_ROOT_DIRS})
     DBG_MSG("WIX_ROOT_DIR=${WIX_ROOT_DIR}")
+  
+  IF(EXISTS "${WIX_ROOT_DIR}/bin/pyro.exe")
+    SET(WIX_VERSION 3)
+  ELSE(EXISTS "${WIX_ROOT_DIR}/bin/pyro.exe")
+    SET(WIX_VERSION 2)
+  ENDIF(EXISTS "${WIX_ROOT_DIR}/bin/pyro.exe")
+  
 
 
@@ -106 +114 @@
           OUTPUT    ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_WIXOBJ}
           COMMAND   ${WIX_CANDLE}
-          ARGS      ${WIX_CANDLE_FLAGS} ${SOURCE_WIX_FILE}
+          ARGS       
+                -ext WixFirewallExtension 
+                -ext WixUtilExtension
+                ${WIX_CANDLE_FLAGS} 
+                ${SOURCE_WIX_FILE}
           DEPENDS   ${SOURCE_WIX_FILE} ${_extra_dep}
-          COMMENT   "Compiling ${SOURCE_WIX_FILE} -> ${OUTPUT_WIXOBJ}"
+          COMMENT   "Compiling ${SOURCE_WIX_FILE} -ext WixFirewallExtension -ext WixUtilExtension ${WIX_CANDLE_FLAGS} -> ${OUTPUT_WIXOBJ}"
           )
         SET (OUTPUT_WIXOBJ ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_WIXOBJ})
@@ -142 +154 @@
                 COMMAND   ${WIX_HEAT}
                 ARGS      file ${SOURCE_WIX_FILE}
+              -ext WixFirewallExtension
+              -ext WixUtilExtension
                           -out ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_WIXOBJ}
                           ${WIX_HEAT_FLAGS}
@@ -162 +176 @@
     MACRO(WIX_LINK _target _sources _loc_files)
         DBG_MSG("WIX command: ${WIX_LIGHT}\n WIX target: ${_target} objs: ${${_sources}}")
-
-        SET( WIX_LINK_FLAGS_A ${WIX_LINK_FLAGS} )
+        DBG_MSG("WIX version: ${WIX_VERSION}")
+
+        SET(WIX_LINK_FLAGS_A ${WIX_LINK_FLAGS})
         # Add localization
-        FOREACH (_current_FILE ${_loc_files})
-            SET( WIX_LINK_FLAGS_A ${WIX_LINK_FLAGS_A} -loc "${_current_FILE}" )
+        FOREACH(_current_FILE ${_loc_files})
+      IF(${WIX_VERSION} EQUAL 3)
+        SET(WIX_LINK_FLAGS_A ${WIX_LINK_FLAGS_A} -cultures:"${_current_FILE}")
+      ELSE(${WIX_VERSION} EQUAL 3)
+        SET(WIX_LINK_FLAGS_A ${WIX_LINK_FLAGS_A} -loc "${_current_FILE}")
+      ENDIF(${WIX_VERSION} EQUAL 3)
             DBG_MSG("WIX link localization: ${_current_FILE}")
-        ENDFOREACH (_current_FILE)
+        ENDFOREACH(_current_FILE)
         DBG_MSG("WIX link flags: ${WIX_LINK_FLAGS_A}")
-#   SET(_src_list ${_sources})
-#   FOREACH( _cpp ${_sources} )
-#     SET( _arguments ${_arguments} ${_cpp} )
-#   ENDFOREACH( _cpp )
- #       DBG_MSG("SRC ===> : ${_arguments}")
-
-        ADD_CUSTOM_COMMAND(
-      OUTPUT    ${_target}
-            COMMAND   ${WIX_LIGHT}
-            ARGS      ${WIX_LINK_FLAGS_A} -out "${_target}" ${${_sources}}
-            DEPENDS   ${${_sources}}
-            COMMENT   "Linking ${_sources} -> ${_target}"
-            )
+
+    IF(${WIX_VERSION} EQUAL 3)
+      ADD_CUSTOM_COMMAND(
+        OUTPUT    ${_target}
+        COMMAND   ${WIX_LIGHT}
+        ARGS      ${WIX_LINK_FLAGS_A} 
+              -ext WixUIExtension 
+              -ext WixFirewallExtension 
+              -ext WixUtilExtension 
+              -out "${_target}" 
+              ${${_sources}}
+        DEPENDS   ${${_sources}}
+        COMMENT   "Linking ${${_sources}} -> ${_target} (${WIX_LIGHT} ${WIX_LINK_FLAGS_A} -ext WixUIExtension -ext WixFirewallExtension -out "${_target}" ${${_sources}})"
+        )
+    ELSE(${WIX_VERSION} EQUAL 3)
+      ADD_CUSTOM_COMMAND(
+        OUTPUT    ${_target}
+        COMMAND   ${WIX_LIGHT}
+        ARGS      ${WIX_LINK_FLAGS_A} -out "${_target}" ${${_sources}}
+        DEPENDS   ${${_sources}}
+        COMMENT   "Linking ${${_sources}} -> ${_target} (${WIX_LINK_FLAGS_A})"
+        )
+    ENDIF(${WIX_VERSION} EQUAL 3)
     ENDMACRO(WIX_LINK)
   

files/old-settings.map

@@ -16 +16 @@
 modules/NRPEClient.dll=/modules/NRPEClient
 modules/CheckTaskSched.dll=/modules/CheckTaskSched
+modules/Scheduler.dll=/modules/Scheduler
 
 # Crash section
@@ -73 +74 @@
 includes/*=/include/*
 
-#NSCA Agent/interval=
-#NSCA Agent/encryption_method=
-#NSCA Agent/password=
+NSCA Agent/interval=/settings/scheduler/default/interval
+NSCA Agent/hostname=/settings/NSCA/agent/hostname
+NSCA Commands/*=/settings/scheduler/schedules
+
+
+NSCA Agent/encryption_method=/settings/NSCA/agent/server/encryption method
+NSCA Agent/nsca_host=/settings/NSCA/agent/server/host
+NSCA Agent/password=/settings/NSCA/agent/server/password
+NSCA Agent/nsca_port=/settings/NSCA/agent/server/port
+NSCA Agent/time_delay=/settings/NSCA/agent/delay
 #NSCA Agent/bind_to_address=
-#NSCA Agent/hostname=
-#NSCA Agent/nsca_host=192.168.0.1
-#NSCA Agent/nsca_port=5667
 
-#NSCA Commands/*=
 
 #NRPE Client Handlers/*=

helpers/installer-dlls/main_dll/CMakeLists.txt

@@ -31 +31 @@
   Msi.lib
   bufferoverflowu.lib
+  settings_manager
 )
 

helpers/installer-dlls/main_dll/installer_helper.hpp

@@ -51 +51 @@
   }
 
+  bool propertyTouched(std::wstring path) {
+    std::wstring old = getPropery(path + _T("_DEFAULT"));
+    std::wstring cur = getPropery(path);
+    return old != cur;
+  }
   std::wstring getPropery(std::wstring path) {
     TCHAR tmpBuf[MAX_PATH];
@@ -77 +82 @@
     return buffer;
   }
-/*
-  void setPropertyAndOld(std::wstring key, std::wstring value) {
-    MsiSetProperty (hInstall_, key.c_str(), value.c_str());
-    MsiSetProperty (hInstall_, (key+_T("_OLD")).c_str(), value.c_str());
-  }
-  */
-  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;
-    if (val == MY_EMPTY)
-      val = _T("");
-    logMessage(_T("Setting old values: ") + key + _T("=") + val);
-    setPropertyIfEmpty(key, val);
-  }
-  void setMyProperty(std::wstring key, std::wstring val) {
-    setProperty(key, val);
-  }
-  
+
   void setPropertyIfEmpty(std::wstring key, std::wstring val) {
     std::wstring old = getPropery(key);
@@ -103 +88 @@
       setProperty(key, val);
   }
-  void setPropertyAndOld(std::wstring key, std::wstring value, std::wstring oldvalue) {
-    MsiSetProperty (hInstall_, key.c_str(), value.c_str());
-    std::wstring old_key = key+_T("_OLD");
-    if (getPropery(old_key).empty())
-      setProperty(old_key, oldvalue);
-    //MsiSetProperty (hInstall_, (key+_T("_OLD")).c_str(), oldvalue.c_str());
-  }
-  void setPropertyOld(std::wstring key, std::wstring oldvalue) {
-    MsiSetProperty (hInstall_, (key+_T("_OLD")).c_str(), oldvalue.c_str());
+  void setPropertyAndOld(std::wstring key, std::wstring value) {
+    MsiSetProperty(hInstall_, key.c_str(), value.c_str());
+    MsiSetProperty(hInstall_, (key+_T("_OLD")).c_str(), value.c_str());
   }
   void setProperty(std::wstring key, std::wstring value) {
@@ -651 +630 @@
     for (int i=0; ::MsiEnumProducts(i, reinterpret_cast<TCHAR*>(&buffer)) == ERROR_SUCCESS; i++) {
       std::wstring name = getProductName(buffer);
-      logMessage(_T("Found a product: ") + (std::wstring)buffer + _T("=") + name);
       ret.push_back(buffer);
     }

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -9 +9 @@
 #include <file_helpers.hpp>
 #include "installer_helper.hpp"
+#include "../../settings_manager/settings_manager_impl.h"
 
 const UINT COST_SERVICE_INSTALL = 2000;
-
-LPCWSTR vcsServiceQuery =
-L"SELECT `ShortName`, `LongName`, `Description`, `Program`, `Dependencies`, `Attributes`, `Component_` FROM `Services`";
-enum eServiceQuery { feqShortName = 1, feqLongName, feqDesc, feqProgram, feqDeps, feqAttributes, feqComponent };
-enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 };
 
 bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_description, std::wstring service_deps);
 bool uninstall(msi_helper &h, std::wstring service_name);
-UINT SchedServiceMgmt(__in MSIHANDLE hInstall, msi_helper::WCA_TODO todoSched);
-
-extern "C" UINT __stdcall ScheduleInstallService(MSIHANDLE hInstall) {
-  return SchedServiceMgmt(hInstall, msi_helper::WCA_TODO_INSTALL);
-}
-extern "C" UINT __stdcall ScheduleUnInstallService(MSIHANDLE hInstall) {
-  return SchedServiceMgmt(hInstall, msi_helper::WCA_TODO_UNINSTALL);
-}
-extern "C" UINT __stdcall ExecServiceInstall(__in MSIHANDLE hInstall) {
-  HRESULT hr = S_OK;
-  // initialize
-  msi_helper h(hInstall, _T("ExecServiceInstall"));
-  try {
-    msi_helper::custom_action_data_r data(h.getPropery(L"CustomActionData"));
-
-    // loop through all the passed in data
-    while (data.has_more()) {
-      // extract the custom action data and if rolling back, swap INSTALL and UNINSTALL
-      int iTodo = data.get_next_int();
-      if (::MsiGetMode(hInstall, MSIRUNMODE_ROLLBACK))
-      {
-        if (msi_helper::WCA_TODO_INSTALL == iTodo)
-        {
-          iTodo = msi_helper::WCA_TODO_UNINSTALL;
-        }
-        else if (msi_helper::WCA_TODO_UNINSTALL == iTodo)
-        {
-          iTodo = msi_helper::WCA_TODO_INSTALL;
-        }
-      }
-
-      std::wstring shortname = data.get_next_string();
-      std::wstring longname = data.get_next_string();
-      std::wstring desc = data.get_next_string();
-      std::wstring deps = data.get_next_string();
-      int attr = data.get_next_int();
-      BOOL fIgnoreFailures = feaIgnoreFailures == (attr & feaIgnoreFailures);
-      std::wstring file = data.get_next_string();
-      switch (iTodo) {
-      case msi_helper::WCA_TODO_INSTALL:
-      case msi_helper::WCA_TODO_REINSTALL:
-        h.logMessage(_T("Installing service install: ") + shortname + _T(", ") + file);
-        install(h, file, shortname, longname, desc, deps);
-        break;
-
-      case msi_helper::WCA_TODO_UNINSTALL:
-        h.logMessage(_T("Installing service install: ") + shortname + _T(", ") + file);
-        uninstall(h, shortname);
-        break;
-      default:
-        h.logMessage(_T("IGNORING service install: ") + shortname + _T(", ") + file);
-      }
-    }
-  } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to install service: ") + e.what());
-    return ERROR_SUCCESS;
-  } catch (...) {
-    h.errorMessage(_T("Failed to install service: <UNKNOWN EXCEPTION>"));
-    return ERROR_INSTALL_FAILURE;
-  }
-  return ERROR_SUCCESS;
-
-}
-
 
 UINT SchedServiceMgmt(__in MSIHANDLE hInstall, msi_helper::WCA_TODO todoSched)
 {
-  msi_helper h(hInstall, _T("SchedServiceInstall"));
-  try {
-    int cFirewallExceptions = 0;
-    h.logMessage(_T("SchedServiceInstall: ") + strEx::itos(todoSched));
-    // anything to do?
-    if (!h.table_exists(L"Services")) {
-      h.logMessage(_T("Services table doesn't exist, so there are no services to configure."));
-      return ERROR_SUCCESS;
-    }
-
-    // query and loop through all the firewall exceptions
-    PMSIHANDLE hView = h.open_execute_view(vcsServiceQuery);
-    if (h.isNull(hView)) {
-      h.logMessage(_T("Failed to query service view!"));
-      return ERROR_INSTALL_FAILURE;
-    }
-
-    msi_helper::custom_action_data_w custom_data;
-    PMSIHANDLE hRec = h.fetch_record(hView);
-    while (hRec != NULL)
-    {
-      std::wstring shortname = h.get_record_formatted_string(hRec, feqShortName);
-      std::wstring longname = h.get_record_formatted_string(hRec, feqLongName);
-      std::wstring desc = h.get_record_formatted_string(hRec, feqDesc);
-      std::wstring deps = h.get_record_formatted_string(hRec, feqDeps);
-      std::wstring program = h.get_record_formatted_string(hRec, feqProgram);
-      int attributes = h.get_record_integer(hRec, feqAttributes);
-      std::wstring component = h.get_record_string(hRec, feqComponent);
-
-      // figure out what we're doing for this exception, treating reinstall the same as install
-      msi_helper::WCA_TODO todoComponent = h.get_component_todo(component);
-      if ((msi_helper::WCA_TODO_REINSTALL == todoComponent ? msi_helper::WCA_TODO_INSTALL : todoComponent) != todoSched) {
-        h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent) + _T(") doesn't match request (") + strEx::itos(todoSched) + _T(")"));
-        hRec = h.fetch_record(hView);
-        continue;
-      }
-      h.logMessage(_T("Adding data to CA chunk... "));
-      // action :: name :: remoteaddresses :: attributes :: target :: {port::protocol | path}
-      ++cFirewallExceptions;
-      custom_data.write_int(todoComponent);
-      custom_data.write_string(shortname);
-      custom_data.write_string(longname);
-      custom_data.write_string(desc);
-      custom_data.write_string(deps);
-      custom_data.write_int(attributes);
-      //custom_data.write_int(fetApplication);
-      custom_data.write_string(program);
-      h.logMessage(_T("Adding data to CA chunk... DONE"));
-      h.logMessage(_T("CA chunk: ") + custom_data.to_string());
-      hRec = h.fetch_record(hView);
-    }
-    // schedule ExecFirewallExceptions if there's anything to do
-    if (custom_data.has_data()) {
-      h.logMessage(_T("Scheduling (WixExecServiceInstall) firewall exception: ") + custom_data.to_string());
-      if (msi_helper::WCA_TODO_INSTALL == todoSched) {
-        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-        if (FAILED(hr)) {
-          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
-          return hr;
-        }
-        hr = h.do_deferred_action(L"WixExecServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-        if (FAILED(hr)) {
-          h.errorMessage(_T("failed to schedule service install exceptions execution"));
-          return hr;
-        }
-      }
-      else
-      {
-        h.logMessage(_T("Scheduling (WixExecServiceUninstall) firewall exception: ") + custom_data.to_string());
-        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-        if (FAILED(hr)) {
-          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
-          return hr;
-        }
-        hr = h.do_deferred_action(L"WixExecServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-        if (FAILED(hr)) {
-          h.errorMessage(_T("failed to schedule service install exceptions execution"));
-          return hr;
-        }
-      }
-    } else
-      h.logMessage(_T("No services scheduled"));
-  } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to install service: ") + e.what());
-    return ERROR_INSTALL_FAILURE;
-  } catch (...) {
-    h.errorMessage(_T("Failed to install service: <UNKNOWN EXCEPTION>"));
-    return ERROR_INSTALL_FAILURE;
-  }
+//  msi_helper h(hInstall, _T("SchedServiceInstall"));
+//  try {
+//    int cFirewallExceptions = 0;
+//    h.logMessage(_T("SchedServiceInstall: ") + strEx::itos(todoSched));
+//    // anything to do?
+//    if (!h.table_exists(L"Services")) {
+//      h.logMessage(_T("Services table doesn't exist, so there are no services to configure."));
+//      return ERROR_SUCCESS;
+//    }
+// 
+//    // query and loop through all the firewall exceptions
+//    PMSIHANDLE hView = h.open_execute_view(vcsServiceQuery);
+//    if (h.isNull(hView)) {
+//      h.logMessage(_T("Failed to query service view!"));
+//      return ERROR_INSTALL_FAILURE;
+//    }
+// 
+//    msi_helper::custom_action_data_w custom_data;
+//    PMSIHANDLE hRec = h.fetch_record(hView);
+//    while (hRec != NULL)
+//    {
+//      std::wstring shortname = h.get_record_formatted_string(hRec, feqShortName);
+//      std::wstring longname = h.get_record_formatted_string(hRec, feqLongName);
+//      std::wstring desc = h.get_record_formatted_string(hRec, feqDesc);
+//      std::wstring deps = h.get_record_formatted_string(hRec, feqDeps);
+//      std::wstring program = h.get_record_formatted_string(hRec, feqProgram);
+//      int attributes = h.get_record_integer(hRec, feqAttributes);
+//      std::wstring component = h.get_record_string(hRec, feqComponent);
+// 
+//      // figure out what we're doing for this exception, treating reinstall the same as install
+//      msi_helper::WCA_TODO todoComponent = h.get_component_todo(component);
+//      if ((msi_helper::WCA_TODO_REINSTALL == todoComponent ? msi_helper::WCA_TODO_INSTALL : todoComponent) != todoSched) {
+//        h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent) + _T(") doesn't match request (") + strEx::itos(todoSched) + _T(")"));
+//        hRec = h.fetch_record(hView);
+//        continue;
+//      }
+//      h.logMessage(_T("Adding data to CA chunk... "));
+//      // action :: name :: remoteaddresses :: attributes :: target :: {port::protocol | path}
+//      ++cFirewallExceptions;
+//      custom_data.write_int(todoComponent);
+//      custom_data.write_string(shortname);
+//      custom_data.write_string(longname);
+//      custom_data.write_string(desc);
+//      custom_data.write_string(deps);
+//      custom_data.write_int(attributes);
+//      //custom_data.write_int(fetApplication);
+//      custom_data.write_string(program);
+//      h.logMessage(_T("Adding data to CA chunk... DONE"));
+//      h.logMessage(_T("CA chunk: ") + custom_data.to_string());
+//      hRec = h.fetch_record(hView);
+//    }
+//    // schedule ExecFirewallExceptions if there's anything to do
+//    if (custom_data.has_data()) {
+//      h.logMessage(_T("Scheduling (WixExecServiceInstall) firewall exception: ") + custom_data.to_string());
+//      if (msi_helper::WCA_TODO_INSTALL == todoSched) {
+//        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
+//        if (FAILED(hr)) {
+//          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
+//          return hr;
+//        }
+//        hr = h.do_deferred_action(L"WixExecServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
+//        if (FAILED(hr)) {
+//          h.errorMessage(_T("failed to schedule service install exceptions execution"));
+//          return hr;
+//        }
+//      }
+//      else
+//      {
+//        h.logMessage(_T("Scheduling (WixExecServiceUninstall) firewall exception: ") + custom_data.to_string());
+//        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
+//        if (FAILED(hr)) {
+//          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
+//          return hr;
+//        }
+//        hr = h.do_deferred_action(L"WixExecServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
+//        if (FAILED(hr)) {
+//          h.errorMessage(_T("failed to schedule service install exceptions execution"));
+//          return hr;
+//        }
+//      }
+//    } else
+//      h.logMessage(_T("No services scheduled"));
+//  } catch (installer_exception e) {
+//    h.errorMessage(_T("Failed to install service: ") + e.what());
+//    return ERROR_INSTALL_FAILURE;
+//  } catch (...) {
+//    h.errorMessage(_T("Failed to install service: <UNKNOWN EXCEPTION>"));
+//    return ERROR_INSTALL_FAILURE;
+//  }
   return ERROR_SUCCESS;
 
 }
+
+
+class installer_logger : public settings::logger_interface {
+public:
+  msi_helper &h;
+  std::wstring error;
+
+  installer_logger(msi_helper &h) : h(h) {}
+
+  virtual void err(std::string file, int line, std::wstring message) {
+    error = message;
+    h.logMessage(_T("ERROR: ") + message);
+  }
+  virtual void warn(std::string file, int line, std::wstring message) {
+    h.logMessage(_T("WARN: ") + message);
+  }
+  virtual void info(std::string file, int line, std::wstring message) {
+    h.logMessage(_T("INFO: ") + message);
+  }
+  virtual void debug(std::string file, int line, std::wstring message) {}
+};
+
+struct installer_settings_provider : public settings_manager::provider_interface {
+
+  msi_helper &h;
+  std::wstring basepath;
+  installer_logger logger;
+
+  installer_settings_provider(msi_helper &h, std::wstring basepath) : h(h), logger(h), basepath(basepath) {}
+
+  virtual std::wstring expand_path(std::wstring file) {
+    strEx::replace(file, _T("${base-path}"), basepath);
+    strEx::replace(file, _T("${exe-path}"), basepath);
+    strEx::replace(file, _T("${shared-path}"), basepath);
+    return file;
+  }
+  virtual void log_fatal_error(std::wstring error) {
+    logger.err("", 0, error);
+  }
+  virtual settings::logger_interface* create_logger() {
+    return &logger;
+  }
+  boolean has_error() {
+    return !logger.error.empty();
+  }
+  std::wstring get_error() {
+    return logger.error;
+  }
+};
+
+std::wstring has_key(std::wstring path, std::wstring key) {
+  return settings_manager::get_settings()->has_key(path, key)?_T("1"):_T("");
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-//#pragma comment(linker, "/EXPORT:ImportConfig=_ImportConfig@4")
-extern "C" UINT __stdcall ImportConfig (MSIHANDLE hInstall) {
+// Many options:
+// - configuration not allowed    => CONF_CAN_CHANGE=0, CONF_OLD_FOUND=0, CONF_HAS_ERRORS=0
+// - target not found       => CONF_CAN_CHANGE=1, CONF_OLD_FOUND=0, CONF_HAS_ERRORS=0
+// - target found + config read   => CONF_CAN_CHANGE=1, CONF_OLD_FOUND=1, CONF_HAS_ERRORS=0
+// - target found + config NOT read => CONF_CAN_CHANGE=0, CONF_OLD_FOUND=?, CONF_HAS_ERRORS=1
+//
+// Interpretation:
+// CONF_HAS_ERRORS=1  => Dont allow anything (inform of issue)
+// CONF_CAN_CHANGE=1  => Allow change
+// CONF_OLD_FOUND=0   => Allow setting boot.ini
+
+extern "C" UINT __stdcall ImportConfig(MSIHANDLE hInstall) {
   msi_helper h(hInstall, _T("ImportConfig"));
   try {
@@ -187 +182 @@
     std::wstring main = h.getPropery(_T("MAIN_CONFIGURATION_FILE"));
     std::wstring custom = h.getPropery(_T("CUSTOM_CONFIGURATION_FILE"));
-
-//    h.setupMyProperty(_T("ALLOWED_HOSTS"), MAIN_ALLOWED_HOSTS_DEFAULT);
-//    h.setupMyProperty(_T("NSCLIENT_PWD"), MAIN_SETTINGS_PWD_DEFAULT);
-    h.setupMyProperty(_T("CONF_NRPE"), _T(""));
-    h.setupMyProperty(_T("CONF_NSCLIENT"), _T(""));
-    h.setupMyProperty(_T("CONF_NSCA"), _T(""));
-    h.setupMyProperty(_T("CONF_CHECKS"), _T(""));
-    h.setupMyProperty(_T("CONF_WMI"), _T(""));
-
-    std::wstring filename = target + _T("\\") + main;
-    if (!file_helpers::checks::exists(filename)) {
-      h.setProperty(_T("CONF_CHECKS_GRAY"), _T(""));
-      h.setProperty(_T("CONF_CAN_WRITE"), _T("1"));
-      h.setProperty(_T("CONF_OLD_NOT_FOUND"), _T("1"));
+    std::wstring allow = h.getPropery(_T("ALLOW_CONFIGURATION"));
+    if (allow == _T("0")) {
+      h.logMessage(_T("Configuration not allowed: ") + allow);
+      h.setProperty(_T("CONF_CAN_CHANGE"), _T("0"));
+      h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+      h.setProperty(_T("CONF_HAS_ERRORS"), _T("0"));
       return ERROR_SUCCESS;
     }
 
-//    Settings::getInstance()->setFile(target, main);
-//    if (Settings::getInstance()->getActiveType() == _T("INI-file")) {
-//      h.setProperty(_T("CONF_CAN_WRITE"), _T("1"));
-//      CopyFile(filename.c_str(), (h.getTempPath() + _T("\\old_nsc.ini")).c_str(), FALSE);
-//    } else
-//      h.setProperty(_T("CONF_CAN_WRITE"), _T("0"));
-
-
-
-
-//    std::wstring allowed_hosts = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT);
-//    h.setMyProperty(_T("ALLOWED_HOSTS"), allowed_hosts);
-// 
-//    std::wstring password = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
-//    h.setMyProperty(_T("NSCLIENT_PWD"), password);
-
-    int found_common_checks = 0;
-//    settings_base::sectionList list = Settings::getInstance()->getSection(_T("modules"));
-//    for (settings_base::sectionList::const_iterator cit=list.begin(); cit!=list.end();++cit) {
-//      if (*cit == _T("NRPEListener.dll")) {
-//        h.setMyProperty(_T("CONF_NRPE"), _T("1"));
-//      }
-//      if (*cit == _T("NSClientListener.dll")) {
-//        h.setMyProperty(_T("CONF_NSCLIENT"), _T("1"));
-//      }
-//      if (*cit == _T("NSCAAgent.dll")) {
-//        h.setMyProperty(_T("CONF_NSCA"), _T("1"));
-//      }
-//      if (*cit == _T("CheckWMI.dll")) {
-//        h.setMyProperty(_T("CONF_WMI"), _T("1"));
-//      }
-//      if (
-//        (*cit == _T("FileLogger.dll")) ||
-//        (*cit == _T("CheckSystem.dll")) ||
-//        (*cit == _T("CheckDisk.dll")) ||
-//        (*cit == _T("CheckEventLog.dll")) ||
-//        (*cit == _T("CheckHelpers.dll"))
-//        ) {
-//        found_common_checks++;
-//      }
-//    }
-//    if (found_common_checks == 5) {
-//      h.setMyProperty(_T("CONF_CHECKS"), _T("1"));
-//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T(""));
-//    } else if (found_common_checks == 0) {
-//      h.setMyProperty(_T("CONF_CHECKS"), _T(""));
-//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T(""));
-//    } else {
-//      h.setMyProperty(_T("CONF_CHECKS"), _T("1"));
-//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T("1"));
-//    }
-//    Settings::destroyInstance();
-    h.setProperty(_T("CONF_OLD_NOT_FOUND"), _T("0"));
+    if (!file_helpers::checks::exists(target)) {
+      h.logMessage(_T("Target folder not found: ") + target);
+      h.setProperty(_T("CONF_CAN_CHANGE"), _T("1"));
+      h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+      h.setProperty(_T("CONF_HAS_ERRORS"), _T("0"));
+      return ERROR_SUCCESS;
+    }
+
+    installer_settings_provider provider(h, target);
+    if (!settings_manager::init_settings(&provider, _T(""))) {
+      h.setProperty(_T("CONF_OLD_ERROR"), provider.get_error());
+      h.setProperty(_T("CONF_CAN_CHANGE"), _T("0"));
+      h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+      h.setProperty(_T("CONF_HAS_ERRORS"), _T("1"));
+      return ERROR_SUCCESS;
+    }
+    if (provider.has_error()) {
+      h.setProperty(_T("CONF_OLD_ERROR"), provider.get_error());
+      h.setProperty(_T("CONF_CAN_CHANGE"), _T("0"));
+      h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+      h.setProperty(_T("CONF_HAS_ERRORS"), _T("1"));
+      return ERROR_SUCCESS;
+    }
+    h.setProperty(_T("CONFIGURATION_TYPE"), settings_manager::get_settings()->get_context());
+    h.setProperty(_T("CONF_CAN_CHANGE"), _T("1"));
+    h.setProperty(_T("CONF_OLD_FOUND"), _T("1"));
+    h.setProperty(_T("CONF_HAS_ERRORS"), _T("0"));
+
+    h.setPropertyAndOld(_T("ALLOWED_HOSTS"), settings_manager::get_settings()->get_string(_T("/settings/default/"), _T("allowed hosts"), _T("")));
+    h.setPropertyAndOld(_T("NSCLIENT_PWD"), settings_manager::get_settings()->get_string(_T("/settings/default/"), _T("password"), _T("")));
+
+    std::wstring modpath = _T("/modules");
+    h.setPropertyAndOld(_T("CONF_NRPE"), has_key(modpath, _T("NRPEServer")));
+    h.setPropertyAndOld(_T("CONF_SCHEDULER"), has_key(modpath, _T("Scheduler")));
+    h.setPropertyAndOld(_T("CONF_NSCA"), has_key(modpath, _T("NSCAAgent")));
+    h.setPropertyAndOld(_T("CONF_NSCLIENT"), has_key(modpath, _T("NSClientServer")));
+    h.setPropertyAndOld(_T("CONF_WMI"), has_key(modpath, _T("CheckWMI")));
+
+    if (settings_manager::get_settings()->has_key(modpath, _T("CheckSystem")) &&
+      settings_manager::get_settings()->has_key(modpath, _T("CheckDisk")) &&
+      settings_manager::get_settings()->has_key(modpath, _T("CheckEventLog")) &&
+      settings_manager::get_settings()->has_key(modpath, _T("CheckHelpers")) &&
+      settings_manager::get_settings()->has_key(modpath, _T("CheckExternalScripts")) &&
+      settings_manager::get_settings()->has_key(modpath, _T("CheckNSCP"))
+      ) {
+        h.setPropertyAndOld(_T("CONF_CHECKS"), _T("1"));
+    } else {
+      h.setPropertyAndOld(_T("CONF_CHECKS"), _T("0"));
+    }
+    settings_manager::destroy_settings();
+
   } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to read old configuration file: ") + e.what());
-    h.setProperty(_T("INSCON_CONFIGURE"),_T("0"));
-    h.setProperty(_T("CONF_CAN_WRITE"), _T("0"));
-    return ERROR_INSTALL_FAILURE;
-//  } catch (SettingsException e) {
-//    h.errorMessage(_T("Failed to read old configuration file: ") + e.getMessage());
-//    h.setProperty(_T("INSCON_CONFIGURE"),_T("0"));
-//    h.setProperty(_T("CONF_CAN_WRITE"), _T("0"));
-//    return ERROR_SUCCESS;
+    h.logMessage(_T("Failed to read old configuration file: ") + e.what());
+    h.setProperty(_T("CONF_OLD_ERROR"), e.what());
+    h.setProperty(_T("CONF_CAN_CHANGE"), _T("0"));
+    h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+    h.setProperty(_T("CONF_HAS_ERRORS"), _T("1"));
+    return ERROR_SUCCESS;
   } catch (...) {
-    h.errorMessage(_T("Failed to read old configuration file: <UNKNOWN EXCEPTION>"));
-    h.setProperty(_T("INSCON_CONFIGURE"),_T("0"));
-    h.setProperty(_T("CONF_CAN_WRITE"), _T("0"));
-    return ERROR_INSTALL_FAILURE;
+    h.logMessage(_T("Failed to read old configuration file: Unknown exception"));
+    h.setProperty(_T("CONF_OLD_ERROR"), _T("Unknown exception!"));
+    h.setProperty(_T("CONF_CAN_CHANGE"), _T("0"));
+    h.setProperty(_T("CONF_OLD_FOUND"), _T("0"));
+    h.setProperty(_T("CONF_HAS_ERRORS"), _T("1"));
+    return ERROR_SUCCESS;
   }
   return ERROR_SUCCESS;
 }
 
-
-bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_desc, std::wstring service_deps) {
-  h.updateProgress(_T("Preparing to install service"), service_short_name);
-  try {
-    if (serviceControll::isStarted(service_short_name)) {
-      h.updateProgress(_T("Stopping service"), service_short_name);
-      serviceControll::Stop(service_short_name);
-    }
-    if (serviceControll::isInstalled(service_short_name)) {
-      h.updateProgress(_T("Uninstalling service"), service_short_name);
-      serviceControll::Uninstall(service_short_name);
-    }
-    h.updateProgress(_T("Installing service"), service_short_name);
-    serviceControll::Install(service_short_name, service_long_name, service_deps, SERVICE_WIN32_OWN_PROCESS, exe);
-  } catch (const serviceControll::SCException& e) {
-    h.errorMessage(_T("Failed to install service: ") + e.error_);
-    return false;
-  }
-  try {
-    serviceControll::SetDescription(service_short_name, service_desc);
-  } catch (const serviceControll::SCException& e) {
-    h.errorMessage(_T("Failed to set description of service: ") + e.error_);
-  }
-  return true;
-}
-
-bool uninstall(msi_helper &h, std::wstring service_name) {
-  h.updateProgress(_T("Preparing to uninstall service"), service_name);
-  try {
-    if (!serviceControll::isInstalled(service_name))
-      return true;
-    if (serviceControll::isStarted(service_name)) {
-      h.updateProgress(_T("Stopping service"), service_name);
-      serviceControll::Stop(service_name);
-    }
-    h.updateProgress(_T("Uninstalling service"), service_name);
-    serviceControll::Uninstall(service_name);
-  } catch (const serviceControll::SCException& e) {
-    h.errorMessage(_T("Failed to uninstall service: ") + e.error_);
-    return false;
-  }
-  return true;
-}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 bool write_config(msi_helper &h, std::wstring path, std::wstring file);
+
+
+void write_changed_key(msi_helper &h, msi_helper::custom_action_data_w &data, std::wstring prop, std::wstring path, std::wstring key, std::wstring val = _T("")) {
+  data.write_int(h.propertyTouched(prop)?1:2);
+  data.write_string(path);
+  data.write_string(key);
+  if (val.empty())
+    data.write_string(h.getPropery(prop));
+  else
+    data.write_string(val);
+}
+
+void write_key(msi_helper::custom_action_data_w &data, int mode, std::wstring path, std::wstring key, std::wstring val) {
+  data.write_int(mode);
+  data.write_string(path);
+  data.write_string(key);
+  data.write_string(val);
+}
 
 extern "C" UINT __stdcall ScheduleWriteConfig (MSIHANDLE hInstall) {
   msi_helper h(hInstall, _T("ScheduleWriteConfig"));
   try {
-    std::wstring target = h.getTargetPath(_T("INSTALLLOCATION"));
-    std::wstring main_conf = h.getPropery(_T("MAIN_CONFIGURATION_FILE"));
-    std::wstring custom_conf = h.getPropery(_T("CUSTOM_CONFIGURATION_FILE"));
-
-    std::wstring write = target + _T("\\") + custom_conf;
-    h.logMessage(_T("config file (update): ") + write);
-
-    if (h.getPropery(_T("CONF_CAN_WRITE")) == _T("1")) {
-      if (h.getPropery(_T("KEEP_WHICH_CONFIG")) == _T("OLD")) {
-        CopyFile((target + _T("\\nsc.ini")).c_str(), (target + _T("\\nsc.new")).c_str(), FALSE);
-        CopyFile((h.getTempPath() + _T("\\old_nsc.ini")).c_str(), (target + _T("\\nsc.ini")).c_str(), FALSE);
-      } else {
-        CopyFile((h.getTempPath() + _T("\\old_nsc.ini")).c_str(), (target + _T("\\nsc.old")).c_str(), FALSE);
-      }
-    }
-    if (h.getPropery(_T("KEEP_WHICH_CONFIG")) == _T("NEW")) {
-      if (!write_config(h, target, custom_conf)) {
-        h.logMessage(_T("Failed to write configuration"));
-        return ERROR_INSTALL_FAILURE;
+    if (h.getPropery(_T("CONF_CAN_CHANGE")) != _T("1")) {
+      return ERROR_SUCCESS;
+    }
+    msi_helper::custom_action_data_w data;
+    data.write_string(h.getTargetPath(_T("INSTALLLOCATION")));
+    data.write_string(h.getPropery(_T("CONFIGURATION_TYPE")));
+    data.write_int(h.getPropery(_T("ADD_DEFAULTS"))==_T("1")?1:0);
+
+    std::wstring modpath = _T("/modules");
+    std::wstring modval = _T("");
+    write_changed_key(h, data, _T("CONF_NRPE"), modpath, _T("NRPEServer"), modval);
+    write_changed_key(h, data, _T("CONF_SCHEDULER"), modpath, _T("Scheduler"), modval);
+    write_changed_key(h, data, _T("CONF_NSCA"), modpath, _T("NSCAAgent"), modval);
+    write_changed_key(h, data, _T("CONF_NSCLIENT"), modpath, _T("NSClientServer"), modval);
+    write_changed_key(h, data, _T("CONF_WMI"), modpath, _T("CheckWMI"), modval);
+
+    if (h.propertyTouched(_T("CONF_CHECKS"))) {
+      write_key(data, 1, modpath, _T("CheckSystem"), modval);
+      write_key(data, 1, modpath, _T("CheckDisk"), modval);
+      write_key(data, 1, modpath, _T("CheckEventLog"), modval);
+      write_key(data, 1, modpath, _T("CheckHelpers"), modval);
+      write_key(data, 1, modpath, _T("CheckExternalScripts"), modval);
+      write_key(data, 1, modpath, _T("CheckNSCP"), modval);
+    }
+
+    std::wstring defpath = _T("/settings/default/");
+    write_changed_key(h, data, _T("ALLOWED_HOSTS"), defpath, _T("allowed hosts"));
+    write_changed_key(h, data, _T("NSCLIENT_PWD"), defpath, _T("password"));
+
+    if (data.has_data()) {
+      h.logMessage(_T("Scheduling (ExecWriteConfig): ") + data.to_string());
+      HRESULT hr = h.do_deferred_action(L"ExecWriteConfig", data, 1000);
+      if (FAILED(hr)) {
+        h.errorMessage(_T("failed to schedule config update"));
+        return hr;
       }
     }
@@ -362 +337 @@
     msi_helper::custom_action_data_r data(h.getPropery(L"CustomActionData"));
     h.logMessage(_T("Got CA data: ") + data.to_string());
-    std::wstring path = data.get_next_string();
-    std::wstring file = data.get_next_string();
-//    Settings::getInstance()->setFile(path, file, true);
+    std::wstring target = data.get_next_string();
+    std::wstring context = data.get_next_string();
+    int add_defaults = data.get_next_int();
+
+    installer_settings_provider provider(h, target);
+    if (!settings_manager::init_settings(&provider, _T(""))) {
+      h.errorMessage(_T("Failed to boot settings: ") + provider.get_error());
+      return ERROR_INSTALL_FAILURE;
+    }
+    settings_manager::change_context(context);
 
     while (data.has_more()) {
       unsigned int mode = data.get_next_int();
+      std::wstring path = data.get_next_string();
+      std::wstring key = data.get_next_string();
+      std::wstring val = data.get_next_string();
+
       if (mode == 1) {
-      // loop through all the passed in data
-        std::wstring path = data.get_next_string();
-        std::wstring key = data.get_next_string();
-        std::wstring prop = data.get_next_string();
-        h.logMessage(_T("Writing to config file: ") + path + _T("/") + key + _T(" = ") + prop);
-//        Settings::getInstance()->setString(path, key, prop);
-        //TODO write config
+        h.logMessage(_T("Set key: ") + path + _T("/") + key + _T(" = ") + val);
+        settings_manager::get_settings()->set_string(path, key, val);
       } else if (mode == 2) {
-        std::list<std::wstring> list = data.get_next_list();
-        h.logMessage(_T("Writing modules section: ") + strEx::itos(list.size()));
-//        Settings::getInstance()->writeSection(_T("modules"), list);
+        h.logMessage(_T("***UNSUPPORTED*** Remove key: ") + path + _T("/") + key + _T(" = ") + val);
       } else {
         h.errorMessage(_T("Unknown mode in CA data: ") + strEx::itos(mode) + _T(": ") + data.to_string());
@@ -385 +364 @@
       }
     }
-//    Settings::getInstance()->write();
-//  } catch (SettingsException e) {
-//    h.errorMessage(_T("Failed to write configuration file: ") + e.getMessage());
-//    return ERROR_SUCCESS;
+    settings_manager::get_settings()->save();
   } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to install service: ") + e.what());
+    h.errorMessage(_T("Failed to write configuration: ") + e.what());
     return ERROR_INSTALL_FAILURE;
   } catch (...) {
-    h.errorMessage(_T("Failed to install service: <UNKNOWN EXCEPTION>"));
+    h.errorMessage(_T("Failed to write configuration: <UNKNOWN EXCEPTION>"));
     return ERROR_INSTALL_FAILURE;
   }
@@ -399 +375 @@
 }
 
-inline void write_string_item_if_changed(msi_helper &h, msi_helper::custom_action_data_w &data, std::wstring property, std::wstring path, std::wstring key) {
-  if (h.isChangedProperyAndOld(property)) {
-    data.write_int(1);
-    data.write_string(path);
-    data.write_string(key);
-    data.write_string(h.getPropery(property));
-  } else
-    h.logMessage(property + _T(" was not changed..."));
-}
-bool write_config(msi_helper &h, std::wstring path, std::wstring file) {
-  std::wstring t;
-  msi_helper::custom_action_data_w data;
-
-  data.write_string(path);
-  data.write_string(file);
-
-  //cd_prop.write_int(1);
-  if (h.getPropery(_T("CONF_CAN_WRITE")) != _T("1")) {
-    h.updateProgress(_T("File is not writable (writing to registry not supported)"), file);
-    return true;
-  }
-
-  //Settings::getInstance()->setFile(path, file, true);
-//  write_string_item_if_changed(h, data, _T("ALLOWED_HOSTS"), MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS);
-//  write_string_item_if_changed(h, data, _T("NSCLIENT_PWD"), MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD);
-
-//  settings_base::sectionList list;
-//  if (h.isChangedProperyAndOld(_T("CONF_NRPE")))
-//    list.push_back(_T("NRPEListener.dll"));
-//  if (h.isChangedProperyAndOld(_T("CONF_NSCLIENT")))
-//    list.push_back(_T("NSClientListener.dll"));
-//  if (h.isChangedProperyAndOld(_T("CONF_NSCA")))
-//    list.push_back(_T("NSCAAgent.dll"));
-//  if (h.isChangedProperyAndOld(_T("CONF_WMI")))
-//    list.push_back(_T("CheckWMI.dll"));
-//  if (h.isChangedProperyAndOld(_T("CONF_CHECKS"))) {
-//    list.push_back(_T("FileLogger.dll"));
-//    list.push_back(_T("CheckSystem.dll"));
-//    list.push_back(_T("CheckDisk.dll"));
-//    list.push_back(_T("CheckEventLog.dll"));
-//    list.push_back(_T("CheckHelpers.dll"));
-//  }
-//  if (list.size() > 0) {
-//    data.write_int(2);
-//    data.write_list(list);
-//  }
-  if (data.has_data()) {
-    h.logMessage(_T("Scheduling (ExecWriteConfig): ") + data.to_string());
-    HRESULT hr = h.do_deferred_action(L"ExecWriteConfig", data, 1000);
-    if (FAILED(hr)) {
-      h.errorMessage(_T("failed to schedule config update"));
-      return hr;
-    }
-  }
-}
-
-
-bool start(msi_helper &h, std::wstring service_name) {
-  if (!serviceControll::isInstalled(service_name)) {
-    h.logMessage(_T("Service was not installed (so we cannot start it): ")+ service_name);
-    return false;
-  }
-
-  h.updateProgress(_T("Preparing to start service"), service_name);
-  try {
-    if (!serviceControll::isStarted(service_name)) {
-      h.updateProgress(_T("Starting service"), service_name);
-      serviceControll::Start(service_name);
-    }
-  } catch (const serviceControll::SCException& e) {
-    h.errorMessage(_T("Failed to start service: ") + e.error_);
-    return false;
-  }
-  return true;
-}
-
-bool stop(msi_helper &h, std::wstring service_name) {
-  h.updateProgress(_T("Preparing to stopp service"), service_name);
-  try {
-    if (serviceControll::isStarted(service_name)) {
-      h.updateProgress(_T("Stopping service"), service_name);
-      serviceControll::Stop(service_name);
-    }
-  } catch (const serviceControll::SCException& e) {
-    h.errorMessage(_T("Failed to stop service: ") + e.error_);
-    return false;
-  }
-  return true;
-}
-
-
-//#pragma comment(linker, "/EXPORT:UpdateConfig=_UpdateConfig@4")
-
-extern "C" UINT __stdcall StartAllServices (MSIHANDLE hInstall) {
-  msi_helper h(hInstall, _T("StartService"));
-  try {
-    std::wstring val = h.getPropery(_T("START_SERVICE_ON_EXIT"));
-    if (val == _T("1")) {
-      // anything to do?
-      if (h.table_exists(L"Services")) {
-        PMSIHANDLE hView = h.open_execute_view(vcsServiceQuery);
-        if (h.isNull(hView)) {
-          h.logMessage(_T("Failed to query service view!"));
-          return ERROR_INSTALL_FAILURE;
-        }
-
-        msi_helper::custom_action_data_w custom_data;
-        PMSIHANDLE hRec = h.fetch_record(hView);
-        while (hRec != NULL)
-        {
-          std::wstring shortname = h.get_record_formatted_string(hRec, feqShortName);
-          std::wstring component = h.get_record_string(hRec, feqComponent);
-
-          // figure out what we're doing for this exception, treating reinstall the same as install
-          msi_helper::WCA_TODO todoComponent = h.get_component_todo(component);
-          if ((msi_helper::WCA_TODO_REINSTALL == todoComponent ? msi_helper::WCA_TODO_INSTALL : todoComponent) != msi_helper::WCA_TODO_INSTALL) {
-            h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent) + _T(") doesn't match request (") + strEx::itos(msi_helper::WCA_TODO_INSTALL) + _T(")"));
-            hRec = h.fetch_record(hView);
-            continue;
-          }
-          try {
-            if (!serviceControll::isStarted(shortname)) {
-              h.updateProgress(_T("Starting service"), shortname);
-              serviceControll::Start(shortname);
-            }
-          } catch (const serviceControll::SCException& e) {
-            h.logMessage(_T("Failed to start service: ") + shortname + _T(": ") + e.error_);
-          }
-          hRec = h.fetch_record(hView);
-        }
-      }
-    }
-    val = h.getPropery(_T("DONATE_ON_EXIT"));
-    if (val == _T("1")) {
-      long r = (long)ShellExecute(NULL, _T("open"), _T("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=michael@medin.name&item_name=Fans+of+NSClient%2B%2B&item_number=Installer+Campaign&amount=10%2e00&currency_code=EUR&return=http%3A//nsclient.org"), NULL, NULL, SW_SHOWNORMAL);
-      if (r > 32)
-        return ERROR_SUCCESS;
-      h.errorMessage(_T("Failed to start web browser for donations..."));
-      return ERROR_INSTALL_FAILURE;
-    }
-  } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to process finalizing stuff: ") + e.what());
-    return ERROR_INSTALL_FAILURE;
-  } catch (...) {
-    h.errorMessage(_T("Failed to process finalizing stuff: <UNKNOWN EXCEPTION>"));
-    return ERROR_INSTALL_FAILURE;
-  }
-  return ERROR_SUCCESS;
-}
-
-
-extern "C" UINT __stdcall StopAllServices (MSIHANDLE hInstall) {
-  msi_helper h(hInstall, _T("StopAllServices"));
-  try {
-
-    // anything to do?
-    if (!h.table_exists(L"Services")) {
-      h.logMessage(_T("Services table doesn't exist, so there are no services to configure."));
-      return ERROR_SUCCESS;
-    }
-
-    // query and loop through all the firewall exceptions
-    PMSIHANDLE hView = h.open_execute_view(vcsServiceQuery);
-    if (h.isNull(hView)) {
-      h.logMessage(_T("Failed to query service view!"));
-      return ERROR_INSTALL_FAILURE;
-    }
-
-    msi_helper::custom_action_data_w custom_data;
-    PMSIHANDLE hRec = h.fetch_record(hView);
-    while (hRec != NULL)
-    {
-      std::wstring shortname = h.get_record_formatted_string(hRec, feqShortName);
-      std::wstring component = h.get_record_string(hRec, feqComponent);
-
-      // figure out what we're doing for this exception, treating reinstall the same as install
-      msi_helper::WCA_TODO todoComponent = h.get_component_todo(component);
-      if (todoComponent == msi_helper::WCA_TODO_REINSTALL)
-        todoComponent = msi_helper::WCA_TODO_INSTALL;
-      h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent));
-      if (todoComponent != msi_helper::WCA_TODO_INSTALL && todoComponent != msi_helper::WCA_TODO_UNINSTALL) {
-        h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent) + _T(") doesn't match request (IN/UN/RE)"));
-        hRec = h.fetch_record(hView);
-        continue;
-      }
-      try {
-        if (serviceControll::isStarted(shortname)) {
-          h.updateProgress(_T("Stopping service"), shortname);
-          serviceControll::Stop(shortname);
-        }
-      } catch (const serviceControll::SCException& e) {
-        h.logMessage(_T("Failed to stop service: ") + shortname + _T(": ") + e.error_);
-      }
-      hRec = h.fetch_record(hView);
-    }
-  } catch (installer_exception e) {
-    h.errorMessage(_T("Failed to stop service: ") + e.what());
-    return ERROR_INSTALL_FAILURE;
-  } catch (...) {
-    h.errorMessage(_T("Failed to stop service: <UNKNOWN EXCEPTION>"));
-    return ERROR_INSTALL_FAILURE;
-  }
-  return ERROR_SUCCESS;
-}
+
 
 extern "C" UINT __stdcall NeedUninstall (MSIHANDLE hInstall) {

helpers/installer-dlls/main_dll/main_dll.def

@@ -5 +5 @@
   ScheduleWriteConfig
   ExecWriteConfig
-  StartAllServices
-  StopAllServices
-  ScheduleInstallService
-  ScheduleUnInstallService
-  ExecServiceInstall
   NeedUninstall

helpers/installers/installer/CMakeLists.txt

@@ -7 +7 @@
 SET(SRCS
   Product.wxs
-  WixUI.wixlib
+
+  ../ui/ConfigureDlg.wxs
+  ../ui/InvalidConfigureationDlg.wxs
+  ../ui/SelectConfigurationDlg.wxs
+  ../ui/WixUI_MondoNSCP.wxs
 )
+# WixUI.wixlib
 SET(DEPENDENCIES
   nscp
+  main_dll
 )
-GET_FILENAME_COMPONENT(_tmp_FILE WixUI_en-us.wxl ABSOLUTE)
+#GET_FILENAME_COMPONENT(_tmp_FILE WixUI_en-us.wxl ABSOLUTE)
 
 SET(LOCALIZATIONS
-  ${_tmp_FILE}
+  en-us
 )
 

helpers/installers/installer/Product.wxs

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <?define PlatForm = "$(var.arch)" ?>
-  <?define Mode = "Nightly" ?>
-  <?define SysTray.ConfigurationName = "BOOST BUILD" ?>
-
-  <?if "$(var.PlatForm)" = "x64"?>
-    <?define PlatForm.x64 ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?if "$(var.arch)" = "x64"?>
     <?define Postfix.GUID = "DD5862EE637C" ?>
+    <?define ProgramFiles = "ProgramFiles64Folder" ?>
+    <?define Win64 = "yes" ?>
+    <?define Plattform = "x64" ?>
   <?else?>
     <?define Postfix.GUID = "DD5862EE637B" ?>
-    <?define PlatForm.Win32 ?>
-  <?endif?>
-  
-  <?ifdef var.PlatForm.Win32?>
     <?define ProgramFiles = "ProgramFilesFolder" ?>
     <?define Win64 = "no" ?>
     <?define Plattform = "Intel" ?>
-  <?else?>
-    <?define ProgramFiles = "ProgramFiles64Folder" ?>
-    <?define Win64 = "yes" ?>
-    <?define Plattform = "x64" ?>
-  <?endif?>
-  <?ifndef var.Source ?>
-    <?define Source = "../../$(var.PlatForm)/$(var.Mode)/" ?>
   <?endif?>
 
   <?define Version.String = "$(var.Version.Major).$(var.Version.Minor).$(var.Version.Revision).$(var.Version.Build)" ?>
   <?define UpgradeCode = "0B36E3B7-0042-452d-B376-57E0C07ADDAA" ?>
+  
   <?include config.wxs ?>
 
-  <Product Id="????????-????-????-????-????????????" Name="$(var.App.Title) ($(var.PlatForm))" Language="1033" Version="$(var.Version.String)" Manufacturer="MySolutions NORDIC"
-          UpgradeCode="$(var.UpgradeCode)">
-
-    <Package Id="????????-????-????-????-????????????" Description="A simple windows monitor agent for (amongst others) Nagios."
-             Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes" Languages="1033" Platforms="$(var.Plattform)" />
+  <Product Id="*" Name="$(var.App.Title) ($(var.arch))" Language="1033" Version="$(var.Version.String)" Manufacturer="MySolutions NORDIC" UpgradeCode="$(var.UpgradeCode)">
+
+    <Package Id="*" Description="A simple windows monitor agent for (amongst others) Nagios."
+             Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes" Languages="1033" Platform="$(var.Plattform)" />
 
     <Upgrade Id="$(var.UpgradeCode)">
-      <UpgradeVersion Property="OLDAPPFOUND" IncludeMinimum="yes" Minimum="0.3.0.0" IncludeMaximum="yes" Maximum="$(var.Version.String)"/>
+      <UpgradeVersion Property="OLDAPPFOUND" IncludeMinimum="yes" Minimum="0.3.0.0" IncludeMaximum="no" Maximum="$(var.Version.String)"/>
       <UpgradeVersion Property="NEWAPPFOUND" IncludeMinimum="no" Minimum="$(var.Version.String)" OnlyDetect="yes"/>
     </Upgrade>
 
-    <?ifdef var.PlatForm.Win32?>
+    <?if "$(var.arch)" = "x64"?>
+      <Condition Message="Win32 bit version not supported (by installer) on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition>
+    <?else?>
       <Condition Message="x64 bit version not supported (by installer) on Win32 bit platform (get Win32 bit version instead)">NOT VersionNT64</Condition>
-    <?else?>
-      <Condition Message="Win32 bit version not supported (by installer) on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition>
     <?endif?>
-    <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high">
-    </Media>
+    <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high" />
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.ProgramFiles)">
-          <Directory Id="INSTALLLOCATION" Name="$(var.App.ShortPath)" LongName="$(var.App.Path)">
-            <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NSClientEXE" Name="nscp.exe" LongName="nscp.exe" DiskId="1"
-                    Source="$(var.Source)/nscp.exe" Vital="yes">
-                <Shortcut Id="StartmenuNSClientTest" Directory="ProgramMenuDir" Name="NSCPTest"
-                          LongName="$(var.App.Title) ($(var.PlatForm), test)" WorkingDirectory="INSTALLDIR" Icon="nscp.exe"
-                          IconIndex="0" Arguments="/test" Description="Run $(var.App.Title) in test mode"/>
-                <Shortcut Id="StartmenuNSClientStart" Directory="ProgramMenuDir" Name="NSCPStrt"
-                          LongName="Start $(var.App.Title) ($(var.PlatForm))" WorkingDirectory='INSTALLDIR' Icon="nscp.exe"
-                          IconIndex="0" Arguments="/start" Description="Start the $(var.App.Title) service"/>
-                <Shortcut Id="StartmenuNSClientStop" Directory="ProgramMenuDir" Name="NSCPStop"
-                          LongName="Stop $(var.App.Title) ($(var.PlatForm))" WorkingDirectory='INSTALLDIR' Icon="nscp.exe"
-                          IconIndex="0" Arguments="/stop" Description="Stop the $(var.App.Title) service"/>
-                <Shortcut Id="StarmentNSCHelp" Target="[HELP_LINK]" Icon="doc.ico" Directory="ProgramMenuDir" Name="Help" LongName="Documentation" Description="Visit the NSClient++ WIKI for documentation">
-                  <Icon Id="doc.ico" SourceFile="help.ico"/>
-                </Shortcut>
-              </File>
+        <Directory Id="INSTALLLOCATION" Name="$(var.App.Path)">
+          <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="NSClientEXE" Name="nscp.exe" DiskId="1" KeyPath="yes"
+                Source="$(var.Source)/nscp.exe" Vital="yes">
+              <Shortcut Id="StartmenuNSClientTest" Directory="ProgramMenuDir"
+                Name="$(var.App.Title) ($(var.arch), test)" WorkingDirectory="INSTALLDIR" Icon="nscp.exe"
+                Advertise="yes" IconIndex="0" Arguments="--test" Description="Run $(var.App.Title) in test mode" />
+              <fire:FirewallException Id="FWX1" Name="NSClient++ Monitoring Agent" Scope="any" IgnoreFailure="yes" />
+            </File>
+            <ServiceInstall Id="SWCNSCP"
+              Name="[SERVICE_NAME]" DisplayName="$(var.App.Title) ($(var.arch))"
+              Type="ownProcess" Start="auto" ErrorControl="normal" Interactive="no"
+              Description="Monitoring agent for nagios (and others) used to respond to status queries"
+              Arguments="--service --run --name [SERVICE_NAME]" />
+            <ServiceControl Id="StartSWCNSCP" Name="[SERVICE_NAME]" Start="install" Wait="no" />
+            <ServiceControl Id="StopSWCNSCP" Name="[SERVICE_NAME]" Stop="both" Wait="yes" Remove="uninstall" />
+            <RemoveFolder Id="RemoveMenuShortcuts" Directory="ProgramMenuDir" On="uninstall" />
+          </Component>
+          <Component Id="Shortcuts" Guid="E6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <Shortcut Id="StartmenuNSClientStart" Directory="ProgramMenuDir" Name="Start $(var.App.Title) ($(var.arch))"
+                  WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
+                  Arguments="--service --name [SERVICE_NAME] --start" Description="Start the $(var.App.Title) service" />
+            <Shortcut Id="StartmenuNSClientStop" Directory="ProgramMenuDir" Name="Stop $(var.App.Title) ($(var.arch))"
+                  WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
+                  Arguments="--service --name [SERVICE_NAME] --stop" Description="Stop the $(var.App.Title) service" />
+            <Shortcut Id="StarmentNSCHelp" Directory="ProgramMenuDir" Name="Documentation"
+                  Target="[HELP_LINK]" Icon="doc.ico"
+                  Description="Visit the NSClient++ WIKI for documentation">
+            </Shortcut>
+            <RegistryValue Root="HKCU" Key="Software\NSClient++\Installer" Name="shortcuts" Type="integer" Value="1" KeyPath="yes"/>
+          </Component>
+          <Component Id="Helpers" Guid="A6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <!--
+            <File Id="NSClientTRAY" Name="nstray.exe" DiskId="1"
+                Source="$(var.Source)/nstray.exe" Vital="yes">
+              <Shortcut Id="StartmenuNSClientTray" Directory="ProgramMenuDir" Name="NSCPTray"
+                LongName="$(var.App.Title) ($(var.arch)) system tray)" WorkingDirectory="INSTALLDIR" Icon="nstray.exe"
+                IconIndex="0" Description="Start the $(var.App.Title) systemtray agent"/>
+            </File>
+            -->
+            <File Id="ErrorReporter" Name="reporter.exe" DiskId="1" Source="$(var.Source)/reporter.exe" Vital="yes" />
+            <!--
+              <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Path.ini)/NSC.ini" Vital="yes"/>
+            -->
+          </Component>
+          <Component Id="RandomFiles" Guid="B4636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="Changelog" Name="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no" />
+            <File Id="Counters" Name="counters.defs" DiskId="1" Source="$(var.Source)/counters.defs" Vital="no" />
+            <File Id="License" Name="license.txt" DiskId="1" Source="$(var.Source)/license.txt" Vital="no" KeyPath="yes" />
+            <File Id="settingsMap" Name="old-settings.map" DiskId="1" Source="$(var.Source)/old-settings.map" Vital="no" />
+
+            <RemoveFile Id="LogFile1" Name="nsclient.log" On="uninstall" />
+            <RemoveFile Id="LogFile2" Name="nsc.log" On="uninstall" />
+            <RemoveFile Id="OldConfig" Name="nsc.old" On="uninstall" />
+            <RemoveFile Id="NewConfig" Name="nsc.new" On="uninstall" />
+          </Component>
+          <Component Id="NagiosDocumentation" Guid="9B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="doc.usage.nagios" Name="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/docs/Nagios Usage Guide.pdf" Vital="no" KeyPath="yes">
+              <Shortcut Id="Startmenu.doc.nagios" Directory="ProgramMenuDir" Name="Nagios Usage Guide" Advertise="yes" 
+                    WorkingDirectory="INSTALLDIR" Description="Nagios Usage Guide"/>
+            </File>
+          </Component>
+          <Component Id="ReferenceDocumentation" Guid="8B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="doc.reference" Name="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/docs/NSClient++ Reference Manual.pdf" Vital="no" KeyPath="yes">
+              <Shortcut Id="Startmenu.doc.ref" Directory="ProgramMenuDir" Name="NSClient++ Reference Manual" Advertise="yes" 
+                    WorkingDirectory="INSTALLDIR" Description="NSClient++ Reference Manual"/>
+            </File>
+          </Component>
+          <Directory Id="INSTALLLOCATION_SECURITY" Name="security">
+            <Component Id="NRPEServerCert" Guid="5A0246F8-5167-45db-2E46-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NRPECert" Name="nrpe_dh_512.pem" DiskId="1" Source="$(var.Source)/security/nrpe_dh_512.pem" Vital="no"/>
+            </Component>
+          </Directory>
+          <Directory Id="INSTALLLOCATION_MODS" Name="modules">
+            <Component Id="NRPEServer" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NRPEListenerDLL" Name="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEServer.dll" Vital="no" />
+              <File Id="NRPEClientDLL" Name="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" />
+            </Component>
+            <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NSCListenerDLL" Name="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientServer.dll" Vital="no" />
+            </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="SchedulerDLL" Name="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
+            </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" />
+              <File Id="ModCheckHelpers.dll" Name="CheckHelpers.dll" DiskId="1" Source="$(var.Source)/modules/CheckHelpers.dll" Vital="no" />
+              <File Id="ModCheckSystem.dll" Name="CheckSystem.dll" DiskId="1" Source="$(var.Source)/modules/CheckSystem.dll" Vital="no" />
+              <File Id="ModCheckWMI.dll" Name="CheckWMI.dll" DiskId="1" Source="$(var.Source)/modules/CheckWMI.dll" Vital="no" />
+              <File Id="ModFileLogger.dll" Name="FileLogger.dll" DiskId="1" Source="$(var.Source)/modules/FileLogger.dll" Vital="no" />
+              <File Id="ModLUAScript.dll" Name="LUAScript.dll" DiskId="1" Source="$(var.Source)/modules/LUAScript.dll" Vital="no" />
+              <File Id="ModCheckNSCP.dll" Name="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" />
+              <File Id="ModCheckDisk.dll" Name="CheckDisk.dll" DiskId="1" Source="$(var.Source)/modules/CheckDisk.dll" Vital="no" />
+              <File Id="ModCheckTaskSched.dll" Name="CheckTaskSched.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched.dll" Vital="no" />
+              <File Id="ModCheckTaskSched2.dll" Name="CheckTaskSched2.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched2.dll" Vital="no" />
+            </Component>
+          </Directory>
+          <Directory Id="INSTALLLOCATION_SCRIPTS" Name="scripts">
+            <Component Id="Scripts" Guid="9B490E67-5472-4268-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <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="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="NSClientTRAY" Name="nstray.exe" DiskId="1"
-                    Source="$(var.Source)/nstray.exe" Vital="yes">
-                <Shortcut Id="StartmenuNSClientTray" Directory="ProgramMenuDir" Name="NSCPTray"
-                          LongName="$(var.App.Title) ($(var.PlatForm)) system tray)" WorkingDirectory="INSTALLDIR" Icon="nstray.exe"
-                          IconIndex="0" Description="Start the $(var.App.Title) systemtray agent"/>
-              </File>
+                Scripts missing
+              <File Id="lua001" Name="test.lua" LongName="test.lua" DiskId="1" Source="$(var.Source)/scripts/test.lua" Vital="no" />
               -->
-              <File Id="NSClientErrorReporter" Name="reporter.exe" DiskId="1" Source="$(var.Source)/reporter.exe" Vital="yes" />
-
-              <!--
-              <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Path.ini)/NSC.ini" Vital="yes"/>
-              -->
-              <File Id="Changelog" Name="change.log" LongName="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no"/>
-              <File Id="Counters" Name="counters.def" LongName="counters.defs" DiskId="1" Source="$(var.Source)/counters.defs" Vital="no"/>
-              <File Id="License" Name="license.txt" LongName="license.txt" DiskId="1" Source="$(var.Source)/license.txt" Vital="no"/>
-              
-              <RemoveFile Id="LogFile1" Name="nsclient.log" On="uninstall" />
-              <RemoveFile Id="LogFile2" Name="nsc.log" On="uninstall" />
-              <RemoveFile Id="OldConfig" Name="nsc.old" On="uninstall" />
-              <RemoveFile Id="NewConfig" Name="nsc.new" On="uninstall" />
-            </Component>
-            <Component Id="FireWallException" Guid="F6636DB0-A0B9-4dA2-B75D-$(var.Postfix.GUID)" Win64="$(var.Win64)" />
-            <Component Id="ServiceRegistration" Guid="F6636DB0-A0B9-4dA2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)" />
-            <Component Id="Documentation" Guid="9B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="doc.usage.nagios" Name="nagios.pdf" LongName="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/docs/Nagios Usage Guide.pdf" Vital="no" >
-                <Shortcut Id="Startmenu.doc.nagios" Directory="ProgramMenuDir" Name="nagios"
-                          LongName="Nagios Usage Guide" WorkingDirectory="INSTALLDIR" Description="Nagios Usage Guide"/>
-              </File>
-              <File Id="doc.reference" Name="nsclient.pdf" LongName="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/docs/NSClient++ Reference Manual.pdf" Vital="no" >
-                <Shortcut Id="Startmenu.doc.ref" Directory="ProgramMenuDir" Name="refman"
-                          LongName="NSClient++ Reference Manual" WorkingDirectory="INSTALLDIR" Description="NSClient++ Reference Manual"/>
-              </File>
-            </Component>
-            <Directory Id="INSTALLLOCATION_SECURITY" Name="security">
-              <Component Id="NRPEServerCert" Guid="5A0246F8-5167-45db-2E46-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="NRPECert" Name="nrpe_dh.pem" LongName="nrpe_dh_512.pem" DiskId="1" Source="$(var.Source)/security/nrpe_dh_512.pem" Vital="no"/>
+            </Component>
+            <Directory Id="INSTALLLOCATION_SCRIPTS_LIB" Name="lib">
+              <Component Id="ScriptLibs" Guid="9B490E67-5472-4267-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+                <File Id="lib001" Name="NagiosPlugins.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/NagiosPlugins.vbs" Vital="no" />
+                <File Id="lib002" Name="wrapper.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/wrapper.vbs" Vital="no" />
               </Component>
             </Directory>
-            <Directory Id="INSTALLLOCATION_MODS" Name="modules">
-              <Component Id="NRPEServer" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="NRPEListenerDLL" Name="NRPELsnr.dll" LongName="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEServer.dll" Vital="no" />
-                <File Id="NRPEClientDLL" Name="NRPEClnt.dll" LongName="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" />
-              </Component>
-              <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="NSCListenerDLL" Name="NSCLsnr.dll" LongName="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientServer.dll" Vital="no" />
-              </Component>
-              <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="NSCAAgentDLL" Name="NSCAAgnt.dll" LongName="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" />
-                <File Id="SchedulerDLL" Name="Sched.dll" LongName="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
-              </Component>
-              <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                           <!--
-                <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="EvntLg.dll" LongName="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" />
-                <File Id="ModCheckExternalScripts.dll" Name="ExtScr.dll" LongName="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" />
-                <File Id="ModCheckHelpers.dll" Name="Helpers.dll" LongName="CheckHelpers.dll" DiskId="1" Source="$(var.Source)/modules/CheckHelpers.dll" Vital="no" />
-                <File Id="ModCheckSystem.dll" Name="System.dll" LongName="CheckSystem.dll" DiskId="1" Source="$(var.Source)/modules/CheckSystem.dll" Vital="no" />
-                <File Id="ModCheckWMI.dll" Name="WMI.dll" LongName="CheckWMI.dll" DiskId="1" Source="$(var.Source)/modules/CheckWMI.dll" Vital="no" />
-                <File Id="ModFileLogger.dll" Name="Logger.dll" LongName="FileLogger.dll" DiskId="1" Source="$(var.Source)/modules/FileLogger.dll" Vital="no" />
-                <File Id="ModLUAScript.dll" Name="LUAScr.dll" LongName="LUAScript.dll" DiskId="1" Source="$(var.Source)/modules/LUAScript.dll" Vital="no" />
-                <File Id="ModCheckNSCP.dll" Name="CNSCP.dll" LongName="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" />
-                <!--
-                <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="ModCheckDisk.dll" Name="CheckDsk.dll" LongName="CheckDisk.dll" DiskId="1" Source="$(var.Source)/modules/CheckDisk.dll" Vital="no" />
-                <File Id="ModCheckTaskSched.dll" Name="TaskSch.dll" LongName="CheckTaskSched.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched.dll" Vital="no" />
-                <File Id="ModCheckTaskSched2.dll" Name="TaskSch2.dll" LongName="CheckTaskSched2.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched2.dll" Vital="no" />
-              </Component>
-            </Directory>
-            <Directory Id="INSTALLLOCATION_SCRIPTS" Name="scripts">
-              <Component Id="Scripts" Guid="9B490E67-5472-4268-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="script001" Name="c_60s.bat" LongName="check_60s.bat" DiskId="1" Source="$(var.Source)/scripts/check_60s.bat" Vital="no" />
-                <File Id="script002" Name="c_btry.vbs" LongName="check_battery.vbs" DiskId="1" Source="$(var.Source)/scripts/check_battery.vbs" Vital="no" />
-                <File Id="script003" Name="c_nrdb.bat" LongName="check_no_rdp.bat" DiskId="1" Source="$(var.Source)/scripts/check_no_rdp.bat" Vital="no" />
-                <File Id="script004" Name="c_prt.vbs" LongName="check_printer.vbs" DiskId="1" Source="$(var.Source)/scripts/check_printer.vbs" Vital="no" />
-                <File Id="script005" Name="c_ok.bat" LongName="check_ok.bat" DiskId="1" Source="$(var.Source)/scripts/check_ok.bat" Vital="no" />
-                <File Id="script006" Name="c_files.vbs" LongName="check_files.vbs" DiskId="1" Source="$(var.Source)/scripts/check_files.vbs" Vital="no" />
-                <File Id="script007" Name="c_ping.bat" LongName="check_ping.bat" DiskId="1" Source="$(var.Source)/scripts/check_ping.bat" Vital="no" />
-                <File Id="sample002" Name="c_test.ps1" LongName="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" />
-                <File Id="sample003" Name="c_test.vbs" LongName="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" />
-          <!--
-                <File Id="lua001" Name="test.lua" LongName="test.lua" DiskId="1" Source="$(var.Source)/scripts/test.lua" Vital="no" />
-        -->
-              </Component>
-              <Directory Id="INSTALLLOCATION_SCRIPTS_LIB" Name="lib">
-                <Component Id="ScriptLibs" Guid="9B490E67-5472-4267-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                  <File Id="lib001" Name="nagplug.vbs" LongName="NagiosPlugins.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/NagiosPlugins.vbs" Vital="no" />
-                  <File Id="lib002" Name="wrapper.vbs" LongName="wrapper.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/wrapper.vbs" Vital="no" />
-                </Component>
-              </Directory>
-            </Directory>
           </Directory>
         </Directory>
+      </Directory>
 
       <!-- ### Start Menu Items ### -->
-        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-          <Directory Id="ProgramMenuDir" Name='NSClient' LongName="$(var.App.StartMenuPath)" />
-        </Directory>
+      <Directory Id="ProgramMenuFolder" Name="Programs">
+        <Directory Id="ProgramMenuDir" Name="$(var.App.StartMenuPath)" />
       </Directory>
+    </Directory>
 
     <!-- ### FEATURES START ### -->
-      <Feature Id="ProductFeature" Title="NSClient++ $(var.PlatForm)" Description="Binaries for $(var.PlatForm)"
+    <Feature Id="ProductFeature" Title="NSClient++ $(var.arch)" Description="Binaries for $(var.arch)"
                Display="expand"  Level="1" ConfigurableDirectory="INSTALLLOCATION" Absent="disallow">
-        <Feature Id="MainProgram" Title="Program" Description="Main Service" Level="1" Absent="disallow">
-          <ComponentRef Id="MainClient" />
-        </Feature>
-        <Feature Id="FireWallException" Title="Firewall Exception" Description="Add an exception to the windows firewall" Level="1">
-          <ComponentRef Id="FireWallException" />
-        </Feature>
-        <Feature Id="ServiceRegistration" Title="Register service" Description="Register the NSClient++ service" Level="1">
-          <ComponentRef Id="ServiceRegistration" />
-        </Feature>
-        <Feature Id="Documentation" Title="Documentation (pdf)" Description="Documentation for NSClient++ and how to use it from Nagios" Level="1">
-          <ComponentRef Id="Documentation" />
-        </Feature>
-        <Feature Id="Plugins" Title="Plugins" Description="Plugins" Level="1" Absent="disallow">
+      <Feature Id="MainProgram" Title="Program" Description="Main Service" Level="1" Absent="disallow">
+        <ComponentRef Id="MainClient" />
+        <ComponentRef Id="Shortcuts" />
+        <ComponentRef Id="Helpers" />
+        <ComponentRef Id="RandomFiles" />
+      </Feature>
+      <Feature Id="Documentation" Title="Documentation (pdf)" Description="Documentation for NSClient++ and how to use it from Nagios" Level="1">
+        <ComponentRef Id="NagiosDocumentation" />
+        <ComponentRef Id="ReferenceDocumentation" />
+      </Feature>
+      <Feature Id="Plugins" Title="Plugins" Description="Plugins" Level="1" Absent="disallow">
         <Feature Id="CheckPlugins" Title="Check Plugins" Description="Various plugins to check your system. (Includes all check plugins)" Level="1">
           <ComponentRef Id="Plugins" />
@@ -200 +202 @@
         </Feature>
         <Feature Id="SampleScripts" Title="Sample Scripts" Description="Some sample client-side scripts to use with NRPE" Level="1" Absent="disallow">
-          <ComponentRef Id="Scripts" />
-          <ComponentRef Id="ScriptLibs" />
-        </Feature>
+          <ComponentRef Id="Scripts" />
+          <ComponentRef Id="ScriptLibs" />
+        </Feature>
       </Feature>
     </Feature>
 
-    <CustomTable Id="WixFirewallException">
-      <Column Id="Id"         Category="Identifier" PrimaryKey="yes"  Type="string" Width="72"  Modularize="Column"                     Description="The primary key, a non-localized token."/>
-      <Column Id="Name"       Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes" Localizable="yes" Description="Localizable display name."/>
-      <Column Id="RemoteAddresses"  Category="Formatted"  PrimaryKey="no"   Type="string" Width="2" Modularize="Property" Nullable="yes"                  Description="Remote address to accept incoming connections from."/>
-      <Column Id="Port"       Category="Formatted"  PrimaryKey="no"   Type="int"    Width="2" Modularize="Property" Nullable="yes" MinValue="1"     Description="Port number."/>
-      <Column Id="Protocol"     Category="Integer"    PrimaryKey="no"   Type="int"    Width="2" MinValue="6" Nullable="yes" MaxValue="17"             Description="Protocol (6=TCP; 17=UDP)."/>
-      <Column Id="Program"      Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"    Description="Exception for a program (formatted path name)."/>
-      <Column Id="Attributes"     Category="Integer"    PrimaryKey="no"   Type="int"    Width="4" Nullable="yes" MinValue="0" MaxValue="65536" Description="Vital=1"/>
-      <Column Id="Component_"     Category="Identifier" PrimaryKey="no"   Type="string" Width="72"  Modularize="Column"                     Description="Foreign key into the Component table referencing component that controls the firewall configuration."/>
-      <Row>
-        <Data Column="Id">FWX1</Data>
-        <Data Column="Name">NSClient++ Monitoring Agent</Data>
-        <Data Column="Component_">FireWallException</Data>
-        <Data Column="Program">[#NSClientEXE]</Data>
-      </Row>
-    </CustomTable>
-
-    <CustomTable Id="Services">
-      <Column Id="Id"     Category="Identifier" PrimaryKey="yes"  Type="string" Width="72"  Modularize="Column"
-          Description="The primary key, a non-localized token."/>
-      <Column Id="ShortName"  Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes" Localizable="yes" 
-          Description="Service name."/>
-      <Column Id="LongName" Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
-          Description="Service long name."/>
-      <Column Id="Description" Category="Formatted" PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
-          Description="The description"/>
-      <Column Id="Program"  Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
-          Description="Exception for a program (formatted path name)."/>
-      <Column Id="Dependencies" Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
-          Description="Service Dependencies"/>
-      <Column Id="Attributes" Category="Integer"    PrimaryKey="no"   Type="int"    Width="4"             Nullable="yes" MinValue="0" MaxValue="65536" 
-          Description="Vital=1"/>
-      <Column Id="Component_" Category="Identifier" PrimaryKey="no"   Type="string" Width="72"  Modularize="Column" 
-          Description="Foreign key into the Component table referencing component that controls the firewall configuration."/>
-      <Row>
-        <Data Column="Id">SVC</Data>
-        <Data Column="ShortName">nscp</Data>
-        <Data Column="LongName">$(var.App.Title) ($(var.PlatForm))</Data>
-        <Data Column="Description">Monitoring agent for nagios (and others) used to respond to status queries.</Data>
-        <Data Column="Component_">ServiceRegistration</Data>
-        <Data Column="Program">[#NSClientEXE] --service --run --name nscp</Data>
-        <Data Column="Dependencies"></Data>
-      </Row>
-    </CustomTable>
-
-    <?include properties.wxs ?>
-
-    <CustomAction Id='ImportConfig'             BinaryKey='InstallerHelper' DllEntry='ImportConfig'               Impersonate='no' Execute="immediate" Return="check" />
-    <CustomAction Id='ScheduleWriteConfig'      BinaryKey='InstallerHelper' DllEntry='ScheduleWriteConfig'        Impersonate='no' Execute="immediate" Return="check" />
-    <CustomAction Id="ExecWriteConfig"          BinaryKey="InstallerHelper" DllEntry="ExecWriteConfig"            Impersonate="no" Execute="deferred" Return="check"  />
-
-    <CustomAction Id='NeedUninstall'            BinaryKey='InstallerHelper' DllEntry='NeedUninstall'              Impersonate='no' Execute="immediate" Return="check" />
-    
-
-    <CustomAction Id="PreventDowngrading"       Error="Newer version already installed." />
-
-    <CustomAction Id='SchedServiceInstall'        BinaryKey='InstallerHelper' DllEntry='ScheduleInstallService'   Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id='SchedServiceUnInstall'      BinaryKey='InstallerHelper' DllEntry='ScheduleUnInstallService' Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id="WixRollbackServiceInstall"  BinaryKey="InstallerHelper" DllEntry="ExecServiceInstall"       Impersonate="no" Execute="rollback"  Return="check"  />
-    <CustomAction Id="WixExecServiceInstall"      BinaryKey="InstallerHelper" DllEntry="ExecServiceInstall"       Impersonate="no" Execute="deferred"  Return="check"  />
-    <CustomAction Id="WixRollbackServiceUninstall" BinaryKey="InstallerHelper" DllEntry="ExecServiceInstall"      Impersonate="no" Execute="rollback"  Return="check"  />
-    <CustomAction Id="WixExecServiceUninstall"    BinaryKey="InstallerHelper" DllEntry="ExecServiceInstall"       Impersonate="no" Execute="deferred"  Return="check" />
-
-    <CustomAction Id='SchedStopAllServices'       BinaryKey='InstallerHelper' DllEntry='SchedStopAllServices'     Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id='ExitDialogExec'             BinaryKey='InstallerHelper' DllEntry='ExitDialogExec'           Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id='StartAllServices'           BinaryKey='InstallerHelper' DllEntry='StartAllServices'         Impersonate="no" Execute="deferred" Return="check" />
-    <CustomAction Id='StopAllServices'            BinaryKey='InstallerHelper' DllEntry='StopAllServices'          Impersonate="no" Execute="deferred" Return="check" />
-    <CustomAction Id='ExecCopyFileDefered'        BinaryKey='InstallerHelper' DllEntry='ExecCopyFileDefered'      Impersonate="no" Execute="deferred" Return="check" />
-
-    <CustomAction Id="WixSchedFirewallExceptionsInstall" 
-                                                  BinaryKey="WixFirewallCA" DllEntry="SchedFirewallExceptionsInstall"   Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id="WixSchedFirewallExceptionsUninstall"
-                                                  BinaryKey="WixFirewallCA" DllEntry="SchedFirewallExceptionsUninstall" Impersonate="no" Execute="immediate" Return="check" />
-    <CustomAction Id="WixRollbackFirewallExceptionsInstall" 
-                                                  BinaryKey="WixFirewallCA" DllEntry="ExecFirewallExceptions"           Impersonate="no" Execute="rollback" Return="check" />
-    <CustomAction Id="WixExecFirewallExceptionsInstall"
-                                                  BinaryKey="WixFirewallCA" DllEntry="ExecFirewallExceptions"           Impersonate="no" Execute="deferred" Return="check" />
-    <CustomAction Id="WixRollbackFirewallExceptionsUninstall" 
-                                                  BinaryKey="WixFirewallCA" DllEntry="ExecFirewallExceptions"           Impersonate="no" Execute="rollback" Return="check" />
-    <CustomAction Id="WixExecFirewallExceptionsUninstall"
-                                                  BinaryKey="WixFirewallCA" DllEntry="ExecFirewallExceptions"           Impersonate="no" Execute="deferred" Return="check" />
-
+    <CustomAction Id='ImportConfig'     BinaryKey='InstallerHelper' DllEntry='ImportConfig'     Impersonate='yes' Execute="immediate" Return="check" />
+    <CustomAction Id='ScheduleWriteConfig'  BinaryKey='InstallerHelper' DllEntry='ScheduleWriteConfig'  Impersonate='yes' Execute="immediate" Return="check" />
+    <CustomAction Id="ExecWriteConfig"    BinaryKey="InstallerHelper" DllEntry="ExecWriteConfig"    Impersonate="no" Execute="deferred" Return="check"  />
+
+    <CustomAction Id='NeedUninstall'    BinaryKey='InstallerHelper' DllEntry='NeedUninstall'    Impersonate='yes' Execute="immediate" Return="check" />
+    <CustomAction Id="PreventDowngrading" Error="Newer version already installed." />
 
     <Binary Id='InstallerHelper' SourceFile='$(var.Helpers)/main_dll.dll' />
-    <Binary Id='WixFirewallCA' SourceFile='$(var.Helpers)/fw_dll.dll' />
 
     <InstallExecuteSequence>
       <RemoveExistingProducts After='InstallInitialize'/>
-      <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWAPPFOUND</Custom>
-      <Custom Action="ScheduleWriteConfig" After='InstallFiles' />
-      <Custom Action="SchedServiceInstall" After="InstallFiles" />
-      <Custom Action="SchedServiceUnInstall" Before="RemoveFiles" />
-      <Custom Action="SchedStopAllServices" Before="RemoveFiles" />
-
-      <Custom Action="WixSchedFirewallExceptionsUninstall" Before="RemoveFiles">
-        <![CDATA[ VersionNT >= 501 AND (ServicePackLevel >= 2 OR VersionNT >= 600) ]]>
-      </Custom>
-      <Custom Action="WixSchedFirewallExceptionsInstall" After="InstallFiles">
-        <![CDATA[ VersionNT >= 501 AND (ServicePackLevel >= 2 OR VersionNT >= 600) ]]>
-      </Custom>
+      <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWAPPFOUND</Custom>
+      <Custom Action="ScheduleWriteConfig" After='InstallFiles' />
     </InstallExecuteSequence>
 
     <InstallUISequence>
       <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWAPPFOUND</Custom>
-      <Custom Action="NeedUninstall" After="FindRelatedProducts" />
+      <Custom Action="NeedUninstall" After="FindRelatedProducts" >1</Custom>
+      <Custom Action="ImportConfig" After="CostFinalize" >1</Custom>
     </InstallUISequence>
 
-    <Property Id="ALLUSERS"><![CDATA[2]]></Property>
+    <Property Id="ALLUSERS">
+      <![CDATA[2]]>
+    </Property>
+    <?include properties.wxs ?>
 
     <!-- ### User Interfaces ### -->
-    <UIRef Id="WixUI_Mondo" />
+    <UIRef Id="WixUI_MondoNSCP" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <!-- ### Icons -->
     <Icon Id="nscp.exe" SourceFile="$(var.Source)/nscp.exe" />
-    <!--
-    <Icon Id="nstray.exe" SourceFile="$(var.Source)/nstray.exe" />
-        -->
+    <Icon Id="doc.ico" SourceFile="$(var.Source)/res/help.ico"/>
   </Product>
 </Wix>

helpers/installers/installer/properties.wxs

@@ -1 +1 @@
 <Include>
-<Property Id='ARPCOMMENTS'>NSClient++ is a </Property>
-<Property Id='ARPCONTACT'>michael@medin.name</Property>
-<Property Id='ARPHELPLINK'>http://nsclient.org</Property>
-<Property Id='ARPURLINFOABOUT'>http://nsclient.org</Property>
-<Property Id='ARPURLUPDATEINFO'>http://nsclient.org</Property>
-<Property Id='ARPHELPTELEPHONE'>http://nsclient.org</Property>
-<Property Id='ARPPRODUCTICON'>nsclient.exe</Property>
+  <!-- CONFIGURE APPLICATION INFORMATION -->
+  <Property Id="ARPCOMMENTS">NSClient++ is a monitoring Agent for amongst other systems Nagios</Property>
+  <Property Id="ARPCONTACT">michael@medin.name</Property>
+  <Property Id="ARPHELPLINK">http://nsclient.org</Property>
+  <Property Id="ARPURLINFOABOUT">http://nsclient.org</Property>
+  <Property Id="ARPURLUPDATEINFO">http://nsclient.org</Property>
+  <Property Id="ARPHELPTELEPHONE">http://nsclient.org</Property>
+  <Property Id="ARPPRODUCTICON">nscp.exe</Property>
 
-<Property Id="CONF_CHECKS_DEFAULT"></Property>
-<Property Id="CONF_NSCLIENT_DEFAULT"></Property>
-<Property Id="CONF_NRPE_DEFAULT"></Property>
-<Property Id="CONF_NSCA_DEFAULT"></Property>
-<Property Id="CONF_WMI_DEFAULT"></Property>
-<Property Id="ALLOW_CONFIGURATION" />
+  <!-- CONFIGURE DEFAULT VALUES (what will happen if missing from config) -->
+  <!--
+  <Property Id="CONF_CHECKS_DEFAULT">0</Property>
+  <Property Id="CONF_NSCLIENT_DEFAULT">0</Property>
+  <Property Id="CONF_NRPE_DEFAULT">0</Property>
+  <Property Id="CONF_NSCA_DEFAULT">0</Property>
+  <Property Id="CONF_WMI_DEFAULT">0</Property>
+  <Property Id="ALLOWED_HOSTS_DEFAULT"></Property>
+  <Property Id="NSCLIENT_PWD_DEFAULT"></Property>
+   -->
+  <Property Id="CONFIGURATION_TYPE_DEFAULT">ini://${shared-path}/nsclient.ini</Property>
 
-<!-- CONFIGURE DEFAULT VALUES-->
-<Property Id="ALLOWED_HOSTS_DEFAULT">$$EMPTY$$</Property>
-<Property Id="NSCLIENT_PWD_DEFAULT">$$EMPTY$$</Property>
+  <!-- CONFIGURE INITAL VALUES IN CONFIG UI -->
+  <!--
+  <Property Id="CONF_CHECKS">0</Property>
+  <Property Id="CONF_NSCLIENT">0</Property>
+  <Property Id="CONF_NRPE">0</Property>
+  <Property Id="CONF_NSCA">0</Property>
+  <Property Id="CONF_WMI">0</Property>
+  <Property Id="ALLOWED_HOSTS"></Property>
+  <Property Id="NSCLIENT_PWD"></Property>
+   -->
+  <Property Id="CONFIGURATION_TYPE">ini://${shared-path}/nsclient.ini</Property>
 
-<!-- CONFIGURE THE INSTALLER -->
-<Property Id='INSCON_CONFIGURE'>1</Property>
-<Property Id='MAIN_CONFIGURATION_FILE'>NSC.ini</Property>
-<Property Id='CUSTOM_CONFIGURATION_FILE'>NSC.ini</Property>
-<Property Id='HELP_LINK'>http://nsclient.org/nscp/</Property>
+  <!-- CONFIGURE THE INSTALLER -->
+  <Property Id="ALLOW_CONFIGURATION">1</Property>
+  <Property Id="MAIN_CONFIGURATION_FILE">nsclient.ini</Property>
+  <Property Id="CUSTOM_CONFIGURATION_FILE">nsclient.ini</Property>
+  <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\bannrbmp.bmp" />
+  <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dlgbmp.bmp" />
 
-<Property Id='SHOW_START_ON_EXIT'>1</Property>
-<Property Id='START_SERVICE_ON_EXIT'></Property>
-<Property Id='SHOW_DONATE_ON_EXIT'>1</Property>
-<Property Id='DONATE_ON_EXIT'></Property>
-<Property Id='KEEP_WHICH_CONFIG'>NEW</Property>
-<!--<Property Id='MAIN_CONFIGURATION_FILE'>NSC.ini</Property>-->
-<!--<Property Id='ARPREADME'>path</Property>-->
-<!--<Property Id='ARPSIZE'>app size in kilobytes</Property>-->
+  <!-- CONFIGURE THE PROGRAM -->
+  <Property Id="HELP_LINK">http://nsclient.org/nscp/</Property>
+  <Property Id="SERVICE_NAME">nscp</Property>
 
 </Include>

helpers/settings_manager/settings_manager_impl.h

@@ -1 +1 @@
 #pragma once
 
-#include "settings_logger_impl.hpp"
 #include <settings/settings_core.hpp>
-#include <settings/settings_ini.hpp>
 #include <settings/client/settings_client.hpp>
-#ifdef WIN32
-#include <settings/settings_old.hpp>
-#include <settings/settings_registry.hpp>
-#endif
+#include <settings/settings_handler_impl.hpp>
 
 namespace settings_manager {
+
+  struct provider_interface {
+    virtual std::wstring expand_path(std::wstring file) = 0;
+    virtual void log_fatal_error(std::wstring error) = 0;
+    virtual settings::logger_interface* create_logger() = 0;
+  };
+
   class NSCSettingsImpl : public settings::settings_handler_impl {
   private:
     boost::filesystem::wpath boot_;
     bool old_;
+    provider_interface *provider_;
   public:
-    NSCSettingsImpl() : old_(false) {}
+    NSCSettingsImpl(provider_interface *provider) : old_(false), provider_(provider) {}
     //////////////////////////////////////////////////////////////////////////
     /// Get a string form the boot file.
@@ -37 +40 @@
 #endif
     }
+    void set_boot_string(std::wstring section, std::wstring key, std::wstring val) {
+#ifdef WIN32
+      WritePrivateProfileString(section.c_str(), key.c_str(), val.c_str(), boot_.string().c_str());
+#else
+#endif
+    }
 
     void boot(std::wstring file = _T("boot.ini"));
@@ -42 +51 @@
     std::wstring expand_path(std::wstring file);
     settings::instance_raw_ptr create_instance(std::wstring key);
+    bool check_file(std::wstring file, std::wstring tag, std::wstring &key);
+    void change_context(std::wstring file);
   };
 
-  typedef Singleton<NSCSettingsImpl> SettingsHandler;
+  //typedef Singleton<NSCSettingsImpl> SettingsHandler;
 
   // Alias to make handling "compatible" with old syntax
@@ -52 +63 @@
   nscapi::settings_helper::settings_impl_interface_ptr get_proxy();
   void destroy_settings();
-  bool init_settings(std::wstring context = _T(""));
+  bool init_settings(provider_interface *provider, std::wstring context = _T(""));
+  void change_context(std::wstring context);
 }

include/config.h.in

@@ -21 +21 @@
 #pragma once
 
-#include "../AutoBuild.h"
+#include "../version.hpp"
 /*
 #include <tchar.h> 
@@ -82 +82 @@
 #define DEFAULT_CONF_LOCATION _T("ini")
 #endif
+#define BOOT_CONF_LOCATION _T("${exe-path}/boot.ini")
 #define DEFAULT_CONF_OLD_LOCATION _T("old://${exe-path}/nsc.ini")
 #define DEFAULT_CONF_INI_LOCATION _T("ini://${shared-path}/nsclient.ini")
 #define DEFAULT_CONF_REG_LOCATION _T("registry://HKEY_LOCAL_MACHINE/software/NSClient++")
+
+#define DEFAULT_CACHE_PATH _T("${shared-path}/cache")
 
 

include/nsca/nsca_enrypt.hpp

@@ -105 +105 @@
         }
         ZeroMemory(key,keysize*sizeof(unsigned char));
-        strncpy(reinterpret_cast<char*>(key),password.c_str(),min(keysize,password.length()));
+        strncpy(reinterpret_cast<char*>(key),password.c_str(),std::min(keysize,static_cast<unsigned int>(password.length())));
 
 
@@ -317 +317 @@
       core_ = get_encryption_core(encryption_method);
       if (core_ == NULL)
-        throw encryption_exception(_T("Failed to get encryption core!"));
+        throw encryption_exception(_T("Failed to get encryption module for: ") + to_wstring(encryption_method));
 
       /* server generates IV used for encryption */

include/nsca/nsca_packet.hpp

@@ -118 +118 @@
       boost::posix_time::time_duration diff = now - time_t_epoch;
       time = diff.total_seconds();
-      std::cout << "Adding time: " << time_delta << std::endl;
     }
     packet() : payload_length_(nsca::length::data::get_payload_length())
@@ -135 +134 @@
 
     void get_buffer(std::string &buffer) const {
+      // FIXME: This is crap and needs rewriting. No std::string and beetter zero handling...
       if (service.length() >= nsca::length::desc_length)
         throw nsca::nsca_exception(_T("Description field to long"));
@@ -151 +151 @@
       data->crc32_value= swap_bytes::hton<u_int32_t>(0);
 
+      ZeroMemory(data->get_host_ptr(), host.size()+1);
       host.copy(data->get_host_ptr(), host.size());
+      ZeroMemory(data->get_desc_ptr(nsca::length::host_length), service.size()+1);
       service.copy(data->get_desc_ptr(nsca::length::host_length), service.size());
+      ZeroMemory(data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length), result.size()+1);
       result.copy(data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length), result.size());
 

include/nscapi/macros.hpp

@@ -28 +28 @@
 //////////////////////////////////////////////////////////////////////////
 // Logging calls for the core wrapper 
-/*
+
 #define NSC_LOG_ERROR_STD(msg) NSC_LOG_ERROR(((std::wstring)msg).c_str())
 #define NSC_LOG_ERROR(msg) NSC_ANY_MSG(msg,NSCAPI::error)
@@ -42 +42 @@
 
 #define NSC_ANY_MSG(msg, type) GET_CORE()->Message(type, __FILE__, __LINE__, msg)
-*/
+/*
 #define NSC_LOG_ERROR_STD(msg) 
 #define NSC_LOG_ERROR(msg) 
@@ -56 +56 @@
 
 #define NSC_ANY_MSG(msg, type)
-
+*/
 
 //////////////////////////////////////////////////////////////////////////

include/nscapi/nscapi_plugin_wrapper.hpp

@@ -123 +123 @@
             args.push_back(to_wstring(payload.arguments(i)));
           }
-          std::wstring msg = to_wstring(payload.message());
-          std::wstring perf = to_wstring(::nscapi::functions::build_performance_data(payload));
+          std::wstring msg = utf8::cvt<std::wstring>(payload.message());
+          std::wstring perf = utf8::cvt<std::wstring>(::nscapi::functions::build_performance_data(payload));
           NSCAPI::nagiosReturn ret = handleSimpleNotification(channel, command, code, msg, perf);
         } catch (std::exception &e) {

include/settings/settings_core.hpp

@@ -287 +287 @@
     ///
     /// @author mickem
-    virtual boost::filesystem::wpath get_base() = 0;
+    //virtual boost::filesystem::wpath get_base() = 0;
 
     //////////////////////////////////////////////////////////////////////////
@@ -305 +305 @@
 
     virtual std::wstring to_string() = 0;
+
+    virtual std::wstring expand_path(std::wstring key) = 0;
 
   };

include/settings/settings_handler_impl.hpp

@@ -59 +59 @@
       set_logger(NULL);
     }
-
-    virtual std::wstring expand_path(std::wstring key) = 0;
 
     //////////////////////////////////////////////////////////////////////////

include/settings/settings_interface_impl.hpp

@@ -32 +32 @@
 #include <strEx.h>
 #include <settings/settings_core.hpp>
-
+#include <net/net.hpp>
 
 #define MUTEX_GUARD() \
@@ -93 +93 @@
     key_cache_type key_cache_;
     std::wstring context_;
-    net::url url_;
+    net::wurl url_;
 
     //SettingsInterfaceImpl() : core_(NULL) {}

include/settings/settings_old.hpp

@@ -1 +1 @@
 #pragma once
 
+#include <iostream>
+#include <fstream>
 #include <string>
 #include <map>
 #include <settings/settings_core.hpp>
 #include <simpleini/SimpleIni.h>
-#include <settings/macros.h>
-#include <iostream>
-#include <fstream>
+//#include <settings/macros.h>
+
+#include <strEx.h>
 
 
@@ -17 +19 @@
   class OLDSettings : public settings::SettingsInterfaceImpl {
     std::wstring filename_;
-  public:
-    OLDSettings(settings::settings_core *core, std::wstring context) : settings::SettingsInterfaceImpl(core, context) {
-      std::wstring fname = core->find_file(_T("${exe-path}/old-settings.map"), _T("old-settings.map"));
-      read_map_file(fname);
-    }
-    void read_map_file(std::wstring file) {
-      get_logger()->debug(__FILE__, __LINE__, _T("Reading MAP file: ") + file);
-
-      std::ifstream in(strEx::wstring_to_string(file).c_str());
-      if(!in) {
-        get_logger()->err(__FILE__, __LINE__, _T("Failed to read MAP file: ") + file);
-        return;
-      }
-      in.exceptions(std::ifstream::eofbit | std::ifstream::failbit | std::ifstream::badbit);
-
-      try{
-        std::string tmp;
-        while(true) {
-          std::getline(in,tmp);
-          parse_line(to_wstring(tmp));
-        }
-      }
-      catch(std::ifstream::failure e){
-        if(!in.eof())
-          cerr << e.what() <<'\n';
-      }
-    }
-    void parse_line(std::wstring line) {
-      int pos = line.find('#');
-      if (pos != -1)
-        line = line.substr(0, pos);
-      pos = line.find_first_not_of(_T(" \t"));
-      if (pos == -1)
-        return;
-      line = line.substr(pos);
-      pos = line.find('=');
-      if (pos == -1) {
-        get_logger()->err(__FILE__, __LINE__, _T("Invalid syntax: ") + line);
-        return;
-      }
-      std::pair<std::wstring,std::wstring> old_key = split_key(line.substr(0, pos));
-      std::pair<std::wstring,std::wstring> new_key = split_key(line.substr(pos+1));
-      if (old_key.second == _T("*") || old_key.second.empty()) {
-        add_mapping(line.substr(pos+1), old_key.first);
-      } else {
-        add_mapping(new_key.first, new_key.second, old_key.first, old_key.second);
-      }
-
-    }
-    std::pair<std::wstring,std::wstring> split_key(std::wstring key) {
-      std::pair<std::wstring,std::wstring> ret;
-      int pos = key.find_last_of('/');
-      if (pos == -1)
-        return std::pair<std::wstring,std::wstring>(key, _T(""));
-      return std::pair<std::wstring,std::wstring>(key.substr(0, pos), key.substr(pos+1));
-    }
-
-    typedef std::map<std::wstring,std::wstring> path_map;
-    typedef std::map<settings_core::key_path_type,settings_core::key_path_type> key_map;
     typedef std::pair<std::wstring,std::wstring> section_key_type;
-    typedef std::pair<settings_core::key_path_type,settings_core::key_path_type> keys_key_type;
-
-    path_map sections_;
-    key_map keys_;
-    void add_mapping(std::wstring path_new, std::wstring path_old) {
-      sections_[path_new] = path_old;
-    }
-    void add_mapping(std::wstring path_new, std::wstring key_new, std::wstring path_old, std::wstring key_old) {
-      settings_core::key_path_type new_key(path_new, key_new);
-      settings_core::key_path_type old_key(path_old, key_old);
-      keys_[new_key] = old_key;
-    }
-    std::wstring map_path(std::wstring path_new) {
-      path_map::iterator it = sections_.find(path_new);
-      if (it == sections_.end())
-        return path_new;
-      return (*it).second;
-    }
-    settings_core::key_path_type map_key(settings_core::key_path_type new_key) {
-      key_map::iterator it1 = keys_.find(new_key);
-      if (it1 != keys_.end()) {
-        get_core()->get_logger()->quick_debug(new_key.first + _T(".") + new_key.second + _T(" not found in alias list"));
-        return (*it1).second;
-      }
-      path_map::iterator it2 = sections_.find(new_key.first);
-      if (it2 != sections_.end())
-        return settings_core::key_path_type((*it2).second, new_key.second);
-      return new_key;
+
+    class settings_map : boost::noncopyable {
+    public:
+
+      typedef std::map<std::wstring,std::wstring> path_map;
+      typedef std::map<settings_core::key_path_type,settings_core::key_path_type> key_map;
+      typedef std::pair<std::wstring,std::wstring> section_key_type;
+      typedef std::pair<settings_core::key_path_type,settings_core::key_path_type> keys_key_type;
+
+      OLDSettings *parent;
+      path_map sections_;
+      key_map keys_;
+
+      settings_map(OLDSettings *parent) : parent(parent) {}
+
+      void read_map_file(std::wstring file) {
+        parent->get_logger()->debug(__FILE__, __LINE__, _T("Reading MAP file: ") + file);
+
+        std::ifstream in(strEx::wstring_to_string(file).c_str());
+        if(!in) {
+          parent->get_logger()->err(__FILE__, __LINE__, _T("Failed to read MAP file: ") + file);
+          return;
+        }
+        in.exceptions(std::ifstream::eofbit | std::ifstream::failbit | std::ifstream::badbit);
+
+        try{
+          std::string tmp;
+          while(true) {
+            std::getline(in,tmp);
+            parse_line(utf8::cvt<std::wstring>(tmp));
+          }
+        }
+        catch(std::ifstream::failure e){
+          if(!in.eof())
+            std::cerr << e.what() <<'\n';
+        }
+      }
+      void parse_line(std::wstring line) {
+        int pos = line.find('#');
+        if (pos != -1)
+          line = line.substr(0, pos);
+        pos = line.find_first_not_of(_T(" \t"));
+        if (pos == -1)
+          return;
+        line = line.substr(pos);
+        pos = line.find('=');
+        if (pos == -1) {
+          parent->get_logger()->err(__FILE__, __LINE__, _T("Invalid syntax: ") + line);
+          return;
+        }
+        std::pair<std::wstring,std::wstring> old_key = split_key(line.substr(0, pos));
+        std::pair<std::wstring,std::wstring> new_key = split_key(line.substr(pos+1));
+        if (old_key.second == _T("*") || old_key.second.empty()) {
+          add(line.substr(pos+1), old_key.first);
+        } else {
+          add(new_key.first, new_key.second, old_key.first, old_key.second);
+        }
+
+      }
+      std::pair<std::wstring,std::wstring> split_key(std::wstring key) {
+        std::pair<std::wstring,std::wstring> ret;
+        int pos = key.find_last_of('/');
+        if (pos == -1)
+          return std::pair<std::wstring,std::wstring>(key, _T(""));
+        return std::pair<std::wstring,std::wstring>(key.substr(0, pos), key.substr(pos+1));
+      }
+
+      void add(std::wstring path_new, std::wstring path_old) {
+        sections_[path_new] = path_old;
+      }
+      void add(std::wstring path_new, std::wstring key_new, std::wstring path_old, std::wstring key_old) {
+        settings_core::key_path_type new_key(path_new, key_new);
+        settings_core::key_path_type old_key(path_old, key_old);
+        keys_[new_key] = old_key;
+      }
+      std::wstring path(std::wstring path_new) {
+        path_map::iterator it = sections_.find(path_new);
+        if (it == sections_.end())
+          return path_new;
+        return (*it).second;
+      }
+      settings_core::key_path_type key(settings_core::key_path_type new_key) {
+        key_map::iterator it1 = keys_.find(new_key);
+        if (it1 != keys_.end()) {
+          parent->get_logger()->quick_debug(new_key.first + _T(".") + new_key.second + _T(" not found in alias list"));
+          return (*it1).second;
+        }
+        path_map::iterator it2 = sections_.find(new_key.first);
+        if (it2 != sections_.end())
+          return settings_core::key_path_type((*it2).second, new_key.second);
+        return new_key;
+      }
+
+      void get_sections(std::wstring path, string_list &list) {
+        unsigned int path_length = path.length();
+        BOOST_FOREACH(section_key_type key, sections_) {
+          if (path_length == 0 || path == _T("/")) {
+            std::wstring::size_type pos = key.first.find(L'/', 1);
+            list.push_back(pos == std::wstring::npos?key.first:key.first.substr(0,pos));
+          } else if (key.first.length() > path_length && path == key.first.substr(0, path_length)) {
+            std::wstring::size_type pos = key.first.find(L'/', path_length+1);
+            list.push_back(pos == std::wstring::npos?key.first.substr(path_length+1):key.first.substr(path_length+1,pos-path_length-1));
+          }
+        }
+        BOOST_FOREACH(keys_key_type key, keys_) {
+          if (path.empty() || path == _T("/")) {
+            std::wstring::size_type pos = key.first.first.find(L'/', 1);
+            if (pos != std::wstring::npos)
+              key.first.first = key.first.first.substr(0,pos);
+            list.push_back(key.first.first);
+          } else if (key.first.first.length() > path_length && path == key.first.first.substr(0, path_length)) {
+            std::wstring::size_type pos = key.first.first.find(L'/', path_length+1);
+            list.push_back(pos == std::wstring::npos?key.first.first.substr(path_length+1):key.first.first.substr(path_length+1,pos-path_length-1));
+          }
+        }
+        list.unique();
+      }
+
+
+    };
+
+      settings_map map;
+      typedef std::map<std::wstring,std::set<std::wstring> > section_cache_type;
+      section_cache_type section_cache_;
+
+
+    public:
+
+
+    OLDSettings(settings::settings_core *core, std::wstring context) : settings::SettingsInterfaceImpl(core, context), map(this) {
+      get_logger()->debug(__FILE__, __LINE__, _T("Loading OLD: ") + context);
+      map.read_map_file(core->find_file(_T("${exe-path}/old-settings.map"), _T("old-settings.map")));
+
+      string_list list = get_keys(_T("includes"));
+      BOOST_FOREACH(std::wstring key, list) {
+        add_child(key);
+      }
     }
     //////////////////////////////////////////////////////////////////////////
@@ -125 +177 @@
     /// @author mickem
     virtual std::wstring get_real_string(settings_core::key_path_type key) {
-      key = map_key(key);
+      key = map.key(key);
       return internal_get_value(key.first, key.second);
     }
@@ -180 +232 @@
     /// @author mickem
     virtual bool has_real_key(settings_core::key_path_type key) {
-      settings_core::key_path_type old = map_key(key);
+      settings_core::key_path_type old = map.key(key);
       return has_key_int(old.first, old.second);
     }
@@ -209 +261 @@
     }
 
-    typedef std::map<std::wstring,std::set<std::wstring> > section_cache_type;
-    section_cache_type section_cache_;
     bool has_key_int(std::wstring path, std::wstring key) {
       section_cache_type::const_iterator it = section_cache_.find(path);
@@ -230 +280 @@
     virtual void set_real_value(settings_core::key_path_type key, conainer value) {
       try {
-        key = map_key(key);
+        key = map.key(key);
         WritePrivateProfileString(key.first.c_str(), key.second.c_str(), value.get_string().c_str(), get_file_name().c_str());
       } catch (settings_exception e) {
@@ -254 +304 @@
     virtual void get_real_sections(std::wstring path, string_list &list) {
       unsigned int path_length = path.length();
-      //string_list lst = get_mapped_sections(path);
-      //list.insert(list.end(), lst.begin(), lst.end());
-      BOOST_FOREACH(section_key_type key, sections_) {
-        if (path_length == 0 || path == _T("/")) {
-          std::wstring::size_type pos = key.first.find(L'/', 1);
-          list.push_back(pos == std::wstring::npos?key.first:key.first.substr(0,pos));
-        } else if (key.first.length() > path_length && path == key.first.substr(0, path_length)) {
-          std::wstring::size_type pos = key.first.find(L'/', path_length+1);
-          list.push_back(pos == std::wstring::npos?key.first.substr(path_length+1):key.first.substr(path_length+1,pos-path_length-1));
-        }
-      }
-      BOOST_FOREACH(keys_key_type key, keys_) {
-        if (path.empty() || path == _T("/")) {
-          std::wstring::size_type pos = key.first.first.find(L'/', 1);
-          if (pos != std::wstring::npos)
-            key.first.first = key.first.first.substr(0,pos);
-          list.push_back(key.first.first);
-        } else if (key.first.first.length() > path_length && path == key.first.first.substr(0, path_length)) {
-          std::wstring::size_type pos = key.first.first.find(L'/', path_length+1);
-          list.push_back(pos == std::wstring::npos?key.first.first.substr(path_length+1):key.first.first.substr(path_length+1,pos-path_length-1));
-        }
-      }
+      map.get_sections(path, list);
       list.unique();
     }
@@ -322 +351 @@
       }
       // @todo: this will NOT work for "nodes in paths"
-      BOOST_FOREACH(keys_key_type key, keys_) {
+      BOOST_FOREACH(settings_map::keys_key_type key, map.keys_) {
         if (path == key.first.first) {
           if (has_key_int(key.second.first, key.second.second))
@@ -329 +358 @@
       }
 
-      BOOST_FOREACH(section_key_type key, sections_) {
+      BOOST_FOREACH(settings_map::section_key_type key, map.sections_) {
         if (key.first == path) {
           section_cache_type::const_iterator it = section_cache_.find(key.second);

include/strEx.h

@@ -81 +81 @@
 }
 
-namespace net {
-
-  struct url {
-    std::wstring protocol;
-    std::wstring host;
-    std::wstring path;
-    std::wstring query;
-
-  };
-  inline url parse(const std::wstring& url_s) {
-    url ret;
-    const std::wstring prot_end(_T("://"));
-    std::wstring::const_iterator prot_i = std::search(url_s.begin(), url_s.end(), prot_end.begin(), prot_end.end());
-    ret.protocol.reserve(std::distance(url_s.begin(), prot_i));
-    std::transform(url_s.begin(), prot_i, std::back_inserter(ret.protocol), std::ptr_fun<int,int>(std::tolower)); // protocol is icase
-    if( prot_i == url_s.end() )
-      return ret;
-    std::advance(prot_i, prot_end.length());
-    std::wstring::const_iterator path_i = std::find(prot_i, url_s.end(), L'/');
-    ret.host.reserve(std::distance(prot_i, path_i));
-    std::transform(prot_i, path_i, std::back_inserter(ret.host), std::ptr_fun<int,int>(std::tolower)); // host is icase
-    std::wstring::const_iterator query_i = std::find(path_i, url_s.end(), L'?');
-    ret.path.assign(path_i, query_i);
-    if( query_i != url_s.end() )
-      ++query_i;
-    ret.query.assign(query_i, url_s.end());
-    return ret;
-  }
-
-
-}
 namespace strEx {
   class string_exception : public std::exception {
@@ -874 +843 @@
   inline std::string cvt(std::wstring const & str) {
     // figure out how many narrow characters we are going to get 
-    int nChars = WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0, NULL, NULL);
+    int nChars = WideCharToMultiByte(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), NULL, 0, NULL, NULL);
     if (nChars == 0)
       return "";
@@ -882 +851 @@
     std::string buf;
     buf.resize(nChars);
-    WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.length(), const_cast<char*>(buf.c_str()), nChars, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), const_cast<char*>(buf.c_str()), nChars, NULL, NULL);
     return buf ; 
   }
@@ -889 +858 @@
   inline std::wstring cvt(std::string const & str) {
     // figure out how many wide characters we are going to get 
-    int nChars = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0);
+    int nChars = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), NULL, 0);
     if (nChars == 0)
       return L"";
@@ -897 +866 @@
     std::wstring buf;
     buf.resize(nChars);
-    MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), const_cast<wchar_t*>(buf.c_str()), nChars);
+    MultiByteToWideChar(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), const_cast<wchar_t*>(buf.c_str()), nChars);
     return buf;
   }

modules/CheckDisk/filter.cpp

@@ -35 +35 @@
       (_T("accessed"), (type_date))
       (_T("written"), (type_date))
-      (_T("generated"), (type_date));
+      (_T("created"), (type_date));
   }
 
@@ -77 +77 @@
   else if (key == _T("line_count"))
     ret = &object_type::get_line_count;
-  else if (key == _T("access"))
+  else if (key == _T("accessed"))
     ret = &object_type::get_access;
-  else if (key == _T("creation"))
+  else if (key == _T("created"))
     ret = &object_type::get_creation;
   else if (key == _T("written"))

modules/NSCAAgent/NSCAAgent.cpp

@@ -149 +149 @@
 NSCAPI::nagiosReturn NSCAAgent::handleSimpleNotification(const std::wstring channel, const std::wstring command, NSCAPI::nagiosReturn code, std::wstring msg, std::wstring perf) {
   try {
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * Handling command: ") + command);
     boost::asio::io_service io_service;
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * message: ") + msg);
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * performance: ") + perf);
     nsca::socket socket(io_service);
     socket.connect(nscahost_, nscaport_);
     nsca::packet packet(hostname_, payload_length_, time_delta_);
     packet.code = code;
-    packet.host = "hello";
-    packet.result = to_string(msg) + "|" + to_string(perf);
+    packet.service = utf8::cvt<std::string>(command);
+    packet.result = utf8::cvt<std::string>(msg) + "|" + utf8::cvt<std::string>(perf);
     socket.recv_iv(password_, encryption_method_, boost::posix_time::seconds(timeout_));
     socket.send_nsca(packet, boost::posix_time::seconds(timeout_));
     return NSCAPI::isSuccess;
+  } catch (nsca::nsca_encrypt::encryption_exception &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to encrypt data: ") + e.getMessage());
+    return NSCAPI::hasFailed;
+    
   } catch (std::exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to send data: ") + to_wstring(e.what()));

modules/Scheduler/Scheduler.cpp

@@ -109 +109 @@
     _T("SCHEDULE COMMAND"), _T("Command to execute"))
 
+    (_T("alias"), sh::wstring_key(&item.alias, def==NULL?_T(""):def->alias),
+    _T("SCHEDULE ALIAS"), _T("The alias (service name) to report to server"))
+
     (_T("report"), sh::wstring_key(&report, def==NULL?_T("all"):nscapi::report::to_string(def->report)),
     _T("REPORT MODE"), _T("What to report to the server (any of the following: all, critical, warning, unknown, ok)"))
@@ -130 +133 @@
   scheduler::target item = read_schedule(path + _T("/") + alias, alias, &def);
   strEx::parse_command(item.command, item.command, item.arguments);
+  NSC_DEBUG_MSG_STD(_T("Adding scheduled task: ") + alias);
   scheduler_.add_task(item);
 }

service/CMakeLists.txt

@@ -24 +24 @@
   NSCPlugin.cpp
   core_api.cpp
-  settings_manager_impl.cpp
   settings_logger_impl.cpp
 
@@ -34 +33 @@
   ${NSCP_INCLUDEDIR}/arrayBuffer.cpp
 
+  ../resources/nsclient.ico
 )
 
@@ -45 +45 @@
     NSCPlugin.h
     core_api.h
-    settings_manager_impl.h
-    settings_logger_impl.hpp
     simple_client.hpp
     settings_client.hpp
@@ -54 +52 @@
     channels.hpp
     logger.hpp
+    service_manager.hpp
     settings_logger_impl.hpp
-    service_manager.hpp
-    
-    ${NSCP_INCLUDEDIR}/settings/Settings.h
+
     ${NSCP_INCLUDEDIR}/charEx.h
     ${NSCP_INCLUDEDIR}/config.h
     ${NSCP_INCLUDEDIR}/msvc_wrappers.h
-    ${NSCP_INCLUDEDIR}/settings/macros.h
-    ${NSCP_INCLUDEDIR}/settings/settings_ini.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_old.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_registry.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_core.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_core_impl.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_handler_impl.hpp
-    ${NSCP_INCLUDEDIR}/settings/settings_interface_impl.hpp
-    ${NSCP_INCLUDEDIR}/settings/client/settings_client.hpp
     ${NSCP_INCLUDEDIR}/com_helpers.hpp
     ${NSCP_INCLUDEDIR}/dll/dll.hpp
@@ -109 +97 @@
 ENDIF(BREAKPAD_FOUND)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../files/old-settings.map ${CMAKE_CURRENT_BINARY_DIR}/old-settings.map COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../files/counters.defs ${CMAKE_CURRENT_BINARY_DIR}/counters.defs COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../files/license.txt ${CMAKE_CURRENT_BINARY_DIR}/license.txt COPYONLY)
-    
 add_executable (${TARGET} ${service_SRCS})
 add_dependencies(${TARGET} ${TARGET}_VERSION)
@@ -122 +106 @@
   ${NSCP_DEF_PLUGIN_LIB}
   ${EXTRA_LIBS}
+  settings_manager
 )
 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "core")

service/NSClient++.cpp

@@ -33 +33 @@
 //#include <remote_processes.hpp>
 #include "core_api.h"
-#include "settings_manager_impl.h"
+#include "../helpers/settings_manager/settings_manager_impl.h"
 #include <settings/macros.h>
 #include "simple_client.hpp"
 #include "settings_client.hpp"
 #include "service_manager.hpp"
+#include "settings_logger_impl.hpp"
 #include <nscapi/nscapi_helper.hpp>
 #include <nscapi/functions.hpp>
@@ -237 +238 @@
 }
 #endif
+
 int nscp_main(int argc, wchar_t* argv[])
 {
@@ -243 +245 @@
   return parser.parse(argc, argv);
 
-  int nRetCode = 0;
-  if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
-    if (false) {
-    } else if ( wcscasecmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
-      std::wstring password;
-      if (!settings_manager::init_settings()) {
-        std::wcout << _T("Could not find settings") << std::endl;;
-        return 1;
-      }
-      std::wcout << _T("Enter password to encrypt (has to be a single word): ");
-      std::wcin >> password;
-      std::wstring xor_pwd = Encrypt(password);
-      std::wcout << _T("obfuscated_password=") << xor_pwd << std::endl;
-      std::wstring outPasswd = Decrypt(xor_pwd);
-      if (password != outPasswd) 
-        std::wcout << _T("ERROR: Password did not match: ") << outPasswd<< std::endl;
-      settings_manager::destroy_settings();
-      return 0;
-    } else if ( wcscasecmp( _T("about"), argv[1]+1 ) == 0 ) {
-      try {
-        unsigned int next_plugin_id = 0;
-        LOG_INFO_CORE(APPLICATION_NAME _T(" (C) Michael Medin - michael<at>medin<dot>name"));
-        LOG_INFO_CORE(_T("Version: ") CURRENT_SERVICE_VERSION);
-        LOG_INFO_CORE(_T("Architecture: ") SZARCH);
-
-        boost::filesystem::wpath pluginPath = (boost::filesystem::wpath)mainClient.getBasePath() / _T("modules");
-        LOG_INFO_CORE_STD(_T("Looking at plugins in: ") + pluginPath.string());
-
-        boost::filesystem::wdirectory_iterator end_itr; // default construction yields past-the-end
-        for ( boost::filesystem::wdirectory_iterator itr( pluginPath ); itr != end_itr; ++itr ) {
-          if ( !is_directory(itr->status()) ) {
-            std::wstring file= itr->leaf();
-            LOG_INFO_CORE_STD(_T("Found: ") + file);
-            if (is_module(pluginPath / file)) {
-              NSCPlugin *plugin = new NSCPlugin(next_plugin_id++, pluginPath / file, _T(""));
-              std::wstring name = _T("<unknown>");
-              std::wstring description = _T("<unknown>");
-              try {
-                plugin->load_dll();
-                name = plugin->getName();
-                description = plugin->getDescription();
-              } catch(NSPluginException& e) {
-                LOG_ERROR_CORE_STD(_T("Exception raised: ") + e.error_ + _T(" in module: ") + e.file_);
-              } catch (std::exception e) {
-                LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + strEx::string_to_wstring(e.what()));
-              } catch (...) {
-                LOG_ERROR_CORE_STD(_T("Unknown exception loading plugin"));
-              }
-              LOG_INFO_CORE_STD(_T("* ") + name + _T(" (") + file + _T(")"));
-              std::list<std::wstring> list = strEx::splitEx(description, _T("\n"));
-              for (std::list<std::wstring>::const_iterator cit = list.begin(); cit != list.end(); ++cit) {
-                LOG_INFO_CORE_STD(_T("    ") + *cit);
-              }
-            }
-          }
-        }
-        LOG_INFO_CORE_STD(_T("Done listing plugins from: ") + pluginPath.string());
-        return true;
-      } catch (std::exception &e) {
-        LOG_ERROR_CORE_STD(_T("Exception: ") + to_wstring(e.what()));
-      } catch (...) {
-        LOG_ERROR_CORE_STD(_T("Unknown Exception: "));
-      }
-      return false;
-    } else if ( wcscasecmp( _T("version"), argv[1]+1 ) == 0 ) {
-      LOG_INFO_CORE(APPLICATION_NAME _T(", Version: ") CURRENT_SERVICE_VERSION _T(", Platform: ") SZARCH);
-    } else if ( wcscasecmp( _T("d"), argv[1]+1 ) == 0 ) {
-      // Run command from command line (like NRPE) but with debug enabled
-    } else if ( wcscasecmp( _T("noboot"), argv[1]+1 ) == 0 ) {
-      mainClient.enableDebug(false);
-      mainClient.initCore(false);
-      if (argc>=3)
-        nRetCode = mainClient.commandLineExec(argv[2], argc-3, &argv[3]);
-      else
-        nRetCode = mainClient.commandLineExec(argv[2], 0, NULL);
-      mainClient.exitCore(true);
-      return nRetCode;
-    } else if ( wcscasecmp( _T("c"), argv[1]+1 ) == 0 ) {
-      // Run command from command line (like NRPE)
-      mainClient.enableDebug(false);
-      mainClient.initCore(true);
-      std::wstring command, args, msg, perf;
-      if (argc > 2)
-        command = argv[2];
-      for (int i=3;i<argc;i++) {
-        if (i!=3) args += _T(" ");
-        args += argv[i];
-      }
-      nRetCode = mainClient.inject(command, args, msg, perf);
-      std::wcout << msg << _T("|") << perf << std::endl;
-      mainClient.exitCore(true);
-      return nRetCode;
-    } else {
-      std::wcerr << _T("Usage: -version, -about, -install, -uninstall, -start, -stop, -encrypt -settings") << std::endl;
-      std::wcerr << _T("Usage: [-noboot] <ModuleName> <commnd> [arguments]") << std::endl;
-      return -1;
-    }
-    return nRetCode;
-  } else if (argc > 2) {
-    std::wcout << _T(" * * * * * * * ") << std::endl;
-    mainClient.initCore(true);
-    if (argc>=3)
-      nRetCode = mainClient.commandLineExec(argv[1], argc-2, &argv[2]);
-    else
-      nRetCode = mainClient.commandLineExec(argv[1], 0, NULL);
-    mainClient.exitCore(true);
-    return nRetCode;
-  }
-  return nRetCode;
+//  int nRetCode = 0;
+//  if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
+//    if (false) {
+//    } else if ( wcscasecmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
+//      std::wstring password;
+//      if (!settings_manager::init_settings()) {
+//        std::wcout << _T("Could not find settings") << std::endl;;
+//        return 1;
+//      }
+//      std::wcout << _T("Enter password to encrypt (has to be a single word): ");
+//      std::wcin >> password;
+//      std::wstring xor_pwd = Encrypt(password);
+//      std::wcout << _T("obfuscated_password=") << xor_pwd << std::endl;
+//      std::wstring outPasswd = Decrypt(xor_pwd);
+//      if (password != outPasswd) 
+//        std::wcout << _T("ERROR: Password did not match: ") << outPasswd<< std::endl;
+//      settings_manager::destroy_settings();
+//      return 0;
+//    } else if ( wcscasecmp( _T("about"), argv[1]+1 ) == 0 ) {
+//      try {
+//        unsigned int next_plugin_id = 0;
+//        LOG_INFO_CORE(APPLICATION_NAME _T(" (C) Michael Medin - michael<at>medin<dot>name"));
+//        LOG_INFO_CORE(_T("Version: ") CURRENT_SERVICE_VERSION);
+//        LOG_INFO_CORE(_T("Architecture: ") SZARCH);
+// 
+//        boost::filesystem::wpath pluginPath = (boost::filesystem::wpath)mainClient.getBasePath() / _T("modules");
+//        LOG_INFO_CORE_STD(_T("Looking at plugins in: ") + pluginPath.string());
+// 
+//        boost::filesystem::wdirectory_iterator end_itr; // default construction yields past-the-end
+//        for ( boost::filesystem::wdirectory_iterator itr( pluginPath ); itr != end_itr; ++itr ) {
+//          if ( !is_directory(itr->status()) ) {
+//            std::wstring file= itr->leaf();
+//            LOG_INFO_CORE_STD(_T("Found: ") + file);
+//            if (is_module(pluginPath / file)) {
+//              NSCPlugin *plugin = new NSCPlugin(next_plugin_id++, pluginPath / file, _T(""));
+//              std::wstring name = _T("<unknown>");
+//              std::wstring description = _T("<unknown>");
+//              try {
+//                plugin->load_dll();
+//                name = plugin->getName();
+//                description = plugin->getDescription();
+//              } catch(NSPluginException& e) {
+//                LOG_ERROR_CORE_STD(_T("Exception raised: ") + e.error_ + _T(" in module: ") + e.file_);
+//              } catch (std::exception e) {
+//                LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + strEx::string_to_wstring(e.what()));
+//              } catch (...) {
+//                LOG_ERROR_CORE_STD(_T("Unknown exception loading plugin"));
+//              }
+//              LOG_INFO_CORE_STD(_T("* ") + name + _T(" (") + file + _T(")"));
+//              std::list<std::wstring> list = strEx::splitEx(description, _T("\n"));
+//              for (std::list<std::wstring>::const_iterator cit = list.begin(); cit != list.end(); ++cit) {
+//                LOG_INFO_CORE_STD(_T("    ") + *cit);
+//              }
+//            }
+//          }
+//        }
+//        LOG_INFO_CORE_STD(_T("Done listing plugins from: ") + pluginPath.string());
+//        return true;
+//      } catch (std::exception &e) {
+//        LOG_ERROR_CORE_STD(_T("Exception: ") + to_wstring(e.what()));
+//      } catch (...) {
+//        LOG_ERROR_CORE_STD(_T("Unknown Exception: "));
+//      }
+//      return false;
+//    } else if ( wcscasecmp( _T("version"), argv[1]+1 ) == 0 ) {
+//      LOG_INFO_CORE(APPLICATION_NAME _T(", Version: ") CURRENT_SERVICE_VERSION _T(", Platform: ") SZARCH);
+//    } else if ( wcscasecmp( _T("d"), argv[1]+1 ) == 0 ) {
+//      // Run command from command line (like NRPE) but with debug enabled
+//    } else if ( wcscasecmp( _T("noboot"), argv[1]+1 ) == 0 ) {
+//      mainClient.enableDebug(false);
+//      mainClient.initCore(false);
+//      if (argc>=3)
+//        nRetCode = mainClient.commandLineExec(argv[2], argc-3, &argv[3]);
+//      else
+//        nRetCode = mainClient.commandLineExec(argv[2], 0, NULL);
+//      mainClient.exitCore(true);
+//      return nRetCode;
+//    } else if ( wcscasecmp( _T("c"), argv[1]+1 ) == 0 ) {
+//      // Run command from command line (like NRPE)
+//      mainClient.enableDebug(false);
+//      mainClient.initCore(true);
+//      std::wstring command, args, msg, perf;
+//      if (argc > 2)
+//        command = argv[2];
+//      for (int i=3;i<argc;i++) {
+//        if (i!=3) args += _T(" ");
+//        args += argv[i];
+//      }
+//      nRetCode = mainClient.inject(command, args, msg, perf);
+//      std::wcout << msg << _T("|") << perf << std::endl;
+//      mainClient.exitCore(true);
+//      return nRetCode;
+//    } else {
+//      std::wcerr << _T("Usage: -version, -about, -install, -uninstall, -start, -stop, -encrypt -settings") << std::endl;
+//      std::wcerr << _T("Usage: [-noboot] <ModuleName> <commnd> [arguments]") << std::endl;
+//      return -1;
+//    }
+//    return nRetCode;
+//  } else if (argc > 2) {
+//    std::wcout << _T(" * * * * * * * ") << std::endl;
+//    mainClient.initCore(true);
+//    if (argc>=3)
+//      nRetCode = mainClient.commandLineExec(argv[1], argc-2, &argv[2]);
+//    else
+//      nRetCode = mainClient.commandLineExec(argv[1], 0, NULL);
+//    mainClient.exitCore(true);
+//    return nRetCode;
+//  }
+//  return nRetCode;
 }
 
@@ -495 +497 @@
 // Service functions
 
+
+struct nscp_settings_provider : public settings_manager::provider_interface {
+  virtual std::wstring expand_path(std::wstring file) {
+    return mainClient.expand_path(file);
+  }
+  virtual void log_fatal_error(std::wstring error) {
+    LOG_CRITICAL_CORE_STD(error);
+  }
+  virtual settings::logger_interface* create_logger() {
+    return new settings_logger();
+  }
+};
+
+
+nscp_settings_provider provider;
+
 namespace sh = nscapi::settings_helper;
 
@@ -507 +525 @@
   LOG_INFO_CORE(_T("Attempting to start"));
 
-  if (!settings_manager::init_settings(context_)) {
+  if (!settings_manager::init_settings(&provider, context_)) {
     return false;
   }

service/core_api.cpp

@@ -21 +21 @@
 #include <arrayBuffer.h>
 #include <settings/settings_core.hpp>
-#include "settings_manager_impl.h"
+#include "../helpers/settings_manager/settings_manager_impl.h"
 #include <b64/b64.h>
 #include <nscapi/nscapi_helper.hpp>

service/settings_logger_impl.hpp

@@ -1 +1 @@
 #pragma once
 
-#include "core_api.h"
-#include "logger.hpp"
 #include <settings/settings_core.hpp>