Changeset a78a985 in nscp


Ignore:
Timestamp:
09/05/11 20:55:52 (21 months ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
7515d00
Parents:
fb7e36a
Message:
  • Cleaned up some dependencies (on config.h)
  • Fixed invalid data in config.h.in
Files:
1 added
44 edited

Legend:

Unmodified
Added
Removed

  • changelog

    rfb7e36a ra78a985  
    66 * Fix RtlStringFromGUID problem on NT4 
    77 
    8 2011-09-03 MickeM 
     82011-09-05 MickeM 
     9 * Cleaned up some dependencies (on config.h) 
     10 * Fixed invalid data in config.h.in 
     11 
     122011-09-03 MickeM (0.4.0.93) 
    913 * Created a protcol buffer free version of the python test script 
    1014 * Upgraded to new version of simpleinin class 
    … …  
    6973 * Fixed so it works on linux (fixed issues with timeout) 
    7074 
    71 2011-08-16 MickeM 
     752011-08-16 MickeM (0.4.0.85) 
    7276 * Added support for remote WMI checking using target/username/password options like so: 
    7377    CheckWMI target=192.168.0.123 user=\\foobar password=foobar namespace=root\\cimv2 MaxCrit=3 MinWarn=1 "Query:load=Select * from win32_Processor" 

  • helpers/installer-dlls/main_dll/main_dll.cpp

    r65a2940 ra78a985  
    44#include <error.hpp> 
    55//#include <Settings.h> 
     6//#include <config.h> 
    67#include <config.h> 
    78#include <ServiceCmd.h> 
    … …  
    6667 
    6768  installer_settings_provider(msi_helper *h, std::wstring basepath, std::wstring old_settings_map) : h(h), logger(h), basepath(basepath), old_settings_map(old_settings_map) {} 
     69  installer_settings_provider(msi_helper *h, std::wstring basepath) : h(h), logger(h), basepath(basepath) {} 
    6870 
    6971  virtual std::wstring expand_path(std::wstring file) { 
    … …  
    8991  } 
    9092  std::wstring get_data(std::wstring key) { 
    91     if (key == _T("old_settings_map_data")) { 
     93    if (!old_settings_map.empty() && key == _T("old_settings_map_data")) { 
    9294      return old_settings_map; 
    9395    } 
    … …  
    326328    int add_defaults = data.get_next_int(); 
    327329 
    328     std::wstring map_data = read_map_data(h); 
    329  
    330     installer_settings_provider provider(&h, target, map_data); 
     330    //std::wstring map_data = read_map_data(h); 
     331 
     332    installer_settings_provider provider(&h, target); 
    331333    if (!settings_manager::init_settings(&provider, context)) { 
    332334      h.errorMessage(_T("Failed to boot settings: ") + provider.get_error()); 

  • helpers/installers/installer/Product.wxs

    rfb7e36a ra78a985  
    169169              <Component Id="PythonScripts" Guid="8820A304-C697-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    170170                <File Id="P_script_001" Name="test.py" DiskId="1" Source="$(var.Source)/scripts/python/test.py" Vital="no" /> 
    171                 <File Id="P_script_002" Name="test_second.py" DiskId="1" Source="$(var.Source)/scripts/python/test_pb.py" Vital="no" /> 
     171                <File Id="P_script_002" Name="test_pb.py" DiskId="1" Source="$(var.Source)/scripts/python/test_pb.py" Vital="no" /> 
    172172              </Component> 
    173173            </Directory> 
    … …  
    176176              <Component Id="PythonScriptsPBLib1" Guid="555165B3-5CBF-4204-A349-6AD7CCEF14EB" Win64="$(var.Win64)"> 
    177177                <File Id="p_script_lib_001" Name="__init__.py" DiskId="1" Source="$(var.Source)/scripts/python/lib/__init__.py" Vital="no" /> 
     178                <File Id="p_script_pb_001" Name="ipc_pb2.py" DiskId="1" Source="$(var.Source)/scripts/python/lib/ipc_pb2.py" Vital="no" /> 
     179                <File Id="p_script_pb_002" Name="plugin_pb2.py" DiskId="1" Source="$(var.Source)/scripts/python/lib/plugin_pb2.py" Vital="no" /> 
    178180              </Component> 
    179181              <Directory Id="INSTALLLOCATION_SCRIPTS_PYTHON_LIB2" Name="google"> 

  • helpers/systray_helper/TrayWidget.cpp

    r739db5a ra78a985  
    2020***************************************************************************/ 
    2121#include "stdafx.h" 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include "TrayWidget.h" 
    2424#include "resource.h" 

  • include/config.h.in

    r60e6c18 ra78a985  
    2222 
    2323#include "../version.hpp" 
    24 /* 
    25 #include <tchar.h>  
    26 */ 
    2724#include <string> 
    28 #include <settings/macros.h> 
    29 // Application Name 
    3025 
    3126#ifndef WSTR 
    … …  
    3429 
    3530#define APPLICATION_NAME WSTR("NSClient++") 
    36  
    37 // Version 
    38 #define SZBETATAG " " 
    39 //#define SZBETATAG " BETA " 
    40 //#define SZBETATAG " BETA " 
    41 #define _SZVERSION WSTR(STRPRODUCTVER) WSTR(SZBETATAG) WSTR(STRPRODUCTDATE) 
    42 #define CURRENT_SERVICE_VERSION _SZVERSION 
    43 //STRPRODUCTVER SZBETATAG STRPRODUCTDATE 
    44 //FILEVER[0] 
    4531 
    4632#if defined(_M_IX86) 
    … …  
    6147 
    6248// displayed name of the service 
    63 #define SERVICE_NAME SZAPPNAME WSTR(" ") CURRENT_SERVICE_VERSION WSTR(" ") SZARCH 
     49#define SERVICE_NAME APPLICATION_NAME WSTR(" ") CURRENT_SERVICE_VERSION WSTR(" ") SZARCH 
     50 
     51// Display version 
     52#define CURRENT_SERVICE_VERSION WSTR(STRPRODUCTVER) WSTR(" ") WSTR(STRPRODUCTDATE) 
    6453 
    6554// list of service dependencies - "dep1\0dep2\0\0" 
    6655#define DEFAULT_SERVICE_DEPS       _T("") 
    67  
    68 // Buffer size of incoming data (notice this is the maximum request length!) 
    69 #define RECV_BUFFER_LEN   1024 
    7056 
    7157#define NASTY_METACHARS         "|`&><'\"\\[]{}"        /* This may need to be modified for windows directory seperator */ 
    … …  
    9076#define DEFAULT_CACHE_PATH _T("${shared-path}/cache") 
    9177 
    92  
    93 // Default Argument string (for consistency) 
    94 #define SHOW_ALL _T("ShowAll") 
    95 #define SHOW_FAIL _T("ShowFail") 
    96 #define NSCLIENT _T("nsclient") 
    97 #define IGNORE_PERFDATA _T("ignore-perf-data") 
    98 #define CHECK_ALL _T("CheckAll") 
    99 #define CHECK_ALL_OTHERS _T("CheckAllOthers") 
    100  
    101 // Check System Settings 
    102 /* 
    103 #define C_SYSTEM_SECTION_TITLE _T("Check System") 
    104 #define C_SYSTEM_CPU_BUFFER_TIME _T("CPUBufferSize")  
    105 #define C_SYSTEM_CPU_BUFFER_TIME_DEFAULT _T("1h") 
    106 #define C_SYSTEM_CHECK_RESOLUTION _T("CheckResolution") 
    107 #define C_SYSTEM_CHECK_RESOLUTION_DEFAULT 10 // unit: second/10 
    108  
    109 #define C_SYSTEM_AUTODETECT_PDH _T("auto_detect_pdh") 
    110 #define C_SYSTEM_AUTODETECT_PDH_DEFAULT 1 
    111 #define C_SYSTEM_FORCE_LANGUAGE _T("force_language") 
    112 #define C_SYSTEM_FORCE_LANGUAGE_DEFAULT _T("") 
    113 #define C_SYSTEM_NO_INDEX _T("dont_use_pdh_index") 
    114 #define C_SYSTEM_NO_INDEX_DEFAULT 0 
    115 #define C_SYSTEM_IGNORE_COLLECTION _T("debug_skip_data_collection") 
    116 #define C_SYSTEM_IGNORE_COLLECTION_DEFAULT 0 
    117  
    118 #define C_SYSTEM_MEM_PAGE_LIMIT _T("MemoryCommitLimit") 
    119 #define C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT _T("\\Memory\\Commit Limit") 
    120 #define C_SYSTEM_MEM_PAGE _T("MemoryCommitByte") 
    121 #define C_SYSTEM_MEM_PAGE_DEFAULT _T("\\Memory\\Committed Bytes") 
    122 #define C_SYSTEM_UPTIME _T("SystemSystemUpTime") 
    123 #define C_SYSTEM_UPTIME_DEFAULT _T("\\System\\System Up Time") 
    124 #define C_SYSTEM_CPU _T("SystemTotalProcessorTime") 
    125 #define C_SYSTEM_MEM_CPU_DEFAULT _T("\\Processor(_total)\\% Processor Time") 
    126 #define C_SYSTEM_ENUMPROC_METHOD_PSAPI _T("PSAPI") 
    127 #define C_SYSTEM_ENUMPROC_METHOD_THELP _T("TOOLHELP") 
    128 #define C_SYSTEM_ENUMPROC_METHOD_AUTO _T("auto") 
    129 #define C_SYSTEM_ENUMPROC_METHOD _T("ProcessEnumerationMethod") 
    130 #define C_SYSTEM_ENUMPROC_METHOD_DEFAULT C_SYSTEM_ENUMPROC_METHOD_AUTO 
    131  
    132  
    133 #define EVENTLOG_SECTION_TITLE _T("Eventlog") 
    134 #define EVENTLOG_DEBUG _T("debug") 
    135 #define EVENTLOG_DEBUG_DEFAULT 0 
    136 #define EVENTLOG_LOOKUP_NAMES _T("lookup_names") 
    137 #define EVENTLOG_LOOKUP_NAMES_DEFAULT 1 
    138 #define EVENTLOG_SYNTAX _T("syntax") 
    139 #define EVENTLOG_SYNTAX_DEFAULT _T("") 
    140 #define EVENTLOG_BUFFER _T("buffer_size") 
    141 #define EVENTLOG_BUFFER_DEFAULT 1024*64 
    142  
    143 */ 
    144 /* 
    145 #define NSCA_AGENT_SECTION_TITLE _T("NSCA Agent") 
    146 #define NSCA_CMD_SECTION_TITLE _T("NSCA Commands") 
    147 #define NSCA_INTERVAL _T("interval") 
    148 #define NSCA_INTERVAL_DEFAULT 60 
    149 #define NSCA_HOSTNAME _T("hostname") 
    150 #define NSCA_HOSTNAME_DEFAULT _T("") 
    151 #define NSCA_SERVER _T("nsca_host") 
    152 #define NSCA_SERVER_DEFAULT _T("unknown-host") 
    153 #define NSCA_PORT _T("nsca_port") 
    154 #define NSCA_PORT_DEFAULT 5667 
    155 #define NSCA_ENCRYPTION _T("encryption_method") 
    156 #define NSCA_ENCRYPTION_DEFAULT 1 
    157 #define NSCA_PASSWORD _T("password") 
    158 #define NSCA_PASSWORD_DEFAULT _T("") 
    159 #define NSCA_DEBUG_THREADS _T("debug_threads") 
    160 #define NSCA_DEBUG_THREADS_DEFAULT 1 
    161 #define NSCA_CACHE_HOST _T("cache_hostname") 
    162 #define NSCA_CACHE_HOST_DEFAULT 0 
    163 #define NSCA_TIME_DELTA _T("time_delay") 
    164 #define NSCA_TIME_DELTA_DEFAULT _T("0") 
    165 #define NSCA_REPORT _T("report") 
    166 #define NSCA_REPORT_DEFAULT _T("all") 
    167 #define NSCA_READ_TIMEOUT _T("socket_timeout") 
    168 #define NSCA_READ_TIMEOUT_DEFAULT 30 
    169 #define NSCA_STRLEN _T("string_length") 
    170 #define NSCA_STRLEN_DEFAULT 512 
    171  
    172 #define C_SYSTEM_SVC_ALL_0 _T("check_all_services[SERVICE_BOOT_START]") 
    173 #define C_SYSTEM_SVC_ALL_0_DEFAULT _T("ignored") 
    174 #define C_SYSTEM_SVC_ALL_1 _T("check_all_services[SERVICE_SYSTEM_START]") 
    175 #define C_SYSTEM_SVC_ALL_1_DEFAULT _T("ignored") 
    176 #define C_SYSTEM_SVC_ALL_2 _T("check_all_services[SERVICE_AUTO_START]") 
    177 #define C_SYSTEM_SVC_ALL_2_DEFAULT _T("started") 
    178 #define C_SYSTEM_SVC_ALL_3 _T("check_all_services[SERVICE_DEMAND_START]") 
    179 #define C_SYSTEM_SVC_ALL_3_DEFAULT _T("ignored") 
    180 #define C_SYSTEM_SVC_ALL_4 _T("check_all_services[SERVICE_DISABLED]") 
    181 #define C_SYSTEM_SVC_ALL_4_DEFAULT _T("stopped") 
    182  
    183 */ 
    184 /* 
    185 #define C_TASKSCHED_SECTION _T("Task Scheduler") 
    186 #define C_TASKSCHED_SYNTAX _T("syntax") 
    187 #define C_TASKSCHED_SYNTAX_DEFAULT _T("%title% last run: %most-recent-run-time% (%exit-code%)") 
    188 */ 
    189 // Log to File Settings 
    190 /* 
    191 #define LOG_SECTION_TITLE _T("log") 
    192 #define LOG_FILENAME _T("file")  
    193 #define LOG_FILENAME_DEFAULT _T("nsclient.log") 
    194 #define LOG_DATEMASK _T("date_mask") 
    195 #define LOG_DATEMASK_DEFAULT _T("%Y-%m-%d %H:%M:%S") 
    196  
    197 #define LOG_ROOT _T("root_folder") 
    198 #define LOG_ROOT_DEFAULT _T("exe") 
    199  
    200 */ 
    201 // Main Settings 
    202 /* 
    203 #define MAIN_SECTION_TITLE _T("Settings") 
    204 #define MAIN_USEFILE_DEFAULT 0 
    205 #define MAIN_MASTERKEY _T("master_key")  
    206 #define MAIN_MASTERKEY_DEFAULT _T("This is a secret key that you should change") 
    207 #define MAIN_OBFUSCATED_PASWD _T("obfuscated_password") 
    208 #define MAIN_OBFUSCATED_PASWD_DEFAULT _T("") 
    209 #define MAIN_SETTINGS_PWD _T("password") 
    210 #define MAIN_SETTINGS_PWD_DEFAULT _T("") 
    211 #define MAIN_ALLOWED_HOSTS _T("allowed_hosts") 
    212 #define MAIN_ALLOWED_HOSTS_DEFAULT _T("127.0.0.1") 
    213 #define MAIN_ALLOWED_HOSTS_CACHE _T("cache_allowed_hosts") 
    214 #define MAIN_ALLOWED_HOSTS_CACHE_DEFAULT 1 
    215 #define MAIN_STRING_LENGTH _T("string_length") 
    216 #define MAIN_STRING_LENGTH_DEFAULT 4096 
    217 #define MAIN_SHARED_SESSION _T("shared_session") 
    218 #define MAIN_SHARED_SESSION_DEFAULT 0 
    219 */ 
    220  
    221 // LOA Config items 
    222 /* 
    223 #define LUA_SCRIPT_SECTION_TITLE _T("LUA Scripts") 
    224 */ 

  • modules/CheckDisk/CheckDisk.cpp

    ra44cb15 ra78a985  
    2121#include "stdafx.h" 
    2222#include "CheckDisk.h" 
    23 #include <strEx.h> 
    2423#include <time.h> 
    2524#include <filter_framework.hpp> 
    … …  
    3938#include <parsers/where/unary_op.hpp> 
    4039#include <parsers/where/variable.hpp> 
     40 
     41#include <config.h> 
    4142 
    4243namespace sh = nscapi::settings_helper; 

  • modules/CheckDisk/CheckDisk.h

    ra14aa07 ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424#include <utils.h> 

  • modules/CheckDisk/file_info.cpp

    re11d494 ra78a985  
    11#include "stdafx.h" 
    22 
    3 /* 
    4 #include "file_info.hpp" 
    5 #include <strEx.h> 
    6 #include <error.hpp> 
    7 #include <config.h> 
    8  
    9 #include "filter.hpp" 
    10  
    11 #include <parsers/where/unary_fun.hpp> 
    12 #include <parsers/where/list_value.hpp> 
    13 #include <parsers/where/binary_op.hpp> 
    14 #include <parsers/where/unary_op.hpp> 
    15 #include <parsers/where/variable.hpp> 
    16  
    17 bool file_finder::filter::matchFilter(file_filter::filter_obj *value) const { 
    18   if ((size.hasFilter())&&(size.matchFilter(value->get_size()))) 
    19     return true; 
    20   else if (creation.hasFilter()&&creation.matchFilter(value->get_creation())) 
    21     return true; 
    22   else if (accessed.hasFilter()&&accessed.matchFilter(value->get_access())) 
    23     return true; 
    24   else if (written.hasFilter()&&written.matchFilter(value->get_write())) 
    25     return true; 
    26   else if ((version.hasFilter())&&(version.matchFilter(value->get_version()))) 
    27     return true; 
    28   else if ((line_count.hasFilter())&&(line_count.matchFilter(value->get_line_count()))) 
    29     return true; 
    30   return false; 
    31 } 
    32 */ 

  • modules/CheckDisk/filter.cpp

    re11d494 ra78a985  
    2424#include "file_finder.hpp" 
    2525 
    26 #include <config.h> 
     26//#include <config.h> 
    2727 
    2828using namespace boost::assign; 

  • modules/CheckDisk/stdafx.h

    r1f24a1c ra78a985  
    3030#include <boost/lexical_cast.hpp> 
    3131 
    32 #include <config.h> 
     32#include <common.hpp> 
     33#include <strEx.h> 
    3334#include <unicode_char.hpp> 
    3435#include <types.hpp> 

  • modules/CheckEventLog/CheckEventLog.cpp

    ra44cb15 ra78a985  
    2525#include <boost/foreach.hpp> 
    2626 
    27 #include <strEx.h> 
    2827#include <time.h> 
    2928#include <utils.h> 
    … …  
    3130#include <map> 
    3231#include <vector> 
    33 #include <config.h> 
     32//#include <config.h> 
    3433 
    3534#include <boost/bind.hpp> 

  • modules/CheckEventLog/filter.cpp

    re11d494 ra78a985  
    2121#include "filter.hpp" 
    2222 
    23 #include <config.h> 
     23//#include <config.h> 
    2424 
    2525using namespace boost::assign; 

  • modules/CheckEventLog/stdafx.h

    r497b779 ra78a985  
    3535#include <boost/lexical_cast.hpp> 
    3636 
    37 #include <config.h> 
     37#include <common.hpp> 
     38#include <strEx.h> 
    3839#include <unicode_char.hpp> 
    3940#include <types.hpp> 

  • modules/CheckExternalScripts/CheckExternalScripts.cpp

    r81e420c ra78a985  
    3232#include <settings/client/settings_client.hpp> 
    3333#include <nscapi/functions.hpp> 
     34 
     35#include <config.h> 
    3436 
    3537namespace sh = nscapi::settings_helper; 

  • modules/CheckExternalScripts/stdafx.h

    r64d42de ra78a985  
    2727#include <boost/lexical_cast.hpp> 
    2828 
    29 #include <config.h> 
     29#include <common.hpp> 
     30#include <strEx.h> 
    3031#include <unicode_char.hpp> 
    3132#include <types.hpp> 

  • modules/CheckHelpers/CheckHelpers.h

    ra14aa07 ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424 

  • modules/CheckNSCP/CheckNSCP.cpp

    ra44cb15 ra78a985  
    2323#include <file_helpers.hpp> 
    2424#include <unicode_char.hpp> 
     25 
     26#include <config.h> 
    2527 
    2628#include <settings/client/settings_client.hpp> 

  • modules/CheckNSCP/CheckNSCP.h

    ra14aa07 ra78a985  
    2121#pragma once 
    2222 
    23 #include <config.h> 
     23//#include <config.h> 
    2424 
    2525#include <string> 

  • modules/CheckSystem/CheckSystem.cpp

    ra44cb15 ra78a985  
    3838#include <settings/client/settings_client.hpp> 
    3939#include <arrayBuffer.h> 
     40 
     41#include <config.h> 
    4042 
    4143/** 

  • modules/CheckSystem/stdafx.h

    r294b37b ra78a985  
    3030 
    3131#include <iostream> 
    32 #include <tchar.h> 
    3332#include <string> 
    3433#include <hash_map> 
    3534#include <list> 
     35 
     36#include <common.hpp> 
     37#include <tchar.h> 
    3638#include <NSCAPI.h> 
    3739#include <nscapi/plugin.hpp> 
    3840#include <nscapi/nscapi_plugin_wrapper.hpp> 
    39 #include <config.h> 
     41//#include <config.h> 
    4042#include <utils.h> 
    4143#include <error.hpp> 

  • modules/CheckTaskSched/CheckTaskSched.h

    ra14aa07 ra78a985  
    2222NSC_WRAPPERS_CLI(); 
    2323 
    24 #include <config.h> 
     24//#include <config.h> 
    2525#include <strEx.h> 
    2626#include <utils.h> 

  • modules/CheckTaskSched/stdafx.h

    r1ecd26f ra78a985  
    3333#include <objbase.h> 
    3434 
     35#include <common.hpp> 
     36#include <strEx.h> 
    3537#include <NSCAPI.h> 
    3638#include <nscapi/plugin.hpp> 

  • modules/CheckTaskSched2/CheckTaskSched2.h

    ra14aa07 ra78a985  
    2222NSC_WRAPPERS_CLI(); 
    2323 
    24 #include <config.h> 
     24//#include <config.h> 
    2525#include <strEx.h> 
    2626#include <utils.h> 

  • modules/CheckTaskSched2/stdafx.h

    r1f24a1c ra78a985  
    3333#include <objbase.h> 
    3434 
     35#include <common.hpp> 
     36#include <strEx.h> 
    3537#include <NSCAPI.h> 
    3638#include <nscapi/plugin.hpp> 

  • modules/CheckWMI/CheckWMI.h

    ra14aa07 ra78a985  
    2222NSC_WRAPPERS_CLI(); 
    2323 
    24 #include <config.h> 
     24//#include <config.h> 
    2525#include <strEx.h> 
    2626#include <utils.h> 

  • modules/CheckWMI/stdafx.h

    rfe75eff ra78a985  
    4242#include <objbase.h> 
    4343 
     44#include <common.hpp> 
    4445#include <NSCAPI.h> 
    4546#include <nscapi/plugin.hpp> 
    … …  
    5354#include <atlsafe.h> 
    5455 
     56 
    5557#ifdef MEMCHECK 
    5658#include <vld.h> 

  • modules/DebugLogMetrics/DebugLogMetrics.cpp

    rd66ccee ra78a985  
    2323#include <strEx.h> 
    2424#include <time.h> 
    25 #include <config.h> 
     25//#include <config.h> 
    2626#include <Psapi.h> 
    2727 

  • modules/DebugLogMetrics/stdafx.h

    r7f9c823 ra78a985  
    2828#include <functional> 
    2929 
    30 #include <config.h> 
     30//#include <config.h> 
    3131#include <utils.h> 
    3232 

  • modules/FileLogger/FileLogger.cpp

    r81e420c ra78a985  
    2020***************************************************************************/ 
    2121 
    22 #include <config.h> 
     22//#include <config.h> 
    2323 
    2424#include <string> 
    … …  
    3333 
    3434#include <settings/client/settings_client.hpp> 
    35  
     35#include <settings/macros.h> 
    3636 
    3737namespace sh = nscapi::settings_helper; 

  • modules/LUAScript/LUAScript.h

    ra14aa07 ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424#include <utils.h> 

  • modules/NRPEClient/NRPEClient.cpp

    ra44cb15 ra78a985  
    2323#include <strEx.h> 
    2424#include <time.h> 
    25 #include <config.h> 
    26 #include <strEx.h> 
    27 #include <boost/filesystem.hpp> 
     25//#include <config.h> 
    2826#include <strEx.h> 
    2927#include <nrpe/client/socket.hpp> 

  • modules/NRPEClient/NRPEClient.h

    ra14aa07 ra78a985  
    2727#include <nrpe/packet.hpp> 
    2828 
     29namespace po = boost::program_options; 
    2930 
    3031class NRPEClient : public nscapi::impl::simple_command_handler, public nscapi::impl::simple_plugin, public nscapi::impl::simple_command_line_exec { 

  • modules/NRPEClient/stdafx.h

    r1f24a1c ra78a985  
    2727#include <boost/optional.hpp> 
    2828#include <boost/bind.hpp> 
    29 #include <program_options_ex.hpp> 
     29#include <boost/filesystem.hpp> 
    3030 
    3131//#define _WIN32_WINNT 0x0403 
    … …  
    3838 
    3939 
    40 #include <config.h> 
     40//#include <config.h> 
    4141#include <utils.h> 
    4242#include <types.hpp> 
    4343 
     44#include <config.h> 
     45#include <settings/macros.h> 
    4446#include <NSCAPI.h> 
    4547#include <nscapi/plugin.hpp> 
    46 namespace po = boost::program_options; 
     48#include <program_options_ex.hpp> 
    4749 
    4850 

  • modules/NRPEServer/NRPEServer.cpp

    r81e420c ra78a985  
    2323#include <strEx.h> 
    2424#include <time.h> 
    25 #include <config.h> 
     25//#include <config.h> 
    2626#include "handler_impl.hpp" 
    2727 

  • modules/NRPEServer/handler_impl.cpp

    rd7e265d ra78a985  
    33#include <boost/asio.hpp> 
    44#include "handler_impl.hpp" 
     5#include <config.h> 
    56 
    67nrpe::packet handler_impl::handle(nrpe::packet p) { 

  • modules/NRPEServer/stdafx.h

    r1f24a1c ra78a985  
    4747#endif 
    4848 
    49 #include <config.h> 
     49#include <common.hpp> 
     50#include <strEx.h> 
    5051#include <utils.h> 
    5152 

  • modules/NSClientServer/NSClientSocket.cpp

    rb8c44b4 ra78a985  
    1212} 
    1313 
    14  
    15 #define RECV_BUFFER_LEN 1024 
    1614 
    1715std::string NSClientSocket::parseRequest(std::string buffer)  { 

  • modules/PythonScript/script_wrapper.hpp

    ra14aa07 ra78a985  
    104104  public: 
    105105    static boost::shared_ptr<command_wrapper> create() { 
    106       NSC_DEBUG_MSG_STD(_T("<<<CREATING NEW>>>")); 
    107106      return boost::shared_ptr<command_wrapper>(new command_wrapper(nscapi::plugin_singleton->get_core())); 
    108107    } 

  • modules/RemoteConfiguration/RemoteConfiguration.h

    r739db5a ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424#include <utils.h> 

  • modules/Scheduler/Scheduler.h

    r81e420c ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424 

  • modules/SysTray/SysTray.cpp

    r5da0459 ra78a985  
    2323#include "TrayIcon.h" 
    2424#include <ServiceCmd.h> 
    25 #include <config.h> 
     25//#include <config.h> 
    2626#include <Winwlx.h> 
    2727#include <sysinfo.h> 

  • modules/WEBConfiguration/WEBConfiguration.h

    r9567d4b ra78a985  
    2020***************************************************************************/ 
    2121NSC_WRAPPERS_MAIN(); 
    22 #include <config.h> 
     22//#include <config.h> 
    2323#include <strEx.h> 
    2424#include <utils.h> 

  • version.hpp

    ra14aa07 ra78a985  
    11#ifndef VERSION_HPP 
    22#define VERSION_HPP 
    3 #define PRODUCTVER     0,4,0,86 
    4 #define STRPRODUCTVER  "0,4,0,86" 
    5 #define STRPRODUCTDATE "2011-09-03" 
     3#define PRODUCTVER     0,4,0,96 
     4#define STRPRODUCTVER  "0,4,0,96" 
     5#define STRPRODUCTDATE "2011-09-05" 
    66#endif // VERSION_HPP 

  • version.txt

    ra14aa07 ra78a985  
    11version=0.4.0 
    2 build=86 
    3 date=2011-09-03 
     2build=96 
     3date=2011-09-05 
Note: See TracChangeset for help on using the changeset viewer.