Changeset 202
- Timestamp:
- 11/01/09 11:06:01 (2 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 11 deleted
- 28 edited
- 17 moved
-
. (modified) (1 prop)
-
AutoBuild.h (modified) (1 diff)
-
Jamroot (modified) (9 diffs)
-
NSClient++-2005.sln (modified) (10 diffs)
-
NSClient++-2008.sln (deleted)
-
NSClient++-2008.vcproj (deleted)
-
NSParser.cpp (deleted)
-
NSParser.h (deleted)
-
Settings.h (deleted)
-
TCPSocketResponder.cpp (deleted)
-
TCPSocketResponder.h (deleted)
-
clean.bat (deleted)
-
env.bat (modified) (9 diffs)
-
files/NSC.dist (moved) (moved from trunk/NSC.dist)
-
include/EnumNtSrv.cpp (modified) (1 diff)
-
include/NSCHelper.cpp (modified) (3 diffs)
-
include/NSCHelper.h (modified) (3 diffs)
-
include/config.h (modified) (4 diffs)
-
include/file_helpers.hpp (modified) (1 diff)
-
include/file_logger.hpp (modified) (4 diffs)
-
include/settings (added)
-
include/settings/Settings.h (moved) (moved from trunk/include/Settings.h) (21 diffs)
-
include/settings/TSettings.h (moved) (moved from trunk/include/TSettings.h)
-
include/settings/settings_ini.hpp (moved) (moved from trunk/include/INISettings.h) (1 diff)
-
include/settings/settings_old.hpp (moved) (moved from trunk/include/OLDSettings.hpp) (9 diffs)
-
include/settings/settings_registry.hpp (moved) (moved from trunk/include/REGSettings.h) (2 diffs)
-
modules/CheckDisk/CheckDisk.cpp (modified) (8 diffs)
-
modules/CheckEventLog/CheckEventLog.cpp (modified) (5 diffs)
-
modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (16 diffs)
-
modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)
-
modules/CheckSystem/CheckSystem.cpp (modified) (2 diffs)
-
modules/CheckSystem/PDHCollector.cpp (modified) (2 diffs)
-
modules/DebugLogMetrics/DebugLogMetrics.cpp (modified) (1 diff)
-
modules/DebugLogMetrics/DebugLogMetrics.h (modified) (2 diffs)
-
modules/DebugLogMetrics/PDHCollector.cpp (modified) (3 diffs)
-
modules/FileLogger/FileLogger.cpp (modified) (2 diffs)
-
modules/LUAScript/LUAScript.cpp (modified) (1 diff)
-
modules/NRPEClient/NRPEClient.cpp (modified) (2 diffs)
-
modules/NRPEListener/NRPEListener.cpp (modified) (7 diffs)
-
modules/NSCAAgent/NSCAAgent.cpp (modified) (1 diff)
-
modules/NSCAAgent/NSCAThread.cpp (modified) (3 diffs)
-
modules/NSClientListener/NSClientListener.cpp (modified) (1 diff)
-
release-build.bat (modified) (1 diff)
-
service (added)
-
service/NSCPlugin.cpp (moved) (moved from trunk/NSCPlugin.cpp)
-
service/NSCPlugin.h (moved) (moved from trunk/NSCPlugin.h)
-
service/NSClient++-2005.vcproj (moved) (moved from trunk/NSClient++-2005.vcproj) (4 diffs)
-
service/NSClient++.cpp (moved) (moved from trunk/NSClient++.cpp) (16 diffs)
-
service/NSClient++.h (moved) (moved from trunk/NSClient++.h) (5 diffs)
-
service/NSClient++.manifest (moved) (moved from trunk/NSClient++.manifest)
-
service/NSClient++.rc (moved) (moved from trunk/NSClient++.rc)
-
service/StdAfx.cpp (moved) (moved from trunk/StdAfx.cpp)
-
service/StdAfx.h (moved) (moved from trunk/StdAfx.h)
-
service/resource.h (moved) (moved from trunk/resource.h)
-
service/tray_manager.hpp (moved) (moved from trunk/tray_manager.hpp)
-
upload.bat (deleted)
-
x64-build.bat (deleted)
-
x86-build.bat (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:ignore
-
old new 1 1 NSC.ini 2 2 AutoBuild.wxs 3 bin 4 bjam-tmp-build 5 stage 6 tmp 7 win32 8 x64
-
- Property svn:ignore
-
trunk/AutoBuild.h
r201 r202 3 3 // change the FALSE to TRUE for autoincrement of build number 4 4 #define INCREMENT_VERSION TRUE 5 #define FILEVER 0, 3,7,4866 #define PRODUCTVER 0, 3,7,4867 #define STRFILEVER _T("0. 3.7.486")8 #define STRPRODUCTVER _T("0. 3.7.486")9 #define STRPRODUCTDATE _T("2009-1 0-12")5 #define FILEVER 0,4,0,21 6 #define PRODUCTVER 0,4,0,21 7 #define STRFILEVER _T("0.4.0.21") 8 #define STRPRODUCTVER _T("0.4.0.21") 9 #define STRPRODUCTDATE _T("2009-11-01") 10 10 #endif // AUTOBUILD_H -
trunk/Jamroot
r201 r202 6 6 import common ; 7 7 import option ; 8 9 include user-config.jam ;10 8 11 9 feature character-set : unicode ansi multibyte : composite ; … … 27 25 import bjam/zip ; 28 26 29 local target = NSClient++ ;30 27 local target-config = nsc.ini ; 31 28 local target-readme = readme.txt ; … … 92 89 echo "Plattform SDK not avaliable! Various features wont work (enable with --with-psdk)" ; 93 90 } 94 95 notfile update_version : @update_version ; 96 actions update_version 97 { 98 XAutobuild.exe -f $(TOP) 99 } 100 } 101 102 91 } 103 92 104 93 project master 105 94 : requirements 106 <include> include95 <include>$(TOP)/include 107 96 <find-static-library>advapi32 108 97 <find-static-library>user32 … … 117 106 ; 118 107 119 make $(target).exe.manifest : NSClient++.manifest : common.copy ;120 explicit $(target).exe.manifest ;121 122 123 exe $(target)124 125 : # sources126 NSClient++.cpp127 NSCPlugin.cpp128 include/NSCHelper.cpp129 include/arrayBuffer.cpp130 include/ServiceCmd.cpp131 include/Socket.cpp132 include/b64/b64.c133 134 : # requirements135 <dependency>$(target).exe.manifest136 #<runtime-link>static137 <find-static-library>ws2_32138 <find-static-library>Userenv139 <find-static-library>ole32140 <variant>release:<dependency>update_version141 : # default build142 143 : # usage requirements144 # depends $(target).manifest145 ;146 explicit $(target) ;147 148 108 # 149 109 # Copy various files 150 110 # 151 make $(target-config) : nsc.dist : common.copy ;111 make $(target-config) : files/nsc.dist : common.copy ; 152 112 explicit $(target-config) ; 153 113 … … 171 131 [ MATCH .*modules/(.*)/.* : [ glob modules/*/Jamfile ] ] 172 132 ; 173 174 # all-modules = NSCAAgent ;175 133 176 134 all-scripts = … … 216 174 : # default build 217 175 : # usage requirements 218 <dependency>$(target)176 #<dependency>$(target) 219 177 ; 220 178 explicit $(l) ; … … 261 219 explicit all-scripts-targets ; 262 220 263 alias all-root-targets : $(target)$(target-config) $(target-readme) $(target-guide) $(target-refman) $(target-license) $(target-changelog) $(target-counters) helpers/systray_helper ;221 alias all-root-targets : service $(target-config) $(target-readme) $(target-guide) $(target-refman) $(target-license) $(target-changelog) $(target-counters) helpers/systray_helper ; 264 222 explicit all-root-targets ; 265 223 … … 309 267 } 310 268 311 install dist : all-root-targets : <conditional>@generate-binary-location ;312 explicit dist ;269 install dist-root : all-root-targets : <conditional>@generate-binary-location ; 270 explicit dist-root ; 313 271 314 272 install dist-modules : all-modules-targets : <conditional>@generate-module-location ; … … 321 279 explicit dist-scripts ; 322 280 323 alias build-binaries : dist dist-modules dist-helpers dist-scripts ; 281 # alias build-binaries : dist-root dist-modules dist-helpers dist-scripts ; 282 alias build-binaries : dist-root dist-modules dist-scripts ; 324 283 explicit build-binaries ; 325 326 284 327 285 alias build-archives : all-archive-targets : <location>$(BOOST_STAGE_LOCATE)/archive ; -
trunk/NSClient++-2005.sln
r201 r202 2 2 # Visual Studio 2005 3 3 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClient++", "NSClient++-2005.vcproj", "{2286162D-7571-4735-BAC8-4A8D33A4F42D}" 4 ProjectSection(WebsiteProperties) = preProject 5 Debug.AspNetCompiler.Debug = "True" 6 Release.AspNetCompiler.Debug = "False" 7 EndProjectSection 8 EndProject 9 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}" 10 ProjectSection(WebsiteProperties) = preProject 11 Debug.AspNetCompiler.Debug = "True" 12 Release.AspNetCompiler.Debug = "False" 13 EndProjectSection 14 EndProject 15 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}" 16 ProjectSection(WebsiteProperties) = preProject 17 Debug.AspNetCompiler.Debug = "True" 18 Release.AspNetCompiler.Debug = "False" 19 EndProjectSection 20 EndProject 21 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}" 22 ProjectSection(WebsiteProperties) = preProject 23 Debug.AspNetCompiler.Debug = "True" 24 Release.AspNetCompiler.Debug = "False" 25 EndProjectSection 26 EndProject 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}" 28 ProjectSection(WebsiteProperties) = preProject 29 Debug.AspNetCompiler.Debug = "True" 30 Release.AspNetCompiler.Debug = "False" 31 EndProjectSection 32 EndProject 33 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}" 34 ProjectSection(WebsiteProperties) = preProject 35 Debug.AspNetCompiler.Debug = "True" 36 Release.AspNetCompiler.Debug = "False" 37 EndProjectSection 38 EndProject 39 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}" 40 ProjectSection(WebsiteProperties) = preProject 41 Debug.AspNetCompiler.Debug = "True" 42 Release.AspNetCompiler.Debug = "False" 43 EndProjectSection 44 EndProject 45 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}" 46 ProjectSection(WebsiteProperties) = preProject 47 Debug.AspNetCompiler.Debug = "True" 48 Release.AspNetCompiler.Debug = "False" 49 EndProjectSection 50 EndProject 51 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}" 52 ProjectSection(WebsiteProperties) = preProject 53 Debug.AspNetCompiler.Debug = "True" 54 Release.AspNetCompiler.Debug = "False" 55 EndProjectSection 56 EndProject 57 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}" 58 ProjectSection(WebsiteProperties) = preProject 59 Debug.AspNetCompiler.Debug = "True" 60 Release.AspNetCompiler.Debug = "False" 61 EndProjectSection 62 EndProject 63 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}" 64 ProjectSection(WebsiteProperties) = preProject 65 Debug.AspNetCompiler.Debug = "True" 66 Release.AspNetCompiler.Debug = "False" 67 EndProjectSection 68 EndProject 69 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}" 70 ProjectSection(WebsiteProperties) = preProject 71 Debug.AspNetCompiler.Debug = "True" 72 Release.AspNetCompiler.Debug = "False" 73 EndProjectSection 74 EndProject 75 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}" 76 ProjectSection(WebsiteProperties) = preProject 77 Debug.AspNetCompiler.Debug = "True" 78 Release.AspNetCompiler.Debug = "False" 79 EndProjectSection 80 EndProject 81 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}" 82 ProjectSection(WebsiteProperties) = preProject 83 Debug.AspNetCompiler.Debug = "True" 84 Release.AspNetCompiler.Debug = "False" 85 EndProjectSection 86 EndProject 87 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}" 88 ProjectSection(WebsiteProperties) = preProject 89 Debug.AspNetCompiler.Debug = "True" 90 Release.AspNetCompiler.Debug = "False" 91 EndProjectSection 92 EndProject 93 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}" 94 ProjectSection(WebsiteProperties) = preProject 95 Debug.AspNetCompiler.Debug = "True" 96 Release.AspNetCompiler.Debug = "False" 97 EndProjectSection 98 EndProject 99 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}" 100 ProjectSection(WebsiteProperties) = preProject 101 Debug.AspNetCompiler.Debug = "True" 102 Release.AspNetCompiler.Debug = "False" 103 EndProjectSection 104 EndProject 105 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}" 106 ProjectSection(WebsiteProperties) = preProject 107 Debug.AspNetCompiler.Debug = "True" 108 Release.AspNetCompiler.Debug = "False" 109 EndProjectSection 4 110 ProjectSection(ProjectDependencies) = postProject 111 {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 112 {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 113 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 114 {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 115 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 116 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 117 {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 118 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 119 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 5 120 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 121 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 122 {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 123 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 124 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 6 125 {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 7 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 8 {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 9 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 10 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 11 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 12 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 13 {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 14 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 15 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 16 {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 17 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 18 {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 19 {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 126 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 127 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 128 {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} 129 EndProjectSection 130 EndProject 131 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}" 132 ProjectSection(WebsiteProperties) = preProject 133 Debug.AspNetCompiler.Debug = "True" 134 Release.AspNetCompiler.Debug = "False" 135 EndProjectSection 136 ProjectSection(ProjectDependencies) = postProject 137 {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560} 20 138 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 21 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 22 EndProjectSection 23 ProjectSection(WebsiteProperties) = preProject 24 Debug.AspNetCompiler.Debug = "True" 25 Release.AspNetCompiler.Debug = "False" 26 EndProjectSection 27 EndProject 28 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}" 29 ProjectSection(WebsiteProperties) = preProject 30 Debug.AspNetCompiler.Debug = "True" 31 Release.AspNetCompiler.Debug = "False" 32 EndProjectSection 33 EndProject 34 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}" 35 ProjectSection(WebsiteProperties) = preProject 36 Debug.AspNetCompiler.Debug = "True" 37 Release.AspNetCompiler.Debug = "False" 38 EndProjectSection 39 EndProject 40 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}" 41 ProjectSection(WebsiteProperties) = preProject 42 Debug.AspNetCompiler.Debug = "True" 43 Release.AspNetCompiler.Debug = "False" 44 EndProjectSection 45 EndProject 46 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}" 47 ProjectSection(WebsiteProperties) = preProject 48 Debug.AspNetCompiler.Debug = "True" 49 Release.AspNetCompiler.Debug = "False" 50 EndProjectSection 51 EndProject 52 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}" 53 ProjectSection(WebsiteProperties) = preProject 54 Debug.AspNetCompiler.Debug = "True" 55 Release.AspNetCompiler.Debug = "False" 56 EndProjectSection 57 EndProject 58 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}" 59 ProjectSection(WebsiteProperties) = preProject 60 Debug.AspNetCompiler.Debug = "True" 61 Release.AspNetCompiler.Debug = "False" 62 EndProjectSection 63 EndProject 64 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}" 65 ProjectSection(WebsiteProperties) = preProject 66 Debug.AspNetCompiler.Debug = "True" 67 Release.AspNetCompiler.Debug = "False" 68 EndProjectSection 69 EndProject 70 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}" 71 ProjectSection(WebsiteProperties) = preProject 72 Debug.AspNetCompiler.Debug = "True" 73 Release.AspNetCompiler.Debug = "False" 74 EndProjectSection 75 EndProject 76 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}" 77 ProjectSection(WebsiteProperties) = preProject 78 Debug.AspNetCompiler.Debug = "True" 79 Release.AspNetCompiler.Debug = "False" 80 EndProjectSection 81 EndProject 82 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}" 83 ProjectSection(WebsiteProperties) = preProject 84 Debug.AspNetCompiler.Debug = "True" 85 Release.AspNetCompiler.Debug = "False" 86 EndProjectSection 87 EndProject 88 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}" 89 ProjectSection(WebsiteProperties) = preProject 90 Debug.AspNetCompiler.Debug = "True" 91 Release.AspNetCompiler.Debug = "False" 92 EndProjectSection 93 EndProject 94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}" 95 ProjectSection(WebsiteProperties) = preProject 96 Debug.AspNetCompiler.Debug = "True" 97 Release.AspNetCompiler.Debug = "False" 98 EndProjectSection 99 EndProject 100 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}" 101 ProjectSection(WebsiteProperties) = preProject 102 Debug.AspNetCompiler.Debug = "True" 103 Release.AspNetCompiler.Debug = "False" 104 EndProjectSection 105 EndProject 106 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}" 107 ProjectSection(WebsiteProperties) = preProject 108 Debug.AspNetCompiler.Debug = "True" 109 Release.AspNetCompiler.Debug = "False" 110 EndProjectSection 111 EndProject 112 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}" 113 ProjectSection(WebsiteProperties) = preProject 114 Debug.AspNetCompiler.Debug = "True" 115 Release.AspNetCompiler.Debug = "False" 116 EndProjectSection 117 EndProject 118 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}" 119 ProjectSection(WebsiteProperties) = preProject 120 Debug.AspNetCompiler.Debug = "True" 121 Release.AspNetCompiler.Debug = "False" 122 EndProjectSection 123 EndProject 124 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}" 125 ProjectSection(WebsiteProperties) = preProject 126 Debug.AspNetCompiler.Debug = "True" 127 Release.AspNetCompiler.Debug = "False" 128 EndProjectSection 129 EndProject 130 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}" 139 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 140 EndProjectSection 141 EndProject 142 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}" 143 ProjectSection(WebsiteProperties) = preProject 144 Debug.AspNetCompiler.Debug = "True" 145 Release.AspNetCompiler.Debug = "False" 146 EndProjectSection 131 147 ProjectSection(ProjectDependencies) = postProject 132 {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}133 148 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 134 149 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} … … 140 155 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 141 156 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 157 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 142 158 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 143 {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}144 159 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 145 160 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} … … 149 164 {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 150 165 EndProjectSection 151 ProjectSection(WebsiteProperties) = preProject 152 Debug.AspNetCompiler.Debug = "True" 153 Release.AspNetCompiler.Debug = "False" 154 EndProjectSection 155 EndProject 156 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}" 166 EndProject 167 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}" 168 ProjectSection(WebsiteProperties) = preProject 169 Debug.AspNetCompiler.Debug = "True" 170 Release.AspNetCompiler.Debug = "False" 171 EndProjectSection 172 EndProject 173 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}" 174 ProjectSection(WebsiteProperties) = preProject 175 Debug.AspNetCompiler.Debug = "True" 176 Release.AspNetCompiler.Debug = "False" 177 EndProjectSection 178 EndProject 179 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}" 180 ProjectSection(WebsiteProperties) = preProject 181 Debug.AspNetCompiler.Debug = "True" 182 Release.AspNetCompiler.Debug = "False" 183 EndProjectSection 184 EndProject 185 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}" 186 ProjectSection(WebsiteProperties) = preProject 187 Debug.AspNetCompiler.Debug = "True" 188 Release.AspNetCompiler.Debug = "False" 189 EndProjectSection 190 EndProject 191 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}" 192 ProjectSection(WebsiteProperties) = preProject 193 Debug.AspNetCompiler.Debug = "True" 194 Release.AspNetCompiler.Debug = "False" 195 EndProjectSection 196 EndProject 197 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}" 198 ProjectSection(WebsiteProperties) = preProject 199 Debug.AspNetCompiler.Debug = "True" 200 Release.AspNetCompiler.Debug = "False" 201 EndProjectSection 202 EndProject 203 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}" 204 ProjectSection(WebsiteProperties) = preProject 205 Debug.AspNetCompiler.Debug = "True" 206 Release.AspNetCompiler.Debug = "False" 207 EndProjectSection 157 208 ProjectSection(ProjectDependencies) = postProject 209 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 210 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 211 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 158 212 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 159 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}160 {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560}161 EndProjectSection162 ProjectSection(WebsiteProperties) = preProject163 Debug.AspNetCompiler.Debug = "True"164 Release.AspNetCompiler.Debug = "False"165 EndProjectSection166 EndProject167 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}"168 ProjectSection(ProjectDependencies) = postProject169 {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}170 {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}171 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}172 {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}173 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}174 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}175 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}176 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}177 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}178 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}179 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}180 {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}181 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}182 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}183 {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}184 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}185 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}186 EndProjectSection187 ProjectSection(WebsiteProperties) = preProject188 Debug.AspNetCompiler.Debug = "True"189 Release.AspNetCompiler.Debug = "False"190 EndProjectSection191 EndProject192 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}"193 ProjectSection(WebsiteProperties) = preProject194 Debug.AspNetCompiler.Debug = "True"195 Release.AspNetCompiler.Debug = "False"196 EndProjectSection197 EndProject198 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}"199 ProjectSection(WebsiteProperties) = preProject200 Debug.AspNetCompiler.Debug = "True"201 Release.AspNetCompiler.Debug = "False"202 213 {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 203 214 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} … … 205 216 {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 206 217 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 207 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}208 218 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 209 219 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 210 {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}211 220 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 212 221 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} … … 217 226 EndProjectSection 218 227 EndProject 219 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}"220 ProjectSection(WebsiteProperties) = preProject221 Debug.AspNetCompiler.Debug = "True"222 Release.AspNetCompiler.Debug = "False"223 EndProjectSection224 EndProject225 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}"226 ProjectSection(WebsiteProperties) = preProject227 Debug.AspNetCompiler.Debug = "True"228 Release.AspNetCompiler.Debug = "False"229 EndProjectSection230 EndProject231 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}"232 ProjectSection(WebsiteProperties) = preProject233 Debug.AspNetCompiler.Debug = "True"234 Release.AspNetCompiler.Debug = "False"235 EndProjectSection236 EndProject237 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}"238 ProjectSection(WebsiteProperties) = preProject239 Debug.AspNetCompiler.Debug = "True"240 Release.AspNetCompiler.Debug = "False"241 EndProjectSection242 EndProject243 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}"244 ProjectSection(ProjectDependencies) = postProject245 {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}246 {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}247 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}248 {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}249 {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}250 {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}251 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}252 {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}253 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}254 {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}255 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}256 {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}257 {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}258 {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}259 {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}260 {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}261 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE}262 EndProjectSection263 ProjectSection(WebsiteProperties) = preProject264 Debug.AspNetCompiler.Debug = "True"265 Release.AspNetCompiler.Debug = "False"266 EndProjectSection267 EndProject268 228 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebugLogMetrics", "modules\DebugLogMetrics\DebugLogMetrics-2005.vcproj", "{53FB9872-5E74-4E62-892D-AD82C2ED67CE}" 269 229 ProjectSection(WebsiteProperties) = preProject … … 284 244 EndProjectSection 285 245 EndProject 286 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}" 287 ProjectSection(WebsiteProperties) = preProject 288 Debug.AspNetCompiler.Debug = "True" 289 Release.AspNetCompiler.Debug = "False" 290 EndProjectSection 291 EndProject 292 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}" 293 ProjectSection(WebsiteProperties) = preProject 294 Debug.AspNetCompiler.Debug = "True" 295 Release.AspNetCompiler.Debug = "False" 296 EndProjectSection 297 EndProject 298 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}" 299 ProjectSection(WebsiteProperties) = preProject 300 Debug.AspNetCompiler.Debug = "True" 301 Release.AspNetCompiler.Debug = "False" 302 EndProjectSection 303 EndProject 304 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}" 305 ProjectSection(WebsiteProperties) = preProject 306 Debug.AspNetCompiler.Debug = "True" 307 Release.AspNetCompiler.Debug = "False" 308 EndProjectSection 309 EndProject 310 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}" 311 ProjectSection(WebsiteProperties) = preProject 312 Debug.AspNetCompiler.Debug = "True" 313 Release.AspNetCompiler.Debug = "False" 314 EndProjectSection 315 EndProject 316 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "..\..\..\..\..\..\source\NSCP-stable\helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}" 246 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{09A7A94B-264F-4C14-938D-C562971969FB}" 247 ProjectSection(WebsiteProperties) = preProject 248 Debug.AspNetCompiler.Debug = "True" 249 Release.AspNetCompiler.Debug = "False" 250 EndProjectSection 251 EndProject 252 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{9C4AC46F-D142-4B22-BE22-104ADC3C3731}" 253 ProjectSection(WebsiteProperties) = preProject 254 Debug.AspNetCompiler.Debug = "True" 255 Release.AspNetCompiler.Debug = "False" 256 EndProjectSection 257 EndProject 258 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "..\..\NSCP-stable\helpers\op5-installer\installer.wixproj", "{B6A2BD0C-9633-4DD4-A350-D98ACE660937}" 259 ProjectSection(WebsiteProperties) = preProject 260 Debug.AspNetCompiler.Debug = "True" 261 Release.AspNetCompiler.Debug = "False" 262 EndProjectSection 263 EndProject 264 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}" 317 265 ProjectSection(WebsiteProperties) = preProject 318 266 Debug.AspNetCompiler.Debug = "True" … … 1013 961 {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|x64.ActiveCfg = Release|x64 1014 962 {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|x64.Build.0 = Release|x64 1015 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Debug|x641016 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Itanium.ActiveCfg = Debug|x641017 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Debug|x641018 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Debug|x641019 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win321020 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win321021 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Debug|x641022 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Debug|x641023 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x641024 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|x641025 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x641026 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x641027 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win321028 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win321029 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x641030 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x641031 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Any CPU.ActiveCfg = Distribution|x641032 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Itanium.ActiveCfg = Distribution|x641033 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x641034 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.Build.0 = Distribution|x641035 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.ActiveCfg = Distribution|Win321036 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.Build.0 = Distribution|Win321037 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.ActiveCfg = Distribution|x641038 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.Build.0 = Distribution|x641039 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Any CPU.ActiveCfg = Nightly|x641040 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Itanium.ActiveCfg = Nightly|x641041 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x641042 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.Build.0 = Nightly|x641043 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.ActiveCfg = Nightly|Win321044 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.Build.0 = Nightly|Win321045 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.ActiveCfg = Nightly|x641046 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.Build.0 = Nightly|x641047 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Any CPU.ActiveCfg = OP5|x641048 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Itanium.ActiveCfg = OP5|x641049 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Mixed Platforms.ActiveCfg = OP5|x641050 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Mixed Platforms.Build.0 = OP5|x641051 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Win32.ActiveCfg = Nightly|Win321052 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Win32.Build.0 = Nightly|Win321053 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.ActiveCfg = Nightly|x641054 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.Build.0 = Nightly|x641055 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x641056 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Itanium.ActiveCfg = Release|x641057 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.ActiveCfg = Release|x641058 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.Build.0 = Release|x641059 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.ActiveCfg = Release|Win321060 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.Build.0 = Release|Win321061 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x641062 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x641063 963 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Any CPU.ActiveCfg = Debug|x64 1064 964 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Itanium.ActiveCfg = Debug|x64 … … 1606 1506 {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|x64.ActiveCfg = Release|x64 1607 1507 {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Release|x64.Build.0 = Release|x64 1508 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Any CPU.ActiveCfg = Debug 1509 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Any CPU.Build.0 = Debug 1510 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Itanium.ActiveCfg = Debug 1511 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Itanium.Build.0 = Debug 1512 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Mixed Platforms.ActiveCfg = Debug 1513 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Mixed Platforms.Build.0 = Debug 1514 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Win32.ActiveCfg = Debug 1515 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Win32.Build.0 = Debug 1516 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.ActiveCfg = Debug 1517 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.Build.0 = Debug 1518 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Any CPU.ActiveCfg = Debug 1519 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Any CPU.Build.0 = Debug 1520 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Itanium.ActiveCfg = Debug 1521 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Itanium.Build.0 = Debug 1522 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug 1523 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug 1524 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Win32.ActiveCfg = Debug 1525 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|Win32.Build.0 = Debug 1526 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|x64.ActiveCfg = Debug 1527 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug-MemCheck|x64.Build.0 = Debug 1528 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Any CPU.ActiveCfg = Debug 1529 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Any CPU.Build.0 = Debug 1530 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Itanium.ActiveCfg = Debug 1531 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Itanium.Build.0 = Debug 1532 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Mixed Platforms.ActiveCfg = Debug 1533 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Mixed Platforms.Build.0 = Debug 1534 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Win32.ActiveCfg = Debug 1535 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|Win32.Build.0 = Debug 1536 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|x64.ActiveCfg = Debug 1537 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Distribution|x64.Build.0 = Debug 1538 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Any CPU.ActiveCfg = Release 1539 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Any CPU.Build.0 = Release 1540 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Itanium.ActiveCfg = Release 1541 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Itanium.Build.0 = Release 1542 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Mixed Platforms.ActiveCfg = Release 1543 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Mixed Platforms.Build.0 = Release 1544 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Win32.ActiveCfg = Release 1545 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|Win32.Build.0 = Release 1546 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|x64.ActiveCfg = Release 1547 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Nightly|x64.Build.0 = Release 1548 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Any CPU.ActiveCfg = OP5 1549 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Any CPU.Build.0 = OP5 1550 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Itanium.ActiveCfg = OP5 1551 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Itanium.Build.0 = OP5 1552 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Mixed Platforms.ActiveCfg = OP5 1553 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Mixed Platforms.Build.0 = OP5 1554 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Win32.ActiveCfg = OP5 1555 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|Win32.Build.0 = OP5 1556 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|x64.ActiveCfg = OP5 1557 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.OP5|x64.Build.0 = OP5 1558 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Any CPU.ActiveCfg = Release 1559 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Any CPU.Build.0 = Release 1560 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Itanium.ActiveCfg = Release 1561 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Itanium.Build.0 = Release 1562 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Mixed Platforms.ActiveCfg = Release 1563 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Mixed Platforms.Build.0 = Release 1564 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Win32.ActiveCfg = Release 1565 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|Win32.Build.0 = Release 1566 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|x64.ActiveCfg = Release 1567 {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Release|x64.Build.0 = Release 1568 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Release|x64 1569 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Itanium.ActiveCfg = Release|x64 1570 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Release|x64 1571 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Release|x64 1572 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Release|Win32 1573 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Release|Win32 1574 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Release|x64 1575 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Release|x64 1576 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Any CPU.ActiveCfg = Release|x64 1577 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Itanium.ActiveCfg = Release|x64 1578 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Release|x64 1579 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.Build.0 = Release|x64 1580 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.ActiveCfg = Release|x64 1581 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.ActiveCfg = Release|x64 1582 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.Build.0 = Release|x64 1583 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Any CPU.ActiveCfg = Release|x64 1584 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Itanium.ActiveCfg = Release|x64 1585 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.ActiveCfg = Release|x64 1586 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.Build.0 = Release|x64 1587 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.ActiveCfg = Release|x64 1588 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.ActiveCfg = Release|x64 1589 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.Build.0 = Release|x64 1590 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Any CPU.ActiveCfg = Release|x64 1591 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Itanium.ActiveCfg = Release|x64 1592 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.ActiveCfg = Release|x64 1593 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.Build.0 = Release|x64 1594 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.ActiveCfg = Release|x64 1595 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.ActiveCfg = Release|x64 1596 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.Build.0 = Release|x64 1597 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Any CPU.ActiveCfg = Release|x64 1598 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Itanium.ActiveCfg = Release|x64 1599 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Mixed Platforms.ActiveCfg = Release|x64 1600 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Mixed Platforms.Build.0 = Release|x64 1601 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|Win32.ActiveCfg = Release|x64 1602 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.ActiveCfg = Release|x64 1603 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.OP5|x64.Build.0 = Release|x64 1604 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x64 1605 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Itanium.ActiveCfg = Release|x64 1606 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.ActiveCfg = Release|x64 1607 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.Build.0 = Release|x64 1608 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.ActiveCfg = Release|Win32 1609 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.Build.0 = Release|Win32 1610 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x64 1611 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x64 1608 1612 EndGlobalSection 1609 1613 GlobalSection(SolutionProperties) = preSolution … … 1622 1626 {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {9757464B-C125-4307-A84A-F4181AE6A081} 1623 1627 {26B84883-BE52-40E6-9BEE-55AD056D5751} = {9757464B-C125-4307-A84A-F4181AE6A081} 1624 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {9757464B-C125-4307-A84A-F4181AE6A081}1625 1628 {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {9757464B-C125-4307-A84A-F4181AE6A081} 1626 1629 {BBFF8362-C626-4838-B0A2-F695D638AD24} = {9757464B-C125-4307-A84A-F4181AE6A081} 1627 1630 {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {9757464B-C125-4307-A84A-F4181AE6A081} 1628 1631 {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {9757464B-C125-4307-A84A-F4181AE6A081} 1632 {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {9757464B-C125-4307-A84A-F4181AE6A081} 1629 1633 {0E2B21D9-F432-4127-8E92-7716B1072510} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2} 1630 1634 {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2} … … 1638 1642 {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3} 1639 1643 {10A0052D-542B-47AD-85C3-1A3DD45BF2ED} = {FC917E21-188A-44EE-9EF2-7C1274C2D719} 1640 {D367E76D-9485-4DCB-A9D0-3D3C0E190648} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}1641 {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}1642 {10A0052D-542B-47AD-85C3-1A3DD45BF2ED} = {FC917E21-188A-44EE-9EF2-7C1274C2D719}1643 EndGlobalSection1644 GlobalSection(SubversionScc) = preSolution1645 Svn-Managed = True1646 Manager = AnkhSVN - Subversion Support for Visual Studio1647 1644 EndGlobalSection 1648 1645 GlobalSection(DPCodeReviewSolutionGUID) = preSolution -
trunk/env.bat
r201 r202 5 5 rem # 6 6 rem SET jam=C:\src\tools\boost-jam-3.1.17\bin.ntx86\bjam.exe 7 remSET jam=D:\source\tools\bjam.exe8 set jam=C:\src\tools\nightly\boost-build\jam_src\bin.ntx86\bjam.exe7 SET jam=D:\source\tools\bjam.exe 8 rem set jam=C:\src\tools\nightly\boost-build\jam_src\bin.ntx86\bjam.exe 9 9 10 10 rem # … … 14 14 rem # 15 15 rem SET BOOST_BUILD_PATH=D:\tools\boost-build 16 SET BOOST_BUILD_PATH=C:\src\lib-src\boost_1_39_0\tools\build\v2 17 rem SET BOOST_BUILD_PATH=C:\src\tools\beta\boost-build 18 rem set BOOST_BUILD_PATH=D:\source\boost-build 19 rem set BOOST_BUILD_PATH=C:\src\tools\nightly\boost-build\ 20 16 rem SET BOOST_BUILD_PATH=C:\src\lib-src\boost_1_39_0\tools\build\v2 17 rem SET BOOST_BUILD_PATH=D:\source\boost-build 18 SET BOOST_BUILD_PATH=D:\source\boost-build-39 19 rem SET BOOST_BUILD_PATH=D:\source\boost-build-nightly 21 20 rem # 22 21 rem ######################## … … 24 23 rem # Set the path to your extra include directpy (openssl/boost/*) 25 24 rem # 26 SET TARGET_INC_DIR=C:\src\include27 rem setTARGET_INC_DIR=d:\source\include25 rem SET TARGET_INC_DIR=C:\src\include 26 SET TARGET_INC_DIR=d:\source\include 28 27 SET NSCP_INCLUDE=%TARGET_INC_DIR% 29 28 rem # … … 32 31 rem # Set the path to your extra library directory (openssl/boost/*) 33 32 rem # 34 SET TARGET_LIB_DIR=c:\src\lib35 remSET TARGET_LIB_DIR=D:\source\lib33 rem SET TARGET_LIB_DIR=c:\src\lib 34 SET TARGET_LIB_DIR=D:\source\lib 36 35 rem # 37 36 rem # Setup various relative paths (might need to tweak) … … 45 44 rem # Set the path to your Lua sources 46 45 rem # 47 rem set LUA_SOURCE=D:\source\NSCP-stable\lib-source\LUA\src\lua-5.1.2 48 set LUA_SOURCE=C:\src\lib-src\lua-5.1.4 46 rem SET LUA_SOURCE=D:\source\NSCP-stable\lib-source\LUA\src\lua-5.1.2 47 rem SET LUA_SOURCE=C:\src\lib-src\lua-5.1.4 48 SET LUA_SOURCE=D:\source\libs-c\lua-5.1.2 49 49 rem # 50 50 rem ######################## … … 52 52 rem # Set the path to your Platform SDK 53 53 rem # 54 remSET PLATTFORM_SDK=D:\Program\Microsoft Platform SDK for Windows Server 2003 R255 SET PLATTFORM_SDK=c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R254 SET PLATTFORM_SDK=D:\Program\Microsoft Platform SDK for Windows Server 2003 R2 55 rem SET PLATTFORM_SDK=c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2 56 56 rem # 57 57 rem # Setup various relative paths (might need to tweak) … … 67 67 rem # Set the path to your WiX installation 68 68 rem # 69 SET WIX_PATH=C:\Program Files\Windows Installer XML 69 rem SET WIX_PATH=C:\Program Files\Windows Installer XML 70 SET WIX_PATH=d:\Program\Windows Installer XML 70 71 rem # 71 72 rem ######################## … … 73 74 rem # Set the path to your Crypt++ sources 74 75 rem # 75 remSET CRYPTOPP_SOURCE=D:\source\libs-c\crypto++-5.6.076 SET CRYPTOPP_SOURCE="C:\src\lib-src\Crypto++5.6.0"76 SET CRYPTOPP_SOURCE=D:\source\libs-c\crypto++-5.6.0 77 rem SET CRYPTOPP_SOURCE="C:\src\lib-src\Crypto++5.6.0" 77 78 rem ######################## 78 79 rem # … … 80 81 rem # 81 82 82 SET TOOLS_DIR=c:\src\tools\;%ProgramFiles%\7-Zip\ 83 SET XAUTOBUILD=D:\source\tools\XAutobuild.exe 84 85 SET TOOLS_DIR=c:\src\tools\;%ProgramFiles%\7-Zip\;d:\source\tools\ 83 86 84 87 -
trunk/include/EnumNtSrv.cpp
r201 r202 199 199 delete [] buf; 200 200 sh = ::OpenService(scman,short_name.c_str(),SERVICE_QUERY_STATUS); 201 if (bufLen >= SC_BUF_LEN) {202 ::CloseServiceHandle(scman);203 throw NTServiceException(name, "Service name to long to handle", GetLastError());204 }205 buf[bufLen] = 0;206 */207 sh = ::OpenService(scman,buf,SERVICE_QUERY_STATUS);208 delete [] buf;209 201 if (sh == NULL) { 210 202 DWORD dwErr = GetLastError(); -
trunk/include/NSCHelper.cpp
r201 r202 160 160 lpNSAPIReleaseAllCommandNamessBuffer fNSAPIReleaseAllCommandNamessBuffer= NULL; 161 161 lpNSAPIRegisterCommand fNSAPIRegisterCommand= NULL; 162 lpNSAPISettingsAddPathMapping fNSAPISettingsAddPathMapping = NULL;163 lpNSAPISettingsAddKeyMapping fNSAPISettingsAddKeyMapping = NULL;164 162 lpNSAPISettingsRegKey fNSAPISettingsRegKey = NULL; 165 163 lpNSAPISettingsRegPath fNSAPISettingsRegPath = NULL; … … 437 435 } 438 436 439 void NSCModuleHelper::settings_add_mapping(std::wstring src_path, std::wstring src_key, std::wstring dst_path, std::wstring dst_key) {440 if (!fNSAPISettingsAddKeyMapping)441 throw NSCMHExcpetion(_T("NSCore has not been initiated..."));442 fNSAPISettingsAddKeyMapping(src_path.c_str(), src_key.c_str(), dst_path.c_str(), dst_key.c_str());443 }444 void NSCModuleHelper::settings_add_mapping(std::wstring src, std::wstring dst) {445 if (!fNSAPISettingsAddPathMapping)446 throw NSCMHExcpetion(_T("NSCore has not been initiated..."));447 fNSAPISettingsAddPathMapping(src.c_str(), dst.c_str());448 }449 450 437 void NSCModuleHelper::settings_register_key(std::wstring path, std::wstring key, NSCAPI::settings_type type, std::wstring title, std::wstring description, std::wstring defaultValue, bool advanced) { 451 438 if (!fNSAPISettingsRegKey) … … 751 738 NSCModuleHelper::fNSAPIRegisterCommand = (NSCModuleHelper::lpNSAPIRegisterCommand)f(_T("NSAPIRegisterCommand")); 752 739 753 NSCModuleHelper::fNSAPISettingsAddKeyMapping = (NSCModuleHelper::lpNSAPISettingsAddKeyMapping)f(_T("NSAPISettingsAddKeyMapping"));754 NSCModuleHelper::fNSAPISettingsAddPathMapping = (NSCModuleHelper::lpNSAPISettingsAddPathMapping)f(_T("NSAPISettingsAddPathMapping"));755 756 740 NSCModuleHelper::fNSAPISettingsRegKey = (NSCModuleHelper::lpNSAPISettingsRegKey)f(_T("NSAPISettingsRegKey")); 757 741 NSCModuleHelper::fNSAPISettingsRegPath = (NSCModuleHelper::lpNSAPISettingsRegPath)f(_T("NSAPISettingsRegPath")); -
trunk/include/NSCHelper.h
r201 r202 132 132 typedef NSCAPI::errorReturn (*lpNSAPIReleaseAllCommandNamessBuffer)(arrayBuffer::arrayBuffer*, unsigned int *); 133 133 typedef NSCAPI::errorReturn (*lpNSAPIRegisterCommand)(const TCHAR*,const TCHAR*); 134 typedef NSCAPI::errorReturn (*lpNSAPISettingsAddKeyMapping)(const TCHAR*, const TCHAR*, const TCHAR*, const TCHAR*);135 typedef NSCAPI::errorReturn (*lpNSAPISettingsAddPathMapping)(const TCHAR*, const TCHAR*);136 134 typedef NSCAPI::errorReturn (*lpNSAPISettingsRegKey)(const TCHAR*, const TCHAR*, int, const TCHAR*, const TCHAR*, const TCHAR*, int); 137 135 typedef NSCAPI::errorReturn (*lpNSAPISettingsRegPath)(const TCHAR*, const TCHAR*, const TCHAR*, int); … … 147 145 std::wstring getSettingsString(std::wstring section, std::wstring key, std::wstring defaultValue); 148 146 int getSettingsInt(std::wstring section, std::wstring key, int defaultValue); 149 void settings_add_mapping(std::wstring src_path, std::wstring src_key, std::wstring dst_path, std::wstring dst_key);150 void settings_add_mapping(std::wstring src, std::wstring dst);151 147 void settings_register_key(std::wstring path, std::wstring key, NSCAPI::settings_type type, std::wstring title, std::wstring description, std::wstring defaultValue, bool advanced); 152 148 void settings_register_path(std::wstring path, std::wstring title, std::wstring description, bool advanced); … … 446 442 #define SETTINGS_REG_PATH(key) \ 447 443 NSCModuleHelper::settings_register_path(settings::key ## _PATH, settings::key ## _TITLE, settings::key ## _DESC, settings::key ## _ADVANCED); 448 #define SETTINGS_MAP_KEY_A(name, section, key) \449 NSCModuleHelper::settings_add_mapping(settings::name ## _PATH, settings::name, section, key);450 #define SETTINGS_MAP_SECTION_A(name, section) \451 NSCModuleHelper::settings_add_mapping(settings::name ## _PATH, section); -
trunk/include/config.h
r201 r202 30 30 #define SZBETATAG _T(" ") 31 31 //#define SZBETATAG _T(" BETA ") 32 #define SZBETATAG _T(" BETA ")32 //#define SZBETATAG _T(" BETA ") 33 33 #define SZVERSION STRPRODUCTVER SZBETATAG STRPRODUCTDATE 34 34 //FILEVER[0] … … 183 183 DEFINE_SETTING_S(OBFUSCATED_PWD, NSCLIENT_SECTION, GENERIC_KEY_OBFUSCATED_PWD, ""); 184 184 DESCRIBE_SETTING(OBFUSCATED_PWD, "OBFUSCATED PASSWORD", "This is the same as the password option but here you can store the password in an obfuscated manner. *NOTICE* obfuscation is *NOT* the same as encryption, someone with access to this file can still figure out the password. Its just a bit harder to do it at first glance."); 185 186 DEFINE_SETTING_S(SYSTRAY_EXE, NSCLIENT_SECTION, "systray_exe", "nstray.exe"); 187 DESCRIBE_SETTING(SYSTRAY_EXE, "TODO", "TODO"); 185 188 } 186 189 … … 212 215 DESCRIBE_SETTING_ADVANCED(CACHE_ALLOWED, "ALLOWED HOSTS CACHING", "Used to cache looked up hosts if you check dynamic/changing hosts set this to false."); 213 216 214 DEFINE_SETTING_B( USE_SSL, NRPE_SECTION_PROTOCOL, GENERIC_KEY_USE_SSL, true);215 DESCRIBE_SETTING( USE_SSL, "USE SSL SOCKET", "This option controls if SSL should be used on the socket.");217 DEFINE_SETTING_B(KEYUSE_SSL, NRPE_SECTION_PROTOCOL, GENERIC_KEY_USE_SSL, true); 218 DESCRIBE_SETTING(KEYUSE_SSL, "USE SSL SOCKET", "This option controls if SSL should be used on the socket."); 216 219 217 220 DEFINE_SETTING_I(PAYLOAD_LENGTH, NRPE_SECTION_PROTOCOL, "payload length", 1024); … … 406 409 DEFINE_PATH(CMD_SECTION, NSCA_CMD_SECTION); 407 410 DESCRIBE_SETTING(CMD_SECTION, "NSCA COMMAND SECTION", "Commands to check and report to the NSCA server"); 411 412 DEFINE_SETTING_S(REPORT_MODE, NSCA_SERVER_SECTION, "report", "all"); 413 DESCRIBE_SETTING(REPORT_MODE, "REPORT MODE", "What to report to the server (any of the following: all, critical, warning, unknown, ok)"); 414 415 DEFINE_SETTING_S(TIME_DELTA_DEFAULT, NSCA_SECTION, "delay", "0"); 416 DESCRIBE_SETTING(TIME_DELTA_DEFAULT, "TODO", "TODO"); 417 418 DEFINE_SETTING_I(PAYLOAD_LENGTH, NSCA_SECTION, "payload length", 512); 419 DESCRIBE_SETTING_ADVANCED(PAYLOAD_LENGTH, "PAYLOAD LENGTH", "Length of payload to/from the NSCA agent. This is a hard specific value so you have to \"configure\" (read recompile) your NSCA server to use the same value for it to work."); 420 421 DEFINE_SETTING_I(READ_TIMEOUT, NSCA_SERVER_SECTION, GENERIC_KEY_SOCK_READ_TIMEOUT, 30); 422 DESCRIBE_SETTING(READ_TIMEOUT, "SOCKET TIMEOUT", "Timeout when reading packets on incoming sockets. If the data has not arrived withint this time we will bail out."); 423 408 424 } 409 425 -
trunk/include/file_helpers.hpp
r201 r202 5 5 public: 6 6 static bool is_directory(std::wstring path) { 7 DWORD dwAtt = ::GetFileAttributes(path.c_str()); 7 return is_directory(::GetFileAttributes(path.c_str())); 8 } 9 static bool is_directory(DWORD dwAtt) { 8 10 if (dwAtt == INVALID_FILE_ATTRIBUTES) { 9 11 return false; -
trunk/include/file_logger.hpp
r169 r202 6 6 #include <string> 7 7 8 namespace logging { 8 9 namespace simple_file { 9 10 10 11 #ifndef CSIDL_COMMON_APPDATA … … 13 14 #endif 14 15 typedef BOOL (WINAPI *fnSHGetSpecialFolderPath)(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate); 16 static BOOL WINAPI _SHGetSpecialFolderPath(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate) { 17 static fnSHGetSpecialFolderPath __SHGetSpecialFolderPath = NULL; 18 if (!__SHGetSpecialFolderPath) { 19 HMODULE hDLL = LoadLibrary(_T("shell32.dll")); 20 if (hDLL != NULL) { 21 __SHGetSpecialFolderPath = (fnSHGetSpecialFolderPath)GetProcAddress(hDLL,"SHGetSpecialFolderPathW"); 22 } 23 } 24 if(__SHGetSpecialFolderPath) 25 return __SHGetSpecialFolderPath(hwndOwner, lpszPath, nFolder, fCreate); 26 return FALSE; 27 } 15 28 16 __inline BOOL WINAPI _SHGetSpecialFolderPath(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate) {17 static fnSHGetSpecialFolderPath __SHGetSpecialFolderPath = NULL;18 if (!__SHGetSpecialFolderPath) {19 HMODULE hDLL = LoadLibrary(_T("shell32.dll"));20 if (hDLL != NULL)21 __SHGetSpecialFolderPath = (fnSHGetSpecialFolderPath)GetProcAddress(hDLL,"SHGetSpecialFolderPathW");22 }23 if(__SHGetSpecialFolderPath)24 return __SHGetSpecialFolderPath(hwndOwner, lpszPath, nFolder, fCreate);25 return FALSE;26 }27 29 28 class file_ logger {30 class file_appender { 29 31 std::wstring file_; 30 std::wstring datemask_;31 32 std::wstring path_; 32 33 std::wstring filename_; 33 34 public: 34 file_logger(std::wstring path, std::wstring filename) : path_(path), filename_(filename), datemask_(_T("%Y-%m-%d %H:%M:%S")) { 35 _tzset(); 35 file_appender(std::wstring path, std::wstring filename) : path_(path), filename_(filename) {} 36 file_appender() {} 37 38 void set_file(std::wstring path, std::wstring filename) { 39 path_ = path; 40 filename_ = filename; 36 41 } 37 42 … … 51 56 } 52 57 return file_; 58 } 59 private: 60 inline std::wstring getFolder() { 61 TCHAR buf[MAX_PATH+1]; 62 if (!_SHGetSpecialFolderPath(NULL, buf, CSIDL_LOCAL_APPDATA, FALSE)) { 63 return _T("") + error::lookup::last_error(); 64 } 65 return buf; 66 } 67 bool directoryExists(std::wstring path) { 68 DWORD dwAtt = ::GetFileAttributes(path.c_str()); 69 if (dwAtt == INVALID_FILE_ATTRIBUTES) { 70 return false; 71 } else if ((dwAtt&FILE_ATTRIBUTE_DIRECTORY)==FILE_ATTRIBUTE_DIRECTORY) { 72 return true; 73 } 74 return false; 75 } 76 77 HANDLE openAppendOrNew(std::wstring file) { 78 DWORD numberOfBytesWritten = 0; 79 HANDLE hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 80 if (hFile == INVALID_HANDLE_VALUE) { 81 hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); 82 if (hFile != INVALID_HANDLE_VALUE) { 83 WORD wBOM = 0xFEFF; 84 ::WriteFile(hFile, &wBOM, sizeof(WORD), &numberOfBytesWritten, NULL); 85 } else { 86 int x = 5; 87 } 88 } 89 return hFile; 90 } 91 public: 92 93 bool writeEntry(std::wstring line) { 94 DWORD numberOfBytesWritten; 95 HANDLE hFile = openAppendOrNew(getFileName()); 96 if (hFile == INVALID_HANDLE_VALUE) { 97 return false; 98 } 99 if (::SetFilePointer(hFile, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) { 100 // Ingore this error! 101 } 102 ::WriteFile(hFile, line.c_str(), (static_cast<DWORD>(line.length()))*(sizeof(TCHAR)), &numberOfBytesWritten, NULL); 103 ::CloseHandle(hFile); 104 return true; 105 } 106 }; 107 } 108 109 namespace logging { 110 class file_logger : public simple_file::file_appender { 111 std::wstring datemask_; 112 public: 113 file_logger(std::wstring path, std::wstring filename) : file_appender(path, filename), datemask_(_T("%Y-%m-%d %H:%M:%S")) { 114 _tzset(); 53 115 } 54 116 void log(const std::wstring category, const wchar_t* file, const int line, const wchar_t* message) { … … 71 133 } 72 134 } 73 private:74 75 inline std::wstring getFolder() {76 TCHAR buf[MAX_PATH+1];77 if (!_SHGetSpecialFolderPath(NULL, buf, CSIDL_LOCAL_APPDATA, FALSE)) {78 return _T("") + error::lookup::last_error();79 }80 return buf;81 }82 83 bool directoryExists(std::wstring path) {84 DWORD dwAtt = ::GetFileAttributes(path.c_str());85 if (dwAtt == INVALID_FILE_ATTRIBUTES) {86 return false;87 } else if ((dwAtt&FILE_ATTRIBUTE_DIRECTORY)==FILE_ATTRIBUTE_DIRECTORY) {88 return true;89 }90 return false;91 }92 93 HANDLE openAppendOrNew(std::wstring file) {94 DWORD numberOfBytesWritten = 0;95 HANDLE hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);96 if (hFile == INVALID_HANDLE_VALUE) {97 hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);98 if (hFile != INVALID_HANDLE_VALUE) {99 WORD wBOM = 0xFEFF;100 ::WriteFile(hFile, &wBOM, sizeof(WORD), &numberOfBytesWritten, NULL);101 } else {102 int x = 5;103 }104 }105 return hFile;106 }107 108 bool writeEntry(std::wstring line) {109 DWORD numberOfBytesWritten;110 HANDLE hFile = openAppendOrNew(getFileName());111 if (hFile == INVALID_HANDLE_VALUE) {112 return false;113 }114 if (::SetFilePointer(hFile, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {115 // Ingore this error!116 }117 ::WriteFile(hFile, line.c_str(), (static_cast<DWORD>(line.length()))*(sizeof(TCHAR)), &numberOfBytesWritten, NULL);118 ::CloseHandle(hFile);119 return true;120 }121 122 123 135 }; 124 136 } -
trunk/include/settings/Settings.h
r201 r202 168 168 /// 169 169 /// @author mickem 170 virtual std::wstring map_path(std::wstring path) = 0;170 //virtual std::wstring map_path(std::wstring path) = 0; 171 171 172 172 ////////////////////////////////////////////////////////////////////////// … … 177 177 /// 178 178 /// @author mickem 179 virtual key_path_type map_key(key_path_type key) = 0;179 //virtual key_path_type map_key(key_path_type key) = 0; 180 180 181 181 ////////////////////////////////////////////////////////////////////////// … … 186 186 /// 187 187 /// @author mickem 188 virtual mapped_key_list_type find_maped_keys(std::wstring path) = 0;188 //virtual mapped_key_list_type find_maped_keys(std::wstring path) = 0; 189 189 190 190 ////////////////////////////////////////////////////////////////////////// … … 195 195 /// 196 196 /// @author mickem 197 virtual string_list get_mapped_sections(std::wstring path) = 0;197 //virtual string_list get_mapped_sections(std::wstring path) = 0; 198 198 199 199 ////////////////////////////////////////////////////////////////////////// … … 204 204 /// 205 205 /// @author mickem 206 virtual std::wstring reverse_map_path(std::wstring path) = 0;206 //virtual std::wstring reverse_map_path(std::wstring path) = 0; 207 207 208 208 ////////////////////////////////////////////////////////////////////////// … … 213 213 /// 214 214 /// @author mickem 215 virtual key_path_type reverse_map_key(key_path_type key) = 0;215 //virtual key_path_type reverse_map_key(key_path_type key) = 0; 216 216 217 217 ////////////////////////////////////////////////////////////////////////// … … 225 225 /// 226 226 /// @author mickem 227 virtual void add_mapping(std::wstring source_path, std::wstring source_key, std::wstring destination_path, std::wstring destination_key) = 0;227 //virtual void add_mapping(std::wstring source_path, std::wstring source_key, std::wstring destination_path, std::wstring destination_key) = 0; 228 228 229 229 ////////////////////////////////////////////////////////////////////////// … … 235 235 /// 236 236 ///@author mickem 237 virtual void add_mapping(std::wstring source_path, std::wstring destination_path) = 0;237 //virtual void add_mapping(std::wstring source_path, std::wstring destination_path) = 0; 238 238 239 239 ////////////////////////////////////////////////////////////////////////// … … 609 609 }; 610 610 611 class settings_core 612 { 613 private: 614 typedef struct { 615 typedef enum { sType, iType} typeEnum; 616 typeEnum type; 617 std::wstring sVal; 618 int iVal; 619 } valueStruct; 620 typedef std::map<std::wstring,valueStruct> saveKeyList; 621 typedef std::map<std::wstring,saveKeyList> saveSectionList; 622 saveSectionList data_; 623 std::wstring file_; 624 std::wstring basepath_; 625 bool bHasInternalData; 626 settings_base *settingsManager; 627 628 public: 629 typedef std::list<std::wstring> sectionList; 630 settings_core(void) : bHasInternalData(false), settingsManager(NULL) 631 { 632 } 633 634 virtual ~settings_core(void) 635 { 636 if (settingsManager) 637 delete settingsManager; 638 } 639 std::wstring getActiveType() { 640 if (!settingsManager) 641 return _T(""); 642 return settingsManager->getActiveType(); 643 } 611 class SettingsHandlerImpl : public SettingsCore { 612 private: 613 typedef std::map<SettingsCore::settings_type,SettingsInterface*> instance_list; 614 SettingsInterface* instance_; 615 instance_list instances_; 616 MutexHandler mutexHandler_; 617 /* 618 struct key_description : public SettingsCore::key_description { 619 std::wstring title; 620 std::wstring description; 621 SettingsCore::key_type type; 622 std::wstring defValue; 623 bool advanced; 624 key_description(std::wstring title_, std::wstring description_, SettingsCore::key_type type_, std::wstring defValue_, bool advanced_) 625 : title(title_), description(description_), type(type_), defValue(defValue_), advanced(advanced_) {} 626 key_description() : advanced(false), type(SettingsCore::key_string) {} 627 }; 628 */ 629 struct path_description { 630 std::wstring title; 631 std::wstring description; 632 bool advanced; 633 typedef std::map<std::wstring,key_description> keys_type; 634 keys_type keys; 635 path_description(std::wstring title_, std::wstring description_, bool advanced_) : title(title_), description(description_), advanced(advanced_) {} 636 path_description() : advanced(false) {} 637 void update(std::wstring title_, std::wstring description_, bool advanced_) { 638 title = title_; 639 description = description_; 640 advanced = advanced_; 641 } 642 }; 643 class dummy_logger : public LoggerInterface { 644 void err(std::wstring file, int line, std::wstring message) {} 645 void warn(std::wstring file, int line, std::wstring message) {} 646 void info(std::wstring file, int line, std::wstring message) {} 647 void debug(std::wstring file, int line, std::wstring message) {} 648 }; 649 typedef std::map<std::wstring, std::wstring> path_map; 650 //path_map path_mappings_; 651 //path_map reversed_path_mappings_; 652 std::wstring base_path_; 653 LoggerInterface *logger_; 654 typedef std::map<std::wstring,path_description> reg_paths_type; 655 reg_paths_type registred_paths_; 656 typedef std::map<key_path_type,key_path_type> mapped_paths_type; 657 //mapped_paths_type mapped_paths_; 658 //mapped_paths_type reversed_mapped_paths_; 659 typedef SettingsInterface::string_list string_list; 660 public: 661 SettingsHandlerImpl() : instance_(NULL), logger_(new dummy_logger()) {} 662 ~SettingsHandlerImpl() { 663 destroy_all_instances(); 664 set_logger(NULL); 665 } 666 667 ////////////////////////////////////////////////////////////////////////// 668 /// Set the basepath for the settings subsystem. 669 /// In other words set where the settings files reside 670 /// 671 /// @param path the path to the settings files 672 /// 673 /// @author mickem 674 void set_base(std::wstring path) { 675 base_path_ = path; 676 } 677 678 ////////////////////////////////////////////////////////////////////////// 679 /// Set the logging interface (will receive log messages) 680 /// 681 /// @param logger the new logger to use 682 /// 683 /// @author mickem 684 void set_logger(LoggerInterface *logger) { 685 LoggerInterface *old_logger = logger_; 686 logger_ = logger; 687 delete old_logger; 688 } 644 689 645 690 ////////////////////////////////////////////////////////////////////////// … … 667 712 668 713 669 #define UNLIKELY_VALUE_1 -1234 670 #define UNLIKELY_VALUE_2 -4321 671 void read(int type = -1) { 672 bool bNew = false; 673 settings_base *sM = settingsManager; 674 if (settingsManager == NULL) 675 throw SettingsException(_T("No settings method specified, cannot start")); 676 if ((type != -1)&&(type != settingsManager->getActiveTypeID())) { 677 if (type == REGSettings::getType()) { 678 sM = new REGSettings(); 679 bNew = true; 680 } else if (type == INISettings::getType()) { 681 sM = new INISettings(basepath_, file_); 682 bNew = true; 714 SettingsInterface* get() { 715 MutexLock mutex(mutexHandler_); 716 if (!mutex.hasMutex()) 717 throw SettingsException(_T("Failed to get mutext, cant get settings instance")); 718 if (instance_ == NULL) 719 instance_ = get_default_settings_instance_unsafe(); 720 if (instance_ == NULL) 721 throw SettingsException(_T("Failed initialize settings instance")); 722 return instance_; 723 } 724 SettingsInterface* get(SettingsCore::settings_type type) { 725 MutexLock mutex(mutexHandler_); 726 if (!mutex.hasMutex()) 727 throw SettingsException(_T("Failed to get mutext, cant get settings instance")); 728 return instance_unsafe(type); 729 } 730 ////////////////////////////////////////////////////////////////////////// 731 /// Overwrite the (current) settings store with default values. 732 /// 733 /// @author mickem 734 void update_defaults() { 735 get_logger()->warn(__FILEW__, __LINE__, _T("Updating settings with default values!")); 736 string_list s = get_reg_sections(); 737 for (string_list::const_iterator cit = s.begin(); cit != s.end(); ++cit) { 738 string_list k = get_reg_keys(*cit); 739 for (string_list::const_iterator citk = k.begin(); citk != k.end(); ++citk) { 740 SettingsCore::key_description desc = get_registred_key(*cit, *citk); 741 if (!desc.advanced) { 742 if (!get()->has_key(*cit, *citk)) { 743 get_logger()->debug(__FILEW__, __LINE__, _T("Adding: ") + *cit + _T(".") + *citk); 744 if (desc.type == key_string) 745 get()->set_string(*cit, *citk, desc.defValue); 746 else if (desc.type == key_bool) 747 get()->set_bool(*cit, *citk, desc.defValue==_T("true")); 748 else if (desc.type == key_integer) 749 get()->set_int(*cit, *citk, strEx::stoi(desc.defValue)); 750 else 751 throw SettingsException(_T("Unknown keytype for: ") + *cit + _T(".") + *citk); 752 } else { 753 get_logger()->debug(__FILEW__, __LINE__, _T("ŽSkipping (already exists): ") + *cit + _T(".") + *citk); 754 } 755 } else { 756 get_logger()->debug(__FILEW__, __LINE__, _T("ŽSkipping (advanced): ") + *cit + _T(".") + *citk); 757 } 758 } 759 } 760 get_logger()->info(__FILEW__, __LINE__, _T("DONE Updating settings with default values!")); 761 } 762 void migrate_type(SettingsCore::settings_type from, SettingsCore::settings_type to) { 763 #ifdef _DEBUG 764 get_logger()->debug(__FILEW__, __LINE__, _T("Preparing to migrate...")); 765 #endif 766 { 767 if (!has_type(from)) { 768 #ifdef _DEBUG 769 get_logger()->debug(__FILEW__, __LINE__, _T("Migration needs source...")); 770 #endif 771 add_type_impl(from, create_instance(from, type_to_string(from))); 772 } 773 if (!has_type(to)) { 774 #ifdef _DEBUG 775 get_logger()->debug(__FILEW__, __LINE__, _T("Migration needs target...")); 776 #endif 777 add_type_impl(to, create_instance(to, type_to_string(to))); 778 } 779 } 780 { 781 #ifdef _DEBUG 782 get_logger()->debug(__FILEW__, __LINE__, _T("Starting to migrate...")); 783 #endif 784 MutexLock mutex(mutexHandler_); 785 if (!mutex.hasMutex()) 786 throw SettingsException(_T("migrate_type: Failed to get mutext, cant get settings instance")); 787 SettingsInterface* iFrom = instance_unsafe(from); 788 SettingsInterface* iTo = instance_unsafe(to); 789 if (iTo == NULL||iFrom == NULL) 790 throw new SettingsException(_T("Failed to migrate")); 791 iFrom->save_to(iTo); 792 #ifdef _DEBUG 793 get_logger()->debug(__FILEW__, __LINE__, _T("Done migrating...")); 794 #endif 795 } 796 } 797 void migrate_to(SettingsCore::settings_type to) { 798 migrate_type(get_settings_type(), to); 799 } 800 void migrate_from(SettingsCore::settings_type from) { 801 migrate_type(from, get_settings_type()); 802 } 803 SettingsCore::settings_type get_settings_type() { 804 MutexLock mutex(mutexHandler_); 805 if (!mutex.hasMutex()) 806 throw SettingsException(_T("Failed to get mutext, cant get load settings")); 807 if (instance_ == NULL) 808 throw SettingsException(_T("No settings subsystem selected")); 809 return instance_->get_type(); 810 } 811 std::wstring get_settings_type_desc() { 812 return get_type_desc(get_settings_type()); 813 } 814 std::wstring get_type_desc(SettingsCore::settings_type type) { 815 if (type == SettingsCore::ini_file) 816 return _T(".INI file (nsc.ini)"); 817 if (type == SettingsCore::registry) 818 return _T("registry"); 819 if (type == SettingsCore::xml_file) 820 return _T(".XML file (nsc.xml)"); 821 return _T("Unknown settings type"); 822 } 823 bool has_type(SettingsCore::settings_type type) { 824 MutexLock mutex(mutexHandler_); 825 if (!mutex.hasMutex()) 826 throw SettingsException(_T("has_type Failed to get mutext, cant get access settings")); 827 instance_list::const_iterator cit = instances_.find(type); 828 return cit != instances_.end(); 829 } 830 void set_type(SettingsCore::settings_type type) { 831 MutexLock mutex(mutexHandler_); 832 if (!mutex.hasMutex()) 833 throw SettingsException(_T("set_type Failed to get mutext, cant get access settings")); 834 instance_list::const_iterator cit = instances_.find(type); 835 if (cit == instances_.end()) 836 throw SettingsException(_T("Settings was not supported: ") + get_type_desc(type)); 837 instance_ = (*cit).second; 838 } 839 void add_type_impl(SettingsCore::settings_type type, SettingsInterface* impl) { 840 MutexLock mutex(mutexHandler_); 841 if (!mutex.hasMutex()) 842 throw SettingsException(_T("add_type_impl Failed to get mutext, cant get access settings")); 843 instance_list::iterator it = instances_.find(type); 844 if (it == instances_.end()) { 845 instances_[type] = impl; 683 846 } else { 684 847 SettingsInterface* old = (*it).second; … … 696 859 /// 697 860 /// @author mickem 861 /* 698 862 std::wstring map_path(std::wstring path) { 699 863 MutexLock mutex(mutexHandler_); … … 705 869 return (*cit).second; 706 870 } 871 */ 707 872 708 873 ////////////////////////////////////////////////////////////////////////// … … 714 879 /// 715 880 /// @author mickem 881 /* 716 882 key_path_type map_key(key_path_type key) { 717 883 MutexLock mutex(mutexHandler_); … … 724 890 return key; 725 891 } 892 */ 726 893 ////////////////////////////////////////////////////////////////////////// 727 894 /// Find all mapped keys given a path … … 731 898 /// 732 899 /// @author mickem 900 /* 733 901 mapped_key_list_type find_maped_keys(std::wstring path) { 734 902 mapped_key_list_type ret; … … 743 911 return ret; 744 912 } 913 */ 745 914 746 915 ////////////////////////////////////////////////////////////////////////// … … 751 920 /// 752 921 /// @author mickem 922 /* 753 923 virtual std::wstring reverse_map_path(std::wstring path) { 754 924 MutexLock mutex(mutexHandler_); … … 780 950 } 781 951 } 952 782 953 783 954 ////////////////////////////////////////////////////////////////////////// … … 875 1046 reversed_path_mappings_.erase(cit); 876 1047 } 1048 */ 877 1049 878 1050 … … 898 1070 } 899 1071 } 900 } 901 void writeSection(std::wstring section, sectionList data) { 902 if (settingsManager == NULL) 903 throw SettingsException(_T("No settings method specified, cannot start")); 904 if (settingsManager->getActiveTypeID() == INISettings::getType()) 905 settingsManager->setSection(section, data); 906 else 907 throw SettingsException(_T("Writing modules to non-INI file is not supported")); 908 } 909 void write(int type = -1) { 910 bool bNew = false; 911 settings_base *sM = settingsManager; 912 if (settingsManager == NULL) 913 throw SettingsException(_T("No settings method specified, cannot start")); 914 if ((type != -1)&&(type != settingsManager->getActiveTypeID())) { 915 if (type == REGSettings::getType()) { 916 sM = new REGSettings(); 917 bNew = true; 918 } else if (type == INISettings::getType()) { 919 sM = new INISettings(basepath_, file_); 920 bNew = true; 1072 1073 ////////////////////////////////////////////////////////////////////////// 1074 /// Register a key with the settings module. 1075 /// A registered key or path will be nicely documented in some of the settings files when converted. 1076 /// 1077 /// @param path The path to register 1078 /// @param key The key to register 1079 /// @param title The title to use 1080 /// @param description the description to use 1081 /// @param defValue the default value 1082 /// @param advanced advanced options will only be included if they are changed 1083 /// 1084 /// @author mickem 1085 void register_key(std::wstring path, std::wstring key, SettingsCore::key_type type, std::wstring title, std::wstring description, std::wstring defValue, bool advanced = false) { 1086 reg_paths_type::iterator it = registred_paths_.find(path); 1087 if (it == registred_paths_.end()) { 1088 registred_paths_[path] = path_description(); 1089 registred_paths_[path].keys[key] = key_description(title, description, type, defValue, advanced); 921 1090 } else { 922 1091 (*it).second.keys[key] = key_description(title, description, type, defValue, advanced); … … 1610 1779 typedef Settings::SettingsException SettingsException; 1611 1780 1612 typedef Singleton<settings_core> Settings; // Implement the settings manager as a singleton -
trunk/include/settings/settings_ini.hpp
r138 r202 3 3 #include <string> 4 4 #include <map> 5 #include < Settings.h>5 #include <settings/Settings.h> 6 6 #include <simpleini/SimpleIni.h> 7 7 -
trunk/include/settings/settings_old.hpp
r138 r202 3 3 #include <string> 4 4 #include <map> 5 #include < Settings.h>5 #include <settings/Settings.h> 6 6 #include <simpleini/SimpleIni.h> 7 8 #define MAIN_MODULES_SECTION_OLD _T("modules") 9 #define MAIN_SECTION_TITLE _T("Settings") 10 #define MAIN_STRING_LENGTH _T("string_length") 7 11 8 12 namespace Settings { … … 10 14 std::wstring filename_; 11 15 public: 12 OLDSettings(Settings::SettingsCore *core, std::wstring context) :Settings::SettingsInterfaceImpl(core, context) {} 16 OLDSettings(Settings::SettingsCore *core, std::wstring context) :Settings::SettingsInterfaceImpl(core, context) { 17 add_mapping(MAIN_MODULES_SECTION, MAIN_MODULES_SECTION_OLD); 18 add_mapping(settings::settings_def::PAYLOAD_LEN_PATH, settings::settings_def::PAYLOAD_LEN, MAIN_SECTION_TITLE, MAIN_STRING_LENGTH); 19 20 #define SETTINGS_MAP_KEY_A(name, section, key) \ 21 add_mapping(settings::name ## _PATH, settings::name, section, key); 22 #define SETTINGS_MAP_SECTION_A(name, section) \ 23 add_mapping(settings::name ## _PATH, section); 24 25 26 #define EXTSCRIPT_SECTION_TITLE _T("External Script") 27 #define EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS _T("allow_arguments") 28 #define EXTSCRIPT_SETTINGS_ALLOW_NASTY_META _T("allow_nasty_meta_chars") 29 #define EXTSCRIPT_SETTINGS_TIMEOUT _T("command_timeout") 30 #define EXTSCRIPT_SETTINGS_SCRIPTDIR _T("script_dir") 31 #define EXTSCRIPT_SCRIPT_SECTION_TITLE _T("External Scripts") 32 #define EXTSCRIPT_ALIAS_SECTION_TITLE _T("External Alias") 33 34 SETTINGS_MAP_KEY_A(external_scripts::TIMEOUT, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT); 35 SETTINGS_MAP_KEY_A(external_scripts::SCRIPT_PATH, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR); 36 SETTINGS_MAP_KEY_A(external_scripts::ALLOW_ARGS, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS); 37 SETTINGS_MAP_KEY_A(external_scripts::ALLOW_NASTY, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_ALLOW_NASTY_META); 38 39 SETTINGS_MAP_SECTION_A(external_scripts::SCRIPT_SECTION,EXTSCRIPT_SCRIPT_SECTION_TITLE); 40 SETTINGS_MAP_SECTION_A(external_scripts::ALIAS_SECTION,EXTSCRIPT_ALIAS_SECTION_TITLE); 41 42 #define LOG_SECTION_TITLE _T("log") 43 #define LOG_FILENAME _T("file") 44 #define LOG_DATEMASK _T("date_mask") 45 NSC_DEBUG_MSG(_T("Using compatibility mode in: LOGGING module")); 46 47 SETTINGS_MAP_KEY_A(log::FILENAME, LOG_SECTION_TITLE, LOG_FILENAME); 48 SETTINGS_MAP_KEY_A(log::DATEMASK, LOG_SECTION_TITLE, LOG_DATEMASK); 49 SETTINGS_MAP_KEY_A(log::DEBUG_LOG, LOG_SECTION_TITLE, _T("debug")); 50 51 #define EVENTLOG_SECTION_TITLE _T("Eventlog") 52 #define EVENTLOG_DEBUG _T("debug") 53 #define EVENTLOG_SYNTAX _T("syntax") 54 SETTINGS_MAP_KEY_A(event_log::DEBUG_KEY, EVENTLOG_SECTION_TITLE, EVENTLOG_DEBUG); 55 SETTINGS_MAP_KEY_A(event_log::SYNTAX, EVENTLOG_SECTION_TITLE, EVENTLOG_SYNTAX); 56 57 58 #define LUA_SCRIPT_SECTION_TITLE _T("LUA Scripts") 59 SETTINGS_MAP_SECTION_A(lua::SECTION, LUA_SCRIPT_SECTION_TITLE); 60 61 #define NRPE_SECTION_TITLE _T("NRPE") 62 #define NRPE_SETTINGS_READ_TIMEOUT _T("socket_timeout") 63 #define NRPE_SETTINGS_PORT _T("port") 64 #define NRPE_SETTINGS_BINDADDR _T("bind_to_address") 65 #define NRPE_SETTINGS_LISTENQUE _T("socket_back_log") 66 #define NRPE_SETTINGS_USE_SSL _T("use_ssl") 67 #define NRPE_SETTINGS_STRLEN _T("string_length") 68 #define NRPE_SETTINGS_PERFDATA _T("performance_data") 69 #define NRPE_HANDLER_SECTION_TITLE _T("NRPE Handlers") 70 #define NRPE_SETTINGS_SCRIPTDIR _T("script_dir") 71 #define NRPE_SETTINGS_TIMEOUT _T("command_timeout") 72 #define NRPE_SETTINGS_ALLOW_ARGUMENTS _T("allow_arguments") 73 #define NRPE_SETTINGS_ALLOW_NASTY_META _T("allow_nasty_meta_chars") 74 75 SETTINGS_MAP_KEY_A(nrpe::PORT, NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT); 76 SETTINGS_MAP_KEY_A(nrpe::BINDADDR, NRPE_SECTION_TITLE, NRPE_SETTINGS_BINDADDR); 77 SETTINGS_MAP_KEY_A(nrpe::LISTENQUE, NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE); 78 SETTINGS_MAP_KEY_A(nrpe::READ_TIMEOUT, NRPE_SECTION_TITLE, NRPE_SETTINGS_READ_TIMEOUT); 79 SETTINGS_MAP_KEY_A(nrpe::KEYUSE_SSL, NRPE_SECTION_TITLE, NRPE_SETTINGS_USE_SSL); 80 SETTINGS_MAP_KEY_A(nrpe::PAYLOAD_LENGTH,NRPE_SECTION_TITLE, NRPE_SETTINGS_STRLEN); 81 SETTINGS_MAP_KEY_A(nrpe::ALLOW_PERFDATA,NRPE_SECTION_TITLE, NRPE_SETTINGS_PERFDATA); 82 SETTINGS_MAP_KEY_A(nrpe::SCRIPT_PATH, NRPE_SECTION_TITLE, NRPE_SETTINGS_SCRIPTDIR); 83 SETTINGS_MAP_KEY_A(nrpe::CMD_TIMEOUT, NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT); 84 SETTINGS_MAP_KEY_A(nrpe::ALLOW_ARGS, NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS); 85 SETTINGS_MAP_KEY_A(nrpe::ALLOW_NASTY, NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META); 86 87 SETTINGS_MAP_SECTION_A(nrpe::SECTION_HANDLERS,NRPE_HANDLER_SECTION_TITLE); 88 89 90 #define NSCA_AGENT_SECTION_TITLE _T("NSCA Agent") 91 #define NSCA_CMD_SECTION_TITLE _T("NSCA Commands") 92 93 #define NSCA_INTERVAL _T("interval") 94 #define NSCA_HOSTNAME _T("hostname") 95 #define NSCA_SERVER _T("nsca_host") 96 #define NSCA_PORT _T("nsca_port") 97 #define NSCA_ENCRYPTION _T("encryption_method") 98 #define NSCA_PASSWORD _T("password") 99 #define NSCA_DEBUG_THREADS _T("debug_threads") 100 #define NSCA_CACHE_HOST _T("cache_hostname") 101 102 SETTINGS_MAP_KEY_A(nsca::INTERVAL, NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL); 103 SETTINGS_MAP_KEY_A(nsca::HOSTNAME, NSCA_AGENT_SECTION_TITLE, NSCA_HOSTNAME); 104 SETTINGS_MAP_KEY_A(nsca::SERVER_HOST, NSCA_AGENT_SECTION_TITLE, NSCA_SERVER); 105 SETTINGS_MAP_KEY_A(nsca::SERVER_PORT, NSCA_AGENT_SECTION_TITLE, NSCA_PORT); 106 SETTINGS_MAP_KEY_A(nsca::ENCRYPTION, NSCA_AGENT_SECTION_TITLE, NSCA_ENCRYPTION); 107 SETTINGS_MAP_KEY_A(nsca::PASSWORD, NSCA_AGENT_SECTION_TITLE, NSCA_PASSWORD); 108 SETTINGS_MAP_KEY_A(nsca::THREADS, NSCA_AGENT_SECTION_TITLE, NSCA_DEBUG_THREADS); 109 SETTINGS_MAP_KEY_A(nsca::CACHE_HOST, NSCA_AGENT_SECTION_TITLE, NSCA_CACHE_HOST); 110 111 SETTINGS_MAP_SECTION_A(nsca::CMD_SECTION, NSCA_CMD_SECTION_TITLE); 112 113 #define NSCLIENT_SECTION_TITLE _T("NSClient") 114 #define NSCLIENT_SETTINGS_PORT _T("port") 115 #define NSCLIENT_SETTINGS_VERSION _T("version") 116 #define NSCLIENT_SETTINGS_BINDADDR _T("bind_to_address") 117 #define NSCLIENT_SETTINGS_LISTENQUE _T("socket_back_log") 118 #define NSCLIENT_SETTINGS_READ_TIMEOUT _T("socket_timeout") 119 120 SETTINGS_MAP_KEY_A(nsclient::PORT, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT); 121 SETTINGS_MAP_KEY_A(nsclient::VERSION, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_VERSION); 122 SETTINGS_MAP_KEY_A(nsclient::BINDADDR, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR); 123 SETTINGS_MAP_KEY_A(nsclient::LISTENQUE, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_LISTENQUE); 124 SETTINGS_MAP_KEY_A(nsclient::READ_TIMEOUT, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_READ_TIMEOUT); 125 126 } 127 typedef std::map<std::wstring,std::wstring> path_map; 128 typedef std::map<SettingsCore::key_path_type,SettingsCore::key_path_type> key_map; 129 path_map sections_; 130 key_map keys_; 131 void add_mapping(std::wstring path_new, std::wstring path_old) { 132 sections_[path_new] = path_old; 133 } 134 void add_mapping(std::wstring path_new, std::wstring key_new, std::wstring path_old, std::wstring key_old) { 135 SettingsCore::key_path_type new_key(path_new, key_new); 136 SettingsCore::key_path_type old_key(path_old, key_old); 137 keys_[new_key] = old_key; 138 } 139 std::wstring map_path(std::wstring path_new) { 140 path_map::iterator it = sections_.find(path_new); 141 if (it == sections_.end()) 142 return path_new; 143 return (*it).second; 144 } 145 SettingsCore::key_path_type map_key(SettingsCore::key_path_type new_key) { 146 key_map::iterator it = keys_.find(new_key); 147 if (it == keys_.end()) 148 return new_key; 149 return (*it).second; 150 } 13 151 ////////////////////////////////////////////////////////////////////////// 14 152 /// Create a new settings interface of "this kind" … … 30 168 /// @author mickem 31 169 virtual std::wstring get_real_string(SettingsCore::key_path_type key) { 32 key = get_core()->map_key(key);170 key = map_key(key); 33 171 get_core()->get_logger()->quick_debug(key.first + _T("//") + key.second); 34 172 return internal_get_value(key.first, key.second.c_str()); … … 97 235 if (buffer == NULL) 98 236 throw SettingsException(_T("has_key_int:: Failed to allocate memory for buffer!")); 99 std::wstring mapped = get_core()->map_path(path);237 std::wstring mapped = map_path(path); 100 238 unsigned int count = ::GetPrivateProfileSection(mapped.c_str(), buffer, BUFF_LEN, get_file_name().c_str()); 101 239 if (count == bufferLength-2) { … … 146 284 virtual void set_real_value(SettingsCore::key_path_type key, conainer value) { 147 285 try { 148 key = get_core()->map_key(key);286 key = map_key(key); 149 287 get_core()->get_logger()->quick_debug(key.first + _T("//") + key.second + _T("//") + value.get_string()); 150 288 WritePrivateProfileString(key.first.c_str(), key.second.c_str(), value.get_string().c_str(), get_file_name().c_str()); … … 166 304 virtual void get_real_sections(std::wstring path, string_list &list) { 167 305 get_core()->get_logger()->debug(__FILEW__, __LINE__, std::wstring(_T("Get sections for: ")) + path); 168 string_list lst = get_core()->get_mapped_sections(path);169 list.insert(list.end(), lst.begin(), lst.end());306 //string_list lst = get_mapped_sections(path); 307 //list.insert(list.end(), lst.begin(), lst.end()); 170 308 /* 171 309 string_list src = int_read_sections(); … … 254 392 /// @author mickem 255 393 virtual void get_real_keys(std::wstring path, string_list &list) { 394 /* 256 395 std::wstring mapped_path = get_core()->reverse_map_path(path); 257 396 int_read_section(path, list); … … 261 400 list.push_back((*cit).src.second); 262 401 } 402 */ 263 403 } 264 404 virtual SettingsCore::key_type get_key_type(std::wstring path, std::wstring key) { … … 274 414 } 275 415 void int_read_section(std::wstring section, string_list &list, unsigned int bufferLength = BUFF_LEN) { 276 std::wstring mapped = get_core()->map_path(section); 416 // @TODO this is not correct! 417 std::wstring mapped = map_path(section); 277 418 TCHAR* buffer = new TCHAR[bufferLength+1]; 278 419 if (buffer == NULL) -
trunk/include/settings/settings_registry.hpp
r201 r202 3 3 #include <string> 4 4 #include <windows.h> 5 #include < TSettings.h>5 #include <settings/Settings.h> 6 6 #include <msvc_wrappers.h> 7 7 #include <error.hpp> … … 292 292 } 293 293 } 294 /* 294 295 void setSection(std::wstring section, sectionList data) { 295 296 std::wcout << _T("Unsupported function call") << std::endl; 296 297 } 298 */ 297 299 }; 298 300 } -
trunk/modules/CheckDisk/CheckDisk.cpp
r201 r202 83 83 get_size() : size(0), error(false) { } 84 84 result_type operator()(argument_type ffd) { 85 if (! is_directory(ffd.wfd.dwFileAttributes)) {85 if (!file_helpers::checks::is_directory(ffd.wfd.dwFileAttributes)) { 86 86 size += (ffd.wfd.nFileSizeHigh * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)ffd.wfd.nFileSizeLow; 87 87 } … … 112 112 NSC_DEBUG_MSG_STD(_T("Input is: ") + dir + _T(" / ") + strEx::ihextos(fileAttr)); 113 113 114 if (! is_directory(fileAttr)) {114 if (!file_helpers::checks::is_directory(fileAttr)) { 115 115 NSC_DEBUG_MSG_STD(_T("Found a file dont do recursive scan: ") + dir); 116 116 // It is a file check it an return (dont check recursivly) … … 139 139 if (hFind != INVALID_HANDLE_VALUE) { 140 140 do { 141 if ( is_directory(wfd.dwFileAttributes)) {141 if (file_helpers::checks::is_directory(wfd.dwFileAttributes)) { 142 142 if ( (wcscmp(wfd.cFileName, _T(".")) != 0) && (wcscmp(wfd.cFileName, _T("..")) != 0) ) 143 143 recursive_scan<finder_function>(dir + _T("\\") + wfd.cFileName, pattern, current_level+1, max_level, f, errors); … … 475 475 find_first_file_info() : error(false) {} 476 476 result_type operator()(argument_type ffd) { 477 if ( is_directory(ffd.wfd.dwFileAttributes))477 if (file_helpers::checks::is_directory(ffd.wfd.dwFileAttributes)) 478 478 return true; 479 479 BY_HANDLE_FILE_INFORMATION _info; … … 514 514 file_filter_function() : hit_count(0), error(false), bFilterIn(true), bFilterAll(true) {} 515 515 result_type operator()(argument_type ffd) { 516 if ( is_directory(ffd.wfd.dwFileAttributes))516 if (file_helpers::checks::is_directory(ffd.wfd.dwFileAttributes)) 517 517 return true; 518 518 BY_HANDLE_FILE_INFORMATION _info; … … 587 587 file_filter_function_ex() : hit_count(0), error(false), debug_(false), bFilterIn(true), bFilterAll(true) {} 588 588 result_type operator()(argument_type ffd) { 589 if ( is_directory(ffd.wfd.dwFileAttributes))589 if (file_helpers::checks::is_directory(ffd.wfd.dwFileAttributes)) 590 590 return true; 591 591 BY_HANDLE_FILE_INFORMATION _info; … … 646 646 } 647 647 }; 648 649 650 if ((ffd.wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY))651 return true;652 BY_HANDLE_FILE_INFORMATION _info;653 654 HANDLE hFile = CreateFile((ffd.path + _T("\\") + ffd.wfd.cFileName).c_str(), GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,655 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);656 if (hFile == INVALID_HANDLE_VALUE) {657 setError(_T("Could not open file: ") + ffd.path + _T("\\") + ffd.wfd.cFileName + _T(": ") + error::lookup::last_error());658 }659 GetFileInformationByHandle(hFile, &_info);660 CloseHandle(hFile);661 file_info info(_info, ffd.wfd.cFileName);662 info.ullNow = now;663 664 bool bMatch = !bFilterIn;665 for (filterlist_type::const_iterator cit3 = filter_chain.begin(); cit3 != filter_chain.end(); ++cit3 ) {666 bool bTmpMatched = (*cit3).second.matchFilter(info);667 int mode = (*cit3).first;668 669 if ((mode == filter_minus)&&(bTmpMatched)) {670 // a -<filter> hit so thrash item and bail out!671 //if (debug_)672 NSC_DEBUG_MSG_STD(_T("Matched: - ") + (*cit3).second.getValue() + _T(" for: ") + info.render(syntax));673 bMatch = false;674 break;675 } else if ((mode == filter_plus)&&(!bTmpMatched)) {676 // a +<filter> missed hit so thrash item and bail out!677 //if (debug_)678 NSC_DEBUG_MSG_STD(_T("Matched (missed): + ") + (*cit3).second.getValue() + _T(" for: ") + info.render(syntax));679 bMatch = false;680 break;681 } else if (bTmpMatched) {682 if (debug_)683 NSC_DEBUG_MSG_STD(_T("Matched: . (contiunue): ") + (*cit3).second.getValue() + _T(" for: ") + info.render(syntax));684 bMatch = true;685 }686 }687 688 NSC_DEBUG_MSG_STD(_T("result: ") + strEx::itos(bFilterIn) + _T(" -- ") + strEx::itos(bMatch));689 if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {690 strEx::append_list(message, info.render(syntax));691 if (alias.length() < 16)692 strEx::append_list(alias, info.filename);693 else694 strEx::append_list(alias, std::wstring(_T("...")));695 hit_count++;696 }697 return true;698 }699 inline const bool hasError() const {700 return error;701 }702 inline void setError(std::wstring) {703 error = true;704 }705 };706 707 648 708 649 NSCAPI::nagiosReturn CheckDisk::getFileAge(const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) { … … 912 853 } 913 854 914 bool bPerfData = true;915 916 try {917 MAP_OPTIONS_BEGIN(stl_args)918 MAP_OPTIONS_NUMERIC_ALL(query, _T(""))919 MAP_OPTIONS_STR2INT(_T("truncate"), truncate)920 MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)921 MAP_OPTIONS_STR(_T("syntax"), syntax)922 MAP_OPTIONS_PUSH(_T("path"), paths)923 MAP_OPTIONS_STR(_T("alias"), alias)924 MAP_OPTIONS_PUSH(_T("file"), paths)925 MAP_OPTIONS_BOOL_EX(_T("filter"), finder.bFilterIn, _T("in"), _T("out"))926 MAP_OPTIONS_BOOL_EX(_T("filter"), finder.bFilterAll, _T("all"), _T("any"))927 /*928 MAP_OPTIONS_PUSH_WTYPE(file_filter, _T("filter-size"), fileSize, finder.filter_chain)929 MAP_OPTIONS_PUSH_WTYPE(file_filter, _T("filter-creation"), fileCreation, finder.filter_chain)930 MAP_OPTIONS_PUSH_WTYPE(file_filter, _T("filter-written"), fileWritten, finder.filter_chain)931 MAP_OPTIONS_PUSH_WTYPE(file_filter, _T("filter-accessed"), fileAccessed, finder.filter_chain)932 */933 934 MAP_FILTER(_T("filter+size"), size, filter_plus)935 MAP_FILTER(_T("filter+creation"), creation, filter_plus)936 MAP_FILTER(_T("filter+written"), written, filter_plus)937 MAP_FILTER(_T("filter+accessed"), accessed, filter_plus)938 939 MAP_FILTER(_T("filter.size"), size, filter_normal)940 MAP_FILTER(_T("filter.creation"), creation, filter_normal)941 MAP_FILTER(_T("filter.written"), written, filter_normal)942 MAP_FILTER(_T("filter.accessed"), accessed, filter_normal)943 944 MAP_FILTER(_T("filter-size"), size, filter_minus)945 MAP_FILTER(_T("filter-creation"), creation, filter_minus)946 MAP_FILTER(_T("filter-written"), written, filter_minus)947 MAP_FILTER(_T("filter-accessed"), accessed, filter_minus)948 949 MAP_OPTIONS_MISSING(message, _T("Unknown argument: "))950 MAP_OPTIONS_END()951 } catch (filters::parse_exception e) {952 message = e.getMessage();953 return NSCAPI::returnUNKNOWN;954 } catch (filters::filter_exception e) {955 message = e.getMessage();956 return NSCAPI::returnUNKNOWN;957 }958 FILETIME now;959 GetSystemTimeAsFileTime(&now);960 finder.now = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);961 finder.syntax = syntax;962 for (std::list<std::wstring>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {963 recursive_scan<file_filter_function_ex>((*pit), finder);964 if (finder.hasError()) {965 message = _T("Error when scanning: ") + (*pit);966 return NSCAPI::returnUNKNOWN;967 }968 }969 message = finder.message;970 if (!alias.empty())971 query.alias = alias;972 else973 query.alias = finder.alias;974 if (query.alias.empty())975 query.alias = _T("no files found");976 query.runCheck(finder.hit_count, returnCode, message, perf);977 if ((truncate > 0) && (message.length() > (truncate-4)))978 message = message.substr(0, truncate-4) + _T("...");979 if (message.empty())980 message = _T("CheckFile ok");981 return returnCode;982 }983 984 855 NSCAPI::nagiosReturn CheckDisk::handleCommand(const strEx::blindstr command, const unsigned int argLen, TCHAR **char_args, std::wstring &msg, std::wstring &perf) { 985 856 if (command == _T("CheckFileSize")) { -
trunk/modules/CheckEventLog/CheckEventLog.cpp
r201 r202 47 47 bool CheckEventLog::loadModule(NSCAPI::moduleLoadMode mode) { 48 48 try { 49 50 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {51 NSC_DEBUG_MSG(_T("Using compatiblity mode in: EventLog Checker"));52 #define EVENTLOG_SECTION_TITLE _T("Eventlog")53 #define EVENTLOG_DEBUG _T("debug")54 #define EVENTLOG_SYNTAX _T("syntax")55 SETTINGS_MAP_KEY_A(event_log::DEBUG_KEY, EVENTLOG_SECTION_TITLE, EVENTLOG_DEBUG);56 SETTINGS_MAP_KEY_A(event_log::SYNTAX, EVENTLOG_SECTION_TITLE, EVENTLOG_SYNTAX);57 }58 49 SETTINGS_REG_PATH(event_log::SECTION); 59 50 SETTINGS_REG_KEY_B(event_log::DEBUG_KEY); … … 64 55 lookup_names_ = SETTINGS_GET_BOOL(event_log::LOOKUP_NAMES); 65 56 syntax_ = SETTINGS_GET_STRING(event_log::SYNTAX); 66 buffer_ = SETTINGS_GET_INT(event_log::BUFFER_SIZE);57 buffer_length_ = SETTINGS_GET_INT(event_log::BUFFER_SIZE); 67 58 } catch (NSCModuleHelper::NSCMHExcpetion &e) { 68 59 NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_); … … 642 633 if (err == ERROR_INSUFFICIENT_BUFFER) { 643 634 if (!buffer_error_reported) { 644 NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + EVENTLOG_BUFFER+ _T("=") + strEx::itos(dwNeeded+1) + _T(" under [EventLog] in nsc.ini : ") + error::lookup::last_error(err));635 NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + settings::event_log::BUFFER_SIZE + _T("=") + strEx::itos(dwNeeded+1) + _T(" under [EventLog] in nsc.ini : ") + error::lookup::last_error(err)); 645 636 buffer_error_reported = true; 646 637 } … … 747 738 pevlr = reinterpret_cast<EVENTLOGRECORD*>((LPBYTE)pevlr + pevlr->Length); 748 739 } 749 }750 740 } 751 741 DWORD err = GetLastError(); … … 783 773 return NSCAPI::returnUNKNOWN; 784 774 } 785 if (!bPerfData)786 query.perfData = false;787 if (query.alias.empty())788 query.alias = _T("eventlog");789 query.runCheck(hit_count, returnCode, message, perf);790 775 if ((truncate > 0) && (message.length() > (truncate-4))) 791 776 message = message.substr(0, truncate-4) + _T("..."); -
trunk/modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj
r201 r202 23 23 <Configurations> 24 24 <Configuration 25 Name="Debug|Win32"26 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"27 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"28 ConfigurationType="2"29 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"30 CharacterSet="1"31 >32 <Tool33 Name="VCPreBuildEventTool"34 />35 <Tool36 Name="VCCustomBuildTool"37 />38 <Tool39 Name="VCXMLDataGeneratorTool"40 />41 <Tool42 Name="VCWebServiceProxyGeneratorTool"43 />44 <Tool45 Name="VCMIDLTool"46 />47 <Tool48 Name="VCCLCompilerTool"49 Optimization="0"50 AdditionalIncludeDirectories="../include;../../include"51 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"52 MinimalRebuild="true"53 BasicRuntimeChecks="3"54 RuntimeLibrary="1"55 UsePrecompiledHeader="2"56 WarningLevel="3"57 Detect64BitPortabilityProblems="false"58 DebugInformationFormat="4"59 />60 <Tool61 Name="VCManagedResourceCompilerTool"62 />63 <Tool64 Name="VCResourceCompilerTool"65 />66 <Tool67 Name="VCPreLinkEventTool"68 />69 <Tool70 Name="VCLinkerTool"71 OutputFile="$(OutDir)\$(ProjectName).dll"72 LinkIncremental="2"73 AdditionalLibraryDirectories=""74 ModuleDefinitionFile="CheckExternalScripts.def"75 GenerateDebugInformation="true"76 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"77 SubSystem="2"78 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"79 TargetMachine="1"80 />81 <Tool82 Name="VCALinkTool"83 />84 <Tool85 Name="VCManifestTool"86 />87 <Tool88 Name="VCXDCMakeTool"89 />90 <Tool91 Name="VCBscMakeTool"92 />93 <Tool94 Name="VCFxCopTool"95 />96 <Tool97 Name="VCAppVerifierTool"98 />99 <Tool100 Name="VCWebDeploymentTool"101 />102 <Tool103 Name="VCPostBuildEventTool"104 />105 </Configuration>106 <Configuration107 Name="Debug|x64"108 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"109 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"110 ConfigurationType="2"111 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"112 CharacterSet="1"113 >114 <Tool115 Name="VCPreBuildEventTool"116 />117 <Tool118 Name="VCCustomBuildTool"119 />120 <Tool121 Name="VCXMLDataGeneratorTool"122 />123 <Tool124 Name="VCWebServiceProxyGeneratorTool"125 />126 <Tool127 Name="VCMIDLTool"128 TargetEnvironment="3"129 />130 <Tool131 Name="VCCLCompilerTool"132 Optimization="0"133 AdditionalIncludeDirectories="../include;../../include"134 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"135 MinimalRebuild="true"136 BasicRuntimeChecks="3"137 RuntimeLibrary="1"138 UsePrecompiledHeader="2"139 WarningLevel="3"140 Detect64BitPortabilityProblems="false"141 DebugInformationFormat="3"142 />143 <Tool144 Name="VCManagedResourceCompilerTool"145 />146 <Tool147 Name="VCResourceCompilerTool"148 />149 <Tool150 Name="VCPreLinkEventTool"151 />152 <Tool153 Name="VCLinkerTool"154 OutputFile="$(OutDir)\$(ProjectName).dll"155 LinkIncremental="2"156 AdditionalLibraryDirectories=""157 IgnoreDefaultLibraryNames="MSVCRT"158 ModuleDefinitionFile="CheckExternalScripts.def"159 GenerateDebugInformation="true"160 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"161 SubSystem="2"162 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"163 TargetMachine="17"164 />165 <Tool166 Name="VCALinkTool"167 />168 <Tool169 Name="VCManifestTool"170 />171 <Tool172 Name="VCXDCMakeTool"173 />174 <Tool175 Name="VCBscMakeTool"176 />177 <Tool178 Name="VCFxCopTool"179 />180 <Tool181 Name="VCAppVerifierTool"182 />183 <Tool184 Name="VCWebDeploymentTool"185 />186 <Tool187 Name="VCPostBuildEventTool"188 />189 </Configuration>190 <Configuration191 25 Name="Release|Win32" 192 26 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" … … 198 32 <Tool 199 33 Name="VCPreBuildEventTool" 34 ExcludedFromBuild="true" 200 35 /> 201 36 <Tool … … 214 49 Name="VCCLCompilerTool" 215 50 AdditionalIncludeDirectories="../include;../../include" 216 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE"217 RuntimeLibrary="0"218 UsePrecompiledHeader="2"219 WarningLevel="3"220 Detect64BitPortabilityProblems="false"221 DebugInformationFormat="3"222 51 /> 223 52 <Tool … … 232 61 <Tool 233 62 Name="VCLinkerTool" 234 OutputFile="$(OutDir)\$(ProjectName).dll" 235 LinkIncremental="1" 236 AdditionalLibraryDirectories="" 237 ModuleDefinitionFile="CheckExternalScripts.def" 238 GenerateDebugInformation="false" 239 SubSystem="2" 240 OptimizeReferences="2" 241 EnableCOMDATFolding="2" 242 ImportLibrary="$(OutDir)/CheckExternalScripts.lib" 243 TargetMachine="1" 63 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 244 64 /> 245 65 <Tool … … 290 110 <Tool 291 111 Name="VCMIDLTool" 292 TargetEnvironment="3"293 112 /> 294 113 <Tool 295 114 Name="VCCLCompilerTool" 296 115 AdditionalIncludeDirectories="../include;../../include" 297 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE"298 RuntimeLibrary="0"299 UsePrecompiledHeader="2"300 WarningLevel="3"301 Detect64BitPortabilityProblems="false"302 DebugInformationFormat="3"303 />304 <Tool305 Name="VCManagedResourceCompilerTool"306 />307 <Tool308 Name="VCResourceCompilerTool"309 />310 <Tool311 Name="VCPreLinkEventTool"312 />313 <Tool314 Name="VCLinkerTool"315 OutputFile="$(OutDir)\$(ProjectName).dll"316 LinkIncremental="1"317 AdditionalLibraryDirectories=""318 ModuleDefinitionFile="CheckExternalScripts.def"319 GenerateDebugInformation="false"320 SubSystem="2"321 OptimizeReferences="2"322 EnableCOMDATFolding="2"323 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"324 TargetMachine="17"325 />326 <Tool327 Name="VCALinkTool"328 />329 <Tool330 Name="VCManifestTool"331 />332 <Tool333 Name="VCXDCMakeTool"334 />335 <Tool336 Name="VCBscMakeTool"337 />338 <Tool339 Name="VCFxCopTool"340 />341 <Tool342 Name="VCAppVerifierTool"343 />344 <Tool345 Name="VCWebDeploymentTool"346 />347 <Tool348 Name="VCPostBuildEventTool"349 />350 </Configuration>351 <Configuration352 Name="Distribution|Win32"353 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"354 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"355 ConfigurationType="2"356 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"357 CharacterSet="1"358 >359 <Tool360 Name="VCPreBuildEventTool"361 />362 <Tool363 Name="VCCustomBuildTool"364 />365 <Tool366 Name="VCXMLDataGeneratorTool"367 />368 <Tool369 Name="VCWebServiceProxyGeneratorTool"370 />371 <Tool372 Name="VCMIDLTool"373 />374 <Tool375 Name="VCCLCompilerTool"376 AdditionalIncludeDirectories="../include;../../include"377 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"378 RuntimeLibrary="0"379 UsePrecompiledHeader="2"380 WarningLevel="3"381 Detect64BitPortabilityProblems="false"382 DebugInformationFormat="3"383 />384 <Tool385 Name="VCManagedResourceCompilerTool"386 />387 <Tool388 Name="VCResourceCompilerTool"389 />390 <Tool391 Name="VCPreLinkEventTool"392 />393 <Tool394 Name="VCLinkerTool"395 OutputFile="$(OutDir)\$(ProjectName).dll"396 LinkIncremental="1"397 ModuleDefinitionFile="CheckExternalScripts.def"398 GenerateDebugInformation="false"399 SubSystem="2"400 OptimizeReferences="2"401 EnableCOMDATFolding="2"402 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"403 TargetMachine="1"404 />405 <Tool406 Name="VCALinkTool"407 />408 <Tool409 Name="VCManifestTool"410 />411 <Tool412 Name="VCXDCMakeTool"413 />414 <Tool415 Name="VCBscMakeTool"416 />417 <Tool418 Name="VCFxCopTool"419 />420 <Tool421 Name="VCAppVerifierTool"422 />423 <Tool424 Name="VCWebDeploymentTool"425 />426 <Tool427 Name="VCPostBuildEventTool"428 />429 </Configuration>430 <Configuration431 Name="Distribution|x64"432 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"433 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"434 ConfigurationType="2"435 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"436 CharacterSet="1"437 >438 <Tool439 Name="VCPreBuildEventTool"440 />441 <Tool442 Name="VCCustomBuildTool"443 />444 <Tool445 Name="VCXMLDataGeneratorTool"446 />447 <Tool448 Name="VCWebServiceProxyGeneratorTool"449 />450 <Tool451 Name="VCMIDLTool"452 TargetEnvironment="3"453 />454 <Tool455 Name="VCCLCompilerTool"456 AdditionalIncludeDirectories="../include;../../include"457 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"458 RuntimeLibrary="0"459 UsePrecompiledHeader="2"460 WarningLevel="3"461 Detect64BitPortabilityProblems="false"462 DebugInformationFormat="3"463 />464 <Tool465 Name="VCManagedResourceCompilerTool"466 />467 <Tool468 Name="VCResourceCompilerTool"469 />470 <Tool471 Name="VCPreLinkEventTool"472 />473 <Tool474 Name="VCLinkerTool"475 OutputFile="$(OutDir)\$(ProjectName).dll"476 LinkIncremental="1"477 ModuleDefinitionFile="CheckExternalScripts.def"478 GenerateDebugInformation="false"479 SubSystem="2"480 OptimizeReferences="2"481 EnableCOMDATFolding="2"482 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"483 TargetMachine="17"484 />485 <Tool486 Name="VCALinkTool"487 />488 <Tool489 Name="VCManifestTool"490 />491 <Tool492 Name="VCXDCMakeTool"493 />494 <Tool495 Name="VCBscMakeTool"496 />497 <Tool498 Name="VCFxCopTool"499 />500 <Tool501 Name="VCAppVerifierTool"502 />503 <Tool504 Name="VCWebDeploymentTool"505 />506 <Tool507 Name="VCPostBuildEventTool"508 />509 </Configuration>510 <Configuration511 Name="Nightly|Win32"512 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"513 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"514 ConfigurationType="2"515 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"516 CharacterSet="1"517 >518 <Tool519 Name="VCPreBuildEventTool"520 />521 <Tool522 Name="VCCustomBuildTool"523 />524 <Tool525 Name="VCXMLDataGeneratorTool"526 />527 <Tool528 Name="VCWebServiceProxyGeneratorTool"529 />530 <Tool531 Name="VCMIDLTool"532 />533 <Tool534 Name="VCCLCompilerTool"535 AdditionalIncludeDirectories="../include;../../include"536 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"537 UsePrecompiledHeader="2"538 WarningLevel="3"539 DebugInformationFormat="3"540 />541 <Tool542 Name="VCManagedResourceCompilerTool"543 />544 <Tool545 Name="VCResourceCompilerTool"546 />547 <Tool548 Name="VCPreLinkEventTool"549 />550 <Tool551 Name="VCLinkerTool"552 OutputFile="$(OutDir)\$(ProjectName).dll"553 OutputFile="$(OutDir)\$(ProjectName).dll"554 LinkIncremental="1"555 ModuleDefinitionFile="CheckExternalScripts.def"556 GenerateDebugInformation="false"557 SubSystem="2"558 OptimizeReferences="2"559 EnableCOMDATFolding="2"560 TargetMachine="1"561 />562 <Tool563 Name="VCALinkTool"564 />565 <Tool566 Name="VCManifestTool"567 />568 <Tool569 Name="VCXDCMakeTool"570 />571 <Tool572 Name="VCBscMakeTool"573 />574 <Tool575 Name="VCFxCopTool"576 />577 <Tool578 Name="VCAppVerifierTool"579 />580 <Tool581 Name="VCWebDeploymentTool"582 />583 <Tool584 Name="VCPostBuildEventTool"585 />586 </Configuration>587 <Configuration588 Name="Nightly|x64"589 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"590 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"591 ConfigurationType="2"592 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"593 CharacterSet="1"594 >595 <Tool596 Name="VCPreBuildEventTool"597 />598 <Tool599 Name="VCCustomBuildTool"600 />601 <Tool602 Name="VCXMLDataGeneratorTool"603 />604 <Tool605 Name="VCWebServiceProxyGeneratorTool"606 />607 <Tool608 Name="VCMIDLTool"609 TargetEnvironment="3"610 />611 <Tool612 Name="VCCLCompilerTool"613 AdditionalIncludeDirectories="../include;../../include"614 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"615 UsePrecompiledHeader="2"616 WarningLevel="3"617 DebugInformationFormat="3"618 />619 <Tool620 Name="VCManagedResourceCompilerTool"621 />622 <Tool623 Name="VCResourceCompilerTool"624 />625 <Tool626 Name="VCPreLinkEventTool"627 />628 <Tool629 Name="VCLinkerTool"630 OutputFile="$(OutDir)\$(ProjectName).dll"631 OutputFile="$(OutDir)\$(ProjectName).dll"632 LinkIncremental="1"633 ModuleDefinitionFile="CheckExternalScripts.def"634 GenerateDebugInformation="false"635 SubSystem="2"636 OptimizeReferences="2"637 EnableCOMDATFolding="2"638 TargetMachine="17"639 />640 <Tool641 Name="VCALinkTool"642 />643 <Tool644 Name="VCManifestTool"645 />646 <Tool647 Name="VCXDCMakeTool"648 />649 <Tool650 Name="VCBscMakeTool"651 />652 <Tool653 Name="VCFxCopTool"654 />655 <Tool656 Name="VCAppVerifierTool"657 />658 <Tool659 Name="VCWebDeploymentTool"660 />661 <Tool662 Name="VCPostBuildEventTool"663 />664 </Configuration>665 <Configuration666 Name="Debug-MemCheck|Win32"667 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"668 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"669 ConfigurationType="2"670 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"671 CharacterSet="1"672 >673 <Tool674 Name="VCPreBuildEventTool"675 />676 <Tool677 Name="VCCustomBuildTool"678 />679 <Tool680 Name="VCXMLDataGeneratorTool"681 />682 <Tool683 Name="VCWebServiceProxyGeneratorTool"684 />685 <Tool686 Name="VCMIDLTool"687 />688 <Tool689 Name="VCCLCompilerTool"690 Optimization="0"691 AdditionalIncludeDirectories="../include;../../include"692 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MEMCHECK"693 MinimalRebuild="true"694 BasicRuntimeChecks="3"695 RuntimeLibrary="1"696 UsePrecompiledHeader="2"697 WarningLevel="3"698 Detect64BitPortabilityProblems="false"699 DebugInformationFormat="4"700 />701 <Tool702 Name="VCManagedResourceCompilerTool"703 />704 <Tool705 Name="VCResourceCompilerTool"706 />707 <Tool708 Name="VCPreLinkEventTool"709 />710 <Tool711 Name="VCLinkerTool"712 OutputFile="$(OutDir)\$(ProjectName).dll"713 LinkIncremental="2"714 AdditionalLibraryDirectories=""715 ModuleDefinitionFile="CheckExternalScripts.def"716 GenerateDebugInformation="true"717 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"718 SubSystem="2"719 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"720 TargetMachine="1"721 />722 <Tool723 Name="VCALinkTool"724 />725 <Tool726 Name="VCManifestTool"727 />728 <Tool729 Name="VCXDCMakeTool"730 />731 <Tool732 Name="VCBscMakeTool"733 />734 <Tool735 Name="VCFxCopTool"736 />737 <Tool738 Name="VCAppVerifierTool"739 />740 <Tool741 Name="VCWebDeploymentTool"742 />743 <Tool744 Name="VCPostBuildEventTool"745 />746 </Configuration>747 <Configuration748 Name="Debug-MemCheck|x64"749 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"750 IntermediateDirectory="$(SolutionDir)\tmp\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"751 ConfigurationType="2"752 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"753 CharacterSet="1"754 >755 <Tool756 Name="VCPreBuildEventTool"757 />758 <Tool759 Name="VCCustomBuildTool"760 />761 <Tool762 Name="VCXMLDataGeneratorTool"763 />764 <Tool765 Name="VCWebServiceProxyGeneratorTool"766 />767 <Tool768 Name="VCMIDLTool"769 TargetEnvironment="3"770 />771 <Tool772 Name="VCCLCompilerTool"773 Optimization="0"774 AdditionalIncludeDirectories="../include;../../include"775 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"776 MinimalRebuild="true"777 BasicRuntimeChecks="3"778 RuntimeLibrary="1"779 UsePrecompiledHeader="2"780 WarningLevel="3"781 Detect64BitPortabilityProblems="false"782 DebugInformationFormat="3"783 />784 <Tool785 Name="VCManagedResourceCompilerTool"786 />787 <Tool788 Name="VCResourceCompilerTool"789 />790 <Tool791 Name="VCPreLinkEventTool"792 />793 <Tool794 Name="VCLinkerTool"795 OutputFile="$(OutDir)\$(ProjectName).dll"796 LinkIncremental="2"797 AdditionalLibraryDirectories=""798 IgnoreDefaultLibraryNames="MSVCRT"799 ModuleDefinitionFile="CheckExternalScripts.def"800 GenerateDebugInformation="true"801 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"802 SubSystem="2"803 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"804 TargetMachine="17"805 />806 <Tool807 Name="VCALinkTool"808 />809 <Tool810 Name="VCManifestTool"811 />812 <Tool813 Name="VCXDCMakeTool"814 />815 <Tool816 Name="VCBscMakeTool"817 />818 <Tool819 Name="VCFxCopTool"820 />821 <Tool822 Name="VCAppVerifierTool"823 />824 <Tool825 Name="VCWebDeploymentTool"826 />827 <Tool828 Name="VCPostBuildEventTool"829 />830 </Configuration>831 <Configuration832 Name="OP5|Win32"833 OutputDirectory="$(SolutionDir)$(ConfigurationName)"834 IntermediateDirectory="$(ConfigurationName)"835 ConfigurationType="2"836 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"837 CharacterSet="1"838 >839 <Tool840 Name="VCPreBuildEventTool"841 />842 <Tool843 Name="VCCustomBuildTool"844 />845 <Tool846 Name="VCXMLDataGeneratorTool"847 />848 <Tool849 Name="VCWebServiceProxyGeneratorTool"850 />851 <Tool852 Name="VCMIDLTool"853 />854 <Tool855 Name="VCCLCompilerTool"856 AdditionalIncludeDirectories="../include;../../include"857 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"858 UsePrecompiledHeader="2"859 WarningLevel="3"860 DebugInformationFormat="3"861 />862 <Tool863 Name="VCManagedResourceCompilerTool"864 />865 <Tool866 Name="VCResourceCompilerTool"867 />868 <Tool869 Name="VCPreLinkEventTool"870 />871 <Tool872 Name="VCLinkerTool"873 OutputFile="$(OutDir)\$(ProjectName).dll"874 LinkIncremental="1"875 ModuleDefinitionFile="CheckExternalScripts.def"876 GenerateDebugInformation="false"877 SubSystem="2"878 OptimizeReferences="2"879 EnableCOMDATFolding="2"880 TargetMachine="1"881 />882 <Tool883 Name="VCALinkTool"884 />885 <Tool886 Name="VCManifestTool"887 />888 <Tool889 Name="VCXDCMakeTool"890 />891 <Tool892 Name="VCBscMakeTool"893 />894 <Tool895 Name="VCFxCopTool"896 />897 <Tool898 Name="VCAppVerifierTool"899 />900 <Tool901 Name="VCWebDeploymentTool"902 />903 <Tool904 Name="VCPostBuildEventTool"905 />906 </Configuration>907 <Configuration908 Name="OP5|x64"909 OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"910 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"911 ConfigurationType="2"912 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"913 CharacterSet="1"914 >915 <Tool916 Name="VCPreBuildEventTool"917 />918 <Tool919 Name="VCCustomBuildTool"920 />921 <Tool922 Name="VCXMLDataGeneratorTool"923 />924 <Tool925 Name="VCWebServiceProxyGeneratorTool"926 />927 <Tool928 Name="VCMIDLTool"929 TargetEnvironment="3"930 />931 <Tool932 Name="VCCLCompilerTool"933 AdditionalIncludeDirectories="../include;../../include"934 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"935 UsePrecompiledHeader="2"936 WarningLevel="3"937 DebugInformationFormat="3"938 />939 <Tool940 Name="VCManagedResourceCompilerTool"941 />942 <Tool943 Name="VCResourceCompilerTool"944 />945 <Tool946 Name="VCPreLinkEventTool"947 />948 <Tool949 Name="VCLinkerTool"950 OutputFile="$(OutDir)\$(ProjectName).dll"951 LinkIncremental="1"952 ModuleDefinitionFile="CheckExternalScripts.def"953 GenerateDebugInformation="false"954 SubSystem="2"955 OptimizeReferences="2"956 EnableCOMDATFolding="2"957 TargetMachine="17"958 />959 <Tool960 Name="VCALinkTool"961 />962 <Tool963 Name="VCManifestTool"964 />965 <Tool966 Name="VCXDCMakeTool"967 />968 <Tool969 Name="VCBscMakeTool"970 />971 <Tool972 Name="VCFxCopTool"973 />974 <Tool975 Name="VCAppVerifierTool"976 />977 <Tool978 Name="VCWebDeploymentTool"979 />980 <Tool981 Name="VCPostBuildEventTool"982 />983 </Configuration>984 <Configuration985 Name="Debug|Itanium"986 OutputDirectory="$(PlatformName)\$(ConfigurationName)"987 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"988 ConfigurationType="2"989 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"990 CharacterSet="2"991 >992 <Tool993 Name="VCPreBuildEventTool"994 />995 <Tool996 Name="VCCustomBuildTool"997 />998 <Tool999 Name="VCXMLDataGeneratorTool"1000 />1001 <Tool1002 Name="VCWebServiceProxyGeneratorTool"1003 />1004 <Tool1005 Name="VCMIDLTool"1006 TargetEnvironment="2"1007 />1008 <Tool1009 Name="VCCLCompilerTool"1010 Optimization="0"1011 AdditionalIncludeDirectories="../include;../../include"1012 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE"1013 MinimalRebuild="true"1014 BasicRuntimeChecks="3"1015 RuntimeLibrary="1"1016 UsePrecompiledHeader="2"1017 WarningLevel="3"1018 Detect64BitPortabilityProblems="false"1019 DebugInformationFormat="3"1020 116 /> 1021 117 <Tool … … 1031 127 Name="VCLinkerTool" 1032 128 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 1033 OutputFile="../../Debug/modules/$(ProjectName).dll"1034 LinkIncremental="2"1035 AdditionalLibraryDirectories=""1036 IgnoreDefaultLibraryNames="MSVCRT"1037 ModuleDefinitionFile="CheckExternalScripts.def"1038 GenerateDebugInformation="true"1039 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb"1040 SubSystem="2"1041 RandomizedBaseAddress="1"1042 DataExecutionPrevention="0"1043 ImportLibrary="$(OutDir)/CheckExternalScripts.lib"1044 TargetMachine="5"1045 129 /> 1046 130 <Tool … … 1063 147 /> 1064 148 <Tool 1065 Name="VCPostBuildEventTool" 1066 /> 1067 </Configuration> 1068 <Configuration 1069 Name="Release|Itanium" 1070 OutputDirectory="$(PlatformName)\$(ConfigurationName)" 1071 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 1072 ConfigurationType="2" 1073 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 1074 CharacterSet="2" 1075 > 1076 <Tool 1077 Name="VCPreBuildEventTool" 1078 /> 1079 <Tool 1080 Name="VCCustomBuildTool" 1081 /> 1082 <Tool 1083 Name="VCXMLDataGeneratorTool" 1084 /> 1085 <Tool 1086 Name="VCWebServiceProxyGeneratorTool" 1087 /> 1088 <Tool 1089 Name="VCMIDLTool" 1090 TargetEnvironment="2" 1091 /> 1092 <Tool 1093 Name="VCCLCompilerTool" 1094 AdditionalIncludeDirectories="../include;../../include" 1095 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; _CRT_SECURE_NO_DEPRECATE" 1096 RuntimeLibrary="0" 1097 UsePrecompiledHeader="2" 1098 WarningLevel="3" 1099 Detect64BitPortabilityProblems="false" 1100 DebugInformationFormat="3" 1101 /> 1102 <Tool 1103 Name="VCManagedResourceCompilerTool" 1104 /> 1105 <Tool 1106 Name="VCResourceCompilerTool" 1107 /> 1108 <Tool 1109 Name="VCPreLinkEventTool" 1110 /> 1111 <Tool 1112 Name="VCLinkerTool" 1113 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 1114 OutputFile="../../Release/modules/$(ProjectName).dll" 1115 LinkIncremental="1" 1116 AdditionalLibraryDirectories="" 1117 ModuleDefinitionFile="CheckExternalScripts.def" 1118 GenerateDebugInformation="false" 1119 SubSystem="2" 1120 OptimizeReferences="2" 1121 EnableCOMDATFolding="2" 1122 RandomizedBaseAddress="1" 1123 DataExecutionPrevention="0" 1124 ImportLibrary="$(OutDir)/CheckExternalScripts.lib" 1125 TargetMachine="5" 1126 /> 1127 <Tool 1128 Name="VCALinkTool" 1129 /> 1130 <Tool 1131 Name="VCManifestTool" 1132 /> 1133 <Tool 1134 Name="VCXDCMakeTool" 1135 /> 1136 <Tool 1137 Name="VCBscMakeTool" 1138 /> 1139 <Tool 1140 Name="VCFxCopTool" 1141 /> 1142 <Tool 1143 Name="VCAppVerifierTool" 1144 /> 1145 <Tool 1146 Name="VCPostBuildEventTool" 1147 /> 1148 </Configuration> 1149 <Configuration 1150 Name="Distribution|Itanium" 1151 OutputDirectory="$(PlatformName)\$(ConfigurationName)" 1152 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 1153 ConfigurationType="2" 1154 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 1155 CharacterSet="2" 1156 > 1157 <Tool 1158 Name="VCPreBuildEventTool" 1159 /> 1160 <Tool 1161 Name="VCCustomBuildTool" 1162 /> 1163 <Tool 1164 Name="VCXMLDataGeneratorTool" 1165 /> 1166 <Tool 1167 Name="VCWebServiceProxyGeneratorTool" 1168 /> 1169 <Tool 1170 Name="VCMIDLTool" 1171 TargetEnvironment="2" 1172 /> 1173 <Tool 1174 Name="VCCLCompilerTool" 1175 AdditionalIncludeDirectories="../include;../../include" 1176 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 1177 RuntimeLibrary="0" 1178 UsePrecompiledHeader="2" 1179 WarningLevel="3" 1180 Detect64BitPortabilityProblems="false" 1181 DebugInformationFormat="3" 1182 /> 1183 <Tool 1184 Name="VCManagedResourceCompilerTool" 1185 /> 1186 <Tool 1187 Name="VCResourceCompilerTool" 1188 /> 1189 <Tool 1190 Name="VCPreLinkEventTool" 1191 /> 1192 <Tool 1193 Name="VCLinkerTool" 1194 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 1195 OutputFile="../../Dist/modules/$(ProjectName).dll" 1196 LinkIncremental="1" 1197 ModuleDefinitionFile="CheckExternalScripts.def" 1198 GenerateDebugInformation="false" 1199 SubSystem="2" 1200 OptimizeReferences="2" 1201 EnableCOMDATFolding="2" 1202 RandomizedBaseAddress="1" 1203 DataExecutionPrevention="0" 1204 ImportLibrary="$(OutDir)/CheckExternalScripts.lib" 1205 TargetMachine="5" 1206 /> 1207 <Tool 1208 Name="VCALinkTool" 1209 /> 1210 <Tool 1211 Name="VCManifestTool" 1212 /> 1213 <Tool 1214 Name="VCXDCMakeTool" 1215 /> 1216 <Tool 1217 Name="VCBscMakeTool" 1218 /> 1219 <Tool 1220 Name="VCFxCopTool" 1221 /> 1222 <Tool 1223 Name="VCAppVerifierTool" 1224 /> 1225 <Tool 1226 Name="VCPostBuildEventTool" 1227 /> 1228 </Configuration> 1229 <Configuration 1230 Name="Nightly|Itanium" 1231 OutputDirectory="$(PlatformName)\$(ConfigurationName)" 1232 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 1233 ConfigurationType="2" 1234 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 1235 CharacterSet="2" 1236 > 1237 <Tool 1238 Name="VCPreBuildEventTool" 1239 /> 1240 <Tool 1241 Name="VCCustomBuildTool" 1242 /> 1243 <Tool 1244 Name="VCXMLDataGeneratorTool" 1245 /> 1246 <Tool 1247 Name="VCWebServiceProxyGeneratorTool" 1248 /> 1249 <Tool 1250 Name="VCMIDLTool" 1251 TargetEnvironment="2" 1252 /> 1253 <Tool 1254 Name="VCCLCompilerTool" 1255 AdditionalIncludeDirectories="../include;../../include" 1256 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 1257 RuntimeLibrary="2" 1258 UsePrecompiledHeader="2" 1259 WarningLevel="3" 1260 Detect64BitPortabilityProblems="false" 1261 DebugInformationFormat="3" 1262 /> 1263 <Tool 1264 Name="VCManagedResourceCompilerTool" 1265 /> 1266 <Tool 1267 Name="VCResourceCompilerTool" 1268 /> 1269 <Tool 1270 Name="VCPreLinkEventTool" 1271 /> 1272 <Tool 1273 Name="VCLinkerTool" 1274 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 1275 OutputFile="../../Dist/modules/$(ProjectName).dll" 1276 LinkIncremental="1" 1277 ModuleDefinitionFile="CheckExternalScripts.def" 1278 GenerateDebugInformation="true" 1279 SubSystem="2" 1280 OptimizeReferences="2" 1281 EnableCOMDATFolding="2" 1282 RandomizedBaseAddress="1" 1283 DataExecutionPrevention="0" 1284 ImportLibrary="$(OutDir)/CheckExternalScripts.lib" 1285 TargetMachine="5" 1286 /> 1287 <Tool 1288 Name="VCALinkTool" 1289 /> 1290 <Tool 1291 Name="VCManifestTool" 1292 /> 1293 <Tool 1294 Name="VCXDCMakeTool" 1295 /> 1296 <Tool 1297 Name="VCBscMakeTool" 1298 /> 1299 <Tool 1300 Name="VCFxCopTool" 1301 /> 1302 <Tool 1303 Name="VCAppVerifierTool" 1304 /> 1305 <Tool 1306 Name="VCPostBuildEventTool" 1307 /> 1308 </Configuration> 1309 <Configuration 1310 Name="Debug-MemCheck|Itanium" 1311 OutputDirectory="$(PlatformName)\$(ConfigurationName)" 1312 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 1313 ConfigurationType="2" 1314 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 1315 CharacterSet="2" 1316 > 1317 <Tool 1318 Name="VCPreBuildEventTool" 1319 /> 1320 <Tool 1321 Name="VCCustomBuildTool" 1322 /> 1323 <Tool 1324 Name="VCXMLDataGeneratorTool" 1325 /> 1326 <Tool 1327 Name="VCWebServiceProxyGeneratorTool" 1328 /> 1329 <Tool 1330 Name="VCMIDLTool" 1331 TargetEnvironment="2" 1332 /> 1333 <Tool 1334 Name="VCCLCompilerTool" 1335 Optimization="0" 1336 AdditionalIncludeDirectories="../include;../../include" 1337 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;_CRT_SECURE_NO_DEPRECATE" 1338 MinimalRebuild="true" 1339 BasicRuntimeChecks="3" 1340 RuntimeLibrary="1" 1341 UsePrecompiledHeader="2" 1342 WarningLevel="3" 1343 Detect64BitPortabilityProblems="false" 1344 DebugInformationFormat="3" 1345 /> 1346 <Tool 1347 Name="VCManagedResourceCompilerTool" 1348 /> 1349 <Tool 1350 Name="VCResourceCompilerTool" 1351 /> 1352 <Tool 1353 Name="VCPreLinkEventTool" 1354 /> 1355 <Tool 1356 Name="VCLinkerTool" 1357 AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib" 1358 OutputFile="../../Debug/modules/$(ProjectName).dll" 1359 LinkIncremental="2" 1360 AdditionalLibraryDirectories="" 1361 IgnoreDefaultLibraryNames="MSVCRT" 1362 ModuleDefinitionFile="CheckExternalScripts.def" 1363 GenerateDebugInformation="true" 1364 ProgramDatabaseFile="$(OutDir)/CheckExternalScripts.pdb" 1365 SubSystem="2" 1366 RandomizedBaseAddress="1" 1367 DataExecutionPrevention="0" 1368 ImportLibrary="$(OutDir)/CheckExternalScripts.lib" 1369 TargetMachine="5" 1370 /> 1371 <Tool 1372 Name="VCALinkTool" 1373 /> 1374 <Tool 1375 Name="VCManifestTool" 1376 /> 1377 <Tool 1378 Name="VCXDCMakeTool" 1379 /> 1380 <Tool 1381 Name="VCBscMakeTool" 1382 /> 1383 <Tool 1384 Name="VCFxCopTool" 1385 /> 1386 <Tool 1387 Name="VCAppVerifierTool" 149 Name="VCWebDeploymentTool" 1388 150 /> 1389 151 <Tool … … 1404 166 > 1405 167 <FileConfiguration 168 Name="Release|Win32" 169 > 170 <Tool 171 Name="VCCLCompilerTool" 172 UsePrecompiledHeader="0" 173 PrecompiledHeaderThrough="" 174 /> 175 </FileConfiguration> 176 <FileConfiguration 177 Name="Release|x64" 178 > 179 <Tool 180 Name="VCCLCompilerTool" 181 UsePrecompiledHeader="0" 182 PrecompiledHeaderThrough="" 183 /> 184 </FileConfiguration> 185 <FileConfiguration 1406 186 Name="Debug|Win32" 1407 187 > … … 1422 202 </FileConfiguration> 1423 203 <FileConfiguration 204 Name="Distribution|Win32" 205 > 206 <Tool 207 Name="VCCLCompilerTool" 208 UsePrecompiledHeader="0" 209 PrecompiledHeaderThrough="" 210 /> 211 </FileConfiguration> 212 <FileConfiguration 213 Name="Distribution|x64" 214 > 215 <Tool 216 Name="VCCLCompilerTool" 217 UsePrecompiledHeader="0" 218 PrecompiledHeaderThrough="" 219 /> 220 </FileConfiguration> 221 <FileConfiguration 222 Name="Nightly|Win32" 223 > 224 <Tool 225 Name="VCCLCompilerTool" 226 UsePrecompiledHeader="0" 227 PrecompiledHeaderThrough="" 228 /> 229 </FileConfiguration> 230 <FileConfiguration 231 Name="Nightly|x64" 232 > 233 <Tool 234 Name="VCCLCompilerTool" 235 UsePrecompiledHeader="0" 236 PrecompiledHeaderThrough="" 237 /> 238 </FileConfiguration> 239 <FileConfiguration 240 Name="Debug-MemCheck|Win32" 241 > 242 <Tool 243 Name="VCCLCompilerTool" 244 UsePrecompiledHeader="0" 245 PrecompiledHeaderThrough="" 246 /> 247 </FileConfiguration> 248 <FileConfiguration 249 Name="Debug-MemCheck|x64" 250 > 251 <Tool 252 Name="VCCLCompilerTool" 253 UsePrecompiledHeader="0" 254 PrecompiledHeaderThrough="" 255 /> 256 </FileConfiguration> 257 <FileConfiguration 258 Name="Debug|Itanium" 259 > 260 <Tool 261 Name="VCCLCompilerTool" 262 UsePrecompiledHeader="0" 263 PrecompiledHeaderThrough="" 264 /> 265 </FileConfiguration> 266 <FileConfiguration 267 Name="Release|Itanium" 268 > 269 <Tool 270 Name="VCCLCompilerTool" 271 UsePrecompiledHeader="0" 272 PrecompiledHeaderThrough="" 273 /> 274 </FileConfiguration> 275 <FileConfiguration 276 Name="Distribution|Itanium" 277 > 278 <Tool 279 Name="VCCLCompilerTool" 280 UsePrecompiledHeader="0" 281 PrecompiledHeaderThrough="" 282 /> 283 </FileConfiguration> 284 <FileConfiguration 285 Name="Nightly|Itanium" 286 > 287 <Tool 288 Name="VCCLCompilerTool" 289 UsePrecompiledHeader="0" 290 PrecompiledHeaderThrough="" 291 /> 292 </FileConfiguration> 293 <FileConfiguration 294 Name="Debug-MemCheck|Itanium" 295 > 296 <Tool 297 Name="VCCLCompilerTool" 298 UsePrecompiledHeader="0" 299 PrecompiledHeaderThrough="" 300 /> 301 </FileConfiguration> 302 </File> 303 <File 304 RelativePath=".\CheckExternalScripts.cpp" 305 > 306 </File> 307 <File 308 RelativePath=".\CheckExternalScripts.def" 309 > 310 </File> 311 <File 312 RelativePath="..\..\include\NSCHelper.cpp" 313 > 314 <FileConfiguration 1424 315 Name="Release|Win32" 1425 316 > … … 1440 331 </FileConfiguration> 1441 332 <FileConfiguration 333 Name="Debug|Win32" 334 > 335 <Tool 336 Name="VCCLCompilerTool" 337 UsePrecompiledHeader="0" 338 PrecompiledHeaderThrough="" 339 /> 340 </FileConfiguration> 341 <FileConfiguration 342 Name="Debug|x64" 343 > 344 <Tool 345 Name="VCCLCompilerTool" 346 UsePrecompiledHeader="0" 347 PrecompiledHeaderThrough="" 348 /> 349 </FileConfiguration> 350 <FileConfiguration 1442 351 Name="Distribution|Win32" 1443 352 > … … 1494 403 </FileConfiguration> 1495 404 <FileConfiguration 1496 Name="OP5|Win32"1497 >1498 <Tool1499 Name="VCCLCompilerTool"1500 UsePrecompiledHeader="0"1501 PrecompiledHeaderThrough=""1502 />1503 </FileConfiguration>1504 <FileConfiguration1505 Name="OP5|x64"1506 >1507 <Tool1508 Name="VCCLCompilerTool"1509 UsePrecompiledHeader="0"1510 PrecompiledHeaderThrough=""1511 />1512 </FileConfiguration>1513 <FileConfiguration1514 405 Name="Debug|Itanium" 1515 406 > … … 1558 449 </File> 1559 450 <File 1560 RelativePath=".\CheckExternalScripts.cpp" 1561 > 1562 </File> 1563 <File 1564 RelativePath=".\CheckExternalScripts.def" 1565 > 1566 </File> 1567 <File 1568 RelativePath="..\..\include\NSCHelper.cpp" 1569 > 451 RelativePath=".\stdafx.cpp" 452 > 453 <FileConfiguration 454 Name="Release|Win32" 455 > 456 <Tool 457 Name="VCCLCompilerTool" 458 UsePrecompiledHeader="1" 459 /> 460 </FileConfiguration> 461 <FileConfiguration 462 Name="Release|x64" 463 > 464 <Tool 465 Name="VCCLCompilerTool" 466 UsePrecompiledHeader="1" 467 /> 468 </FileConfiguration> 1570 469 <FileConfiguration 1571 470 Name="Debug|Win32" … … 1573 472 <Tool 1574 473 Name="VCCLCompilerTool" 1575 UsePrecompiledHeader="0" 1576 PrecompiledHeaderThrough="" 474 UsePrecompiledHeader="1" 1577 475 /> 1578 476 </FileConfiguration> … … 1582 480 <Tool 1583 481 Name="VCCLCompilerTool" 1584 UsePrecompiledHeader="0" 1585 PrecompiledHeaderThrough="" 1586 /> 1587 </FileConfiguration> 482 UsePrecompiledHeader="1" 483 /> 484 </FileConfiguration> 485 <FileConfiguration 486 Name="Distribution|Win32" 487 > 488 <Tool 489 Name="VCCLCompilerTool" 490 UsePrecompiledHeader="1" 491 /> 492 </FileConfiguration> 493 <FileConfiguration 494 Name="Distribution|x64" 495 > 496 <Tool 497 Name="VCCLCompilerTool" 498 UsePrecompiledHeader="1" 499 /> 500 </FileConfiguration> 501 <FileConfiguration 502 Name="Nightly|Win32" 503 > 504 <Tool 505 Name="VCCLCompilerTool" 506 UsePrecompiledHeader="1" 507 /> 508 </FileConfiguration> 509 <FileConfiguration 510 Name="Nightly|x64" 511 > 512 <Tool 513 Name="VCCLCompilerTool" 514 UsePrecompiledHeader="1" 515 /> 516 </FileConfiguration> 517 <FileConfiguration 518 Name="Debug-MemCheck|Win32" 519 > 520 <Tool 521 Name="VCCLCompilerTool" 522 UsePrecompiledHeader="1" 523 /> 524 </FileConfiguration> 525 <FileConfiguration 526 Name="Debug-MemCheck|x64" 527 > 528 <Tool 529 Name="VCCLCompilerTool" 530 UsePrecompiledHeader="1" 531 /> 532 </FileConfiguration> 533 <FileConfiguration 534 Name="Debug|Itanium" 535 > 536 <Tool 537 Name="VCCLCompilerTool" 538 UsePrecompiledHeader="1" 539 /> 540 </FileConfiguration> 541 <FileConfiguration 542 Name="Release|Itanium" 543 > 544 <Tool 545 Name="VCCLCompilerTool" 546 UsePrecompiledHeader="1" 547 /> 548 </FileConfiguration> 549 <FileConfiguration 550 Name="Distribution|Itanium" 551 > 552 <Tool 553 Name="VCCLCompilerTool" 554 UsePrecompiledHeader="1" 555 /> 556 </FileConfiguration> 557 <FileConfiguration 558 Name="Nightly|Itanium" 559 > 560 <Tool 561 Name="VCCLCompilerTool" 562 UsePrecompiledHeader="1" 563 /> 564 </FileConfiguration> 565 <FileConfiguration 566 Name="Debug-MemCheck|Itanium" 567 > 568 <Tool 569 Name="VCCLCompilerTool" 570 UsePrecompiledHeader="1" 571 /> 572 </FileConfiguration> 573 </File> 574 <File 575 RelativePath="..\..\include\utils.cpp" 576 > 1588 577 <FileConfiguration 1589 578 Name="Release|Win32" … … 1605 594 </FileConfiguration> 1606 595 <FileConfiguration 596 Name="Debug|Win32" 597 > 598 <Tool 599 Name="VCCLCompilerTool" 600 UsePrecompiledHeader="0" 601 PrecompiledHeaderThrough="" 602 /> 603 </FileConfiguration> 604 <FileConfiguration 605 Name="Debug|x64" 606 > 607 <Tool 608 Name="VCCLCompilerTool" 609 UsePrecompiledHeader="0" 610 PrecompiledHeaderThrough="" 611 /> 612 </FileConfiguration> 613 <FileConfiguration 1607 614 Name="Distribution|Win32" 1608 615 > … … 1651 658 <FileConfiguration 1652 659 Name="Debug-MemCheck|x64" 1653 >1654 <Tool1655 Name="VCCLCompilerTool"1656 UsePrecompiledHeader="0"1657 PrecompiledHeaderThrough=""1658 />1659 </FileConfiguration>1660 <FileConfiguration1661 Name="OP5|Win32"1662 >1663 <Tool1664 Name="VCCLCompilerTool"1665 UsePrecompiledHeader="0"1666 PrecompiledHeaderThrough=""1667 />1668 </FileConfiguration>1669 <FileConfiguration1670 Name="OP5|x64"1671 >1672 <Tool1673 Name="VCCLCompilerTool"1674 UsePrecompiledHeader="0"1675 PrecompiledHeaderThrough=""1676 />1677 </FileConfiguration>1678 <FileConfiguration1679 Name="Debug|Itanium"1680 >1681 <Tool1682 Name="VCCLCompilerTool"1683 UsePrecompiledHeader="0"1684 PrecompiledHeaderThrough=""1685 />1686 </FileConfiguration>1687 <FileConfiguration1688 Name="Release|Itanium"1689 >1690 <Tool1691 Name="VCCLCompilerTool"1692 UsePrecompiledHeader="0"1693 PrecompiledHeaderThrough=""1694 />1695 </FileConfiguration>1696 <FileConfiguration1697 Name="Distribution|Itanium"1698 >1699 <Tool1700 Name="VCCLCompilerTool"1701 UsePrecompiledHeader="0"1702 PrecompiledHeaderThrough=""1703 />1704 </FileConfiguration>1705 <FileConfiguration1706 Name="Nightly|Itanium"1707 >1708 <Tool1709 Name="VCCLCompilerTool"1710 UsePrecompiledHeader="0"1711 PrecompiledHeaderThrough=""1712 />1713 </FileConfiguration>1714 <FileConfiguration1715 Name="Debug-MemCheck|Itanium"1716 >1717 <Tool1718 Name="VCCLCompilerTool"1719 UsePrecompiledHeader="0"1720 PrecompiledHeaderThrough=""1721 />1722 </FileConfiguration>1723 </File>1724 <File1725 RelativePath=".\stdafx.cpp"1726 >1727 <FileConfiguration1728 Name="Debug|Win32"1729 >1730 <Tool1731 Name="VCCLCompilerTool"1732 UsePrecompiledHeader="1"1733 />1734 </FileConfiguration>1735 <FileConfiguration1736 Name="Debug|x64"1737 >1738 <Tool1739 Name="VCCLCompilerTool"1740 UsePrecompiledHeader="1"1741 />1742 </FileConfiguration>1743 <FileConfiguration1744 Name="Release|Win32"1745 >1746 <Tool1747 Name="VCCLCompilerTool"1748 UsePrecompiledHeader="1"1749 />1750 </FileConfiguration>1751 <FileConfiguration1752 Name="Release|x64"1753 >1754 <Tool1755 Name="VCCLCompilerTool"1756 UsePrecompiledHeader="1"1757 />1758 </FileConfiguration>1759 <FileConfiguration1760 Name="Distribution|Win32"1761 >1762 <Tool1763 Name="VCCLCompilerTool"1764 UsePrecompiledHeader="1"1765 />1766 </FileConfiguration>1767 <FileConfiguration1768 Name="Distribution|x64"1769 >1770 <Tool1771 Name="VCCLCompilerTool"1772 UsePrecompiledHeader="1"1773 />1774 </FileConfiguration>1775 <FileConfiguration1776 Name="Nightly|Win32"1777 >1778 <Tool1779 Name="VCCLCompilerTool"1780 UsePrecompiledHeader="1"1781 />1782 </FileConfiguration>1783 <FileConfiguration1784 Name="Nightly|x64"1785 >1786 <Tool1787 Name="VCCLCompilerTool"1788 UsePrecompiledHeader="1"1789 />1790 </FileConfiguration>1791 <FileConfiguration1792 Name="Debug-MemCheck|Win32"1793 >1794 <Tool1795 Name="VCCLCompilerTool"1796 UsePrecompiledHeader="1"1797 />1798 </FileConfiguration>1799 <FileConfiguration1800 Name="Debug-MemCheck|x64"1801 >1802 <Tool1803 Name="VCCLCompilerTool"1804 UsePrecompiledHeader="1"1805 />1806 </FileConfiguration>1807 <FileConfiguration1808 Name="OP5|Win32"1809 >1810 <Tool1811 Name="VCCLCompilerTool"1812 UsePrecompiledHeader="1"1813 />1814 </FileConfiguration>1815 <FileConfiguration1816 Name="OP5|x64"1817 >1818 <Tool1819 Name="VCCLCompilerTool"1820 UsePrecompiledHeader="1"1821 />1822 </FileConfiguration>1823 <FileConfiguration1824 Name="Debug|Itanium"1825 >1826 <Tool1827 Name="VCCLCompilerTool"1828 UsePrecompiledHeader="1"1829 />1830 </FileConfiguration>1831 <FileConfiguration1832 Name="Release|Itanium"1833 >1834 <Tool1835 Name="VCCLCompilerTool"1836 UsePrecompiledHeader="1"1837 />1838 </FileConfiguration>1839 <FileConfiguration1840 Name="Distribution|Itanium"1841 >1842 <Tool1843 Name="VCCLCompilerTool"1844 UsePrecompiledHeader="1"1845 />1846 </FileConfiguration>1847 <FileConfiguration1848 Name="Nightly|Itanium"1849 >1850 <Tool1851 Name="VCCLCompilerTool"1852 UsePrecompiledHeader="1"1853 />1854 </FileConfiguration>1855 <FileConfiguration1856 Name="Debug-MemCheck|Itanium"1857 >1858 <Tool1859 Name="VCCLCompilerTool"1860 UsePrecompiledHeader="1"1861 />1862 </FileConfiguration>1863 </File>1864 <File1865 RelativePath="..\..\include\utils.cpp"1866 >1867 <FileConfiguration1868 Name="Debug|Win32"1869 >1870 <Tool1871 Name="VCCLCompilerTool"1872 UsePrecompiledHeader="0"1873 PrecompiledHeaderThrough=""1874 />1875 </FileConfiguration>1876 <FileConfiguration1877 Name="Debug|x64"1878 >1879 <Tool1880 Name="VCCLCompilerTool"1881 UsePrecompiledHeader="0"1882 PrecompiledHeaderThrough=""1883 />1884 </FileConfiguration>1885 <FileConfiguration1886 Name="Release|Win32"1887 >1888 <Tool1889 Name="VCCLCompilerTool"1890 UsePrecompiledHeader="0"1891 PrecompiledHeaderThrough=""1892 />1893 </FileConfiguration>1894 <FileConfiguration1895 Name="Release|x64"1896 >1897 <Tool1898 Name="VCCLCompilerTool"1899 UsePrecompiledHeader="0"1900 PrecompiledHeaderThrough=""1901 />1902 </FileConfiguration>1903 <FileConfiguration1904 Name="Distribution|Win32"1905 >1906 <Tool1907 Name="VCCLCompilerTool"1908 UsePrecompiledHeader="0"1909 PrecompiledHeaderThrough=""1910 />1911 </FileConfiguration>1912 <FileConfiguration1913 Name="Distribution|x64"1914 >1915 <Tool1916 Name="VCCLCompilerTool"1917 UsePrecompiledHeader="0"1918 PrecompiledHeaderThrough=""1919 />1920 </FileConfiguration>1921 <FileConfiguration1922 Name="Nightly|Win32"1923 >1924 <Tool1925 Name="VCCLCompilerTool"1926 UsePrecompiledHeader="0"1927 PrecompiledHeaderThrough=""1928 />1929 </FileConfiguration>1930 <FileConfiguration1931 Name="Nightly|x64"1932 >1933 <Tool1934 Name="VCCLCompilerTool"1935 UsePrecompiledHeader="0"1936 PrecompiledHeaderThrough=""1937 />1938 </FileConfiguration>1939 <FileConfiguration1940 Name="Debug-MemCheck|Win32"1941 >1942 <Tool1943 Name="VCCLCompilerTool"1944 UsePrecompiledHeader="0"1945 PrecompiledHeaderThrough=""1946 />1947 </FileConfiguration>1948 <FileConfiguration1949 Name="Debug-MemCheck|x64"1950 >1951 <Tool1952 Name="VCCLCompilerTool"1953 UsePrecompiledHeader="0"1954 PrecompiledHeaderThrough=""1955 />1956 </FileConfiguration>1957 <FileConfiguration1958 Name="OP5|Win32"1959 >1960 <Tool1961 Name="VCCLCompilerTool"1962 UsePrecompiledHeader="0"1963 PrecompiledHeaderThrough=""1964 />1965 </FileConfiguration>1966 <FileConfiguration1967 Name="OP5|x64"1968 660 > 1969 661 <Tool -
trunk/modules/CheckExternalScripts/CheckExternalScripts.cpp
r201 r202 67 67 68 68 bool CheckExternalScripts::loadModule(NSCAPI::moduleLoadMode mode) { 69 70 71 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {72 NSC_DEBUG_MSG(_T("Using compatiblity mode in: External Scripts"));73 74 #define EXTSCRIPT_SECTION_TITLE _T("External Script")75 #define EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS _T("allow_arguments")76 #define EXTSCRIPT_SETTINGS_ALLOW_NASTY_META _T("allow_nasty_meta_chars")77 #define EXTSCRIPT_SETTINGS_TIMEOUT _T("command_timeout")78 #define EXTSCRIPT_SETTINGS_SCRIPTDIR _T("script_dir")79 #define EXTSCRIPT_SCRIPT_SECTION_TITLE _T("External Scripts")80 #define EXTSCRIPT_ALIAS_SECTION_TITLE _T("External Alias")81 82 SETTINGS_MAP_KEY_A(external_scripts::TIMEOUT, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT);83 SETTINGS_MAP_KEY_A(external_scripts::SCRIPT_PATH, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR);84 SETTINGS_MAP_KEY_A(external_scripts::ALLOW_ARGS, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS);85 SETTINGS_MAP_KEY_A(external_scripts::ALLOW_NASTY, EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_ALLOW_NASTY_META);86 87 SETTINGS_MAP_SECTION_A(external_scripts::SCRIPT_SECTION,EXTSCRIPT_SCRIPT_SECTION_TITLE);88 SETTINGS_MAP_SECTION_A(external_scripts::ALIAS_SECTION,EXTSCRIPT_ALIAS_SECTION_TITLE);89 }90 69 SETTINGS_REG_PATH(external_scripts::SECTION); 91 70 SETTINGS_REG_PATH(external_scripts::SCRIPT_SECTION); … … 164 143 165 144 for (;cit2!=arr.end();cit2++,i++) { 166 if ( (!isAlias) && (NSCModuleHelper::getSettingsInt(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_ALLOW_NASTY_META, EXTSCRIPT_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0)) {145 if (isAlias || allowNasty_) { 167 146 if ((*cit2).find_first_of(NASTY_METACHARS) != std::wstring::npos) { 168 147 NSC_LOG_ERROR(_T("Request string contained illegal metachars!")); -
trunk/modules/CheckSystem/CheckSystem.cpp
r201 r202 64 64 * @return true 65 65 */ 66 bool CheckSystem::loadModule() { 67 pdhThread.createThread(); 68 std::wstring wantedMethod = NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_ENUMPROC_METHOD, C_SYSTEM_ENUMPROC_METHOD_DEFAULT); 69 CEnumProcess tmp; 70 int method = tmp.GetAvailableMethods(); 71 if (wantedMethod == C_SYSTEM_ENUMPROC_METHOD_AUTO) { 72 OSVERSIONINFO osVer = systemInfo::getOSVersion(); 73 /* 74 if (systemInfo::isBelowNT4(osVer)) { 75 NSC_DEBUG_MSG_STD(_T("Autodetected NT4<, using PSAPI process enumeration.")); 76 if (method == (method|ENUM_METHOD::PSAPI)) { 77 processMethod_ = ENUM_METHOD::PSAPI; 78 } else { 79 NSC_LOG_ERROR_STD(_T("PSAPI method not available, since you are on NT4 you need to install \"Platform SDK Redistributable: PSAPI for Windows NT\" from Microsoft.")); 80 NSC_LOG_ERROR_STD(_T("Try this URL: http://www.microsoft.com/downloads/details.aspx?FamilyID=3d1fbaed-d122-45cf-9d46-1cae384097ac")); 81 } 82 } else if (systemInfo::isAboveW2K(osVer)) { 83 NSC_DEBUG_MSG_STD(_T("Autodetected W2K>, using TOOLHELP process enumeration.")); 84 if (method == (method|ENUM_METHOD::TOOLHELP)) { 85 processMethod_ = ENUM_METHOD::TOOLHELP; 86 } else { 87 NSC_LOG_ERROR_STD(_T("TOOLHELP was not available, since you are on > W2K you need top manually override the ") C_SYSTEM_ENUMPROC_METHOD _T("option in NSC:ini.")); 88 } 89 } else { 90 */ 91 NSC_DEBUG_MSG_STD(_T("Autodetected failed, using PSAPI process enumeration.")); 92 processMethod_ = ENUM_METHOD::PSAPI; 93 if (method == (method|ENUM_METHOD::PSAPI)) { 94 processMethod_ = ENUM_METHOD::PSAPI; 95 } else { 96 NSC_LOG_ERROR_STD(_T("PSAPI method not availabletry installing \"Platform SDK Redistributable: PSAPI for Windows NT\" from Microsoft.")); 97 NSC_LOG_ERROR_STD(_T("Try this URL: http://www.microsoft.com/downloads/details.aspx?FamilyID=3d1fbaed-d122-45cf-9d46-1cae384097ac")); 98 } 99 //} 100 } else if (wantedMethod == C_SYSTEM_ENUMPROC_METHOD_PSAPI) { 101 NSC_DEBUG_MSG_STD(_T("Using PSAPI method.")); 102 if (method == (method|ENUM_METHOD::PSAPI)) { 103 processMethod_ = ENUM_METHOD::PSAPI; 104 } else { 105 NSC_LOG_ERROR_STD(_T("PSAPI method not available, check ") C_SYSTEM_ENUMPROC_METHOD _T(" option.")); 106 } 107 } else { 108 NSC_LOG_ERROR_STD(_T("TOOLHELP method has been removed sine we dont really want to support w9x ") C_SYSTEM_ENUMPROC_METHOD _T(".")); 109 } 110 bool CheckSystem::loadModule() { 111 pdhThread.createThread(); 66 112 67 bool CheckSystem::loadModule(NSCAPI::moduleLoadMode mode) { 113 68 if (mode == NSCAPI::normalStart) { 114 69 pdhThread.createThread(); 115 }116 std::wstring wantedMethod = SETTINGS_GET_STRING(check_system::PROC_ENUM);117 if (wantedMethod == settings::check_system::PROC_ENUM_TH) {118 NSC_LOG_ERROR_STD(_T("TOOLHELP method has been removed sine we dont really want to support w9x."));119 } else {120 CEnumProcess tmp;121 int method = tmp.GetAvailableMethods();122 NSC_DEBUG_MSG_STD(_T("Autodetected failed, using PSAPI process enumeration."));123 if (method == (method|ENUM_METHOD::PSAPI)) {124 processMethod_ = ENUM_METHOD::PSAPI;125 } else {126 NSC_LOG_ERROR_STD(_T("PSAPI method not available. Try installing \"Platform SDK Redistributable: PSAPI for Windows NT\" from Microsoft."));127 NSC_LOG_ERROR_STD(_T("Try this URL: http://www.microsoft.com/downloads/details.aspx?FamilyID=3d1fbaed-d122-45cf-9d46-1cae384097ac"));128 }129 70 } 130 71 try { … … 136 77 NSCModuleHelper::registerCommand(_T("checkCounter"), _T("Check a PDH counter.")); 137 78 NSCModuleHelper::registerCommand(_T("listCounterInstances"), _T("List all instances for a counter.")); 138 139 79 } catch (NSCModuleHelper::NSCMHExcpetion &e) { 140 80 NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_); -
trunk/modules/CheckSystem/PDHCollector.cpp
r201 r202 20 20 #include "stdafx.h" 21 21 #include "PDHCollector.h" 22 #include <Settings.h>23 22 #include <sysinfo.h> 24 23 … … 109 108 memCb = _T("\\") + pdh.lookupIndex(4) + _T("\\") + pdh.lookupIndex(26); 110 109 } else { 111 settings_core settings;110 //settings_core settings; 112 111 NSC_LOG_ERROR_STD(_T("REPORT THIS: counters.defs file handling has not been (re)added!!!")); 113 112 return false; -
trunk/modules/DebugLogMetrics/DebugLogMetrics.cpp
r201 r202 38 38 DebugLogMetrics::~DebugLogMetrics() {} 39 39 40 bool DebugLogMetrics::loadModule( ) {41 timeout =NSCModuleHelper::getSettingsInt(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT ,EXTSCRIPT_SETTINGS_TIMEOUT_DEFAULT);42 scriptDirectory_ = NSCModuleHelper::getSettingsString(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR ,EXTSCRIPT_SETTINGS_SCRIPTDIR_DEFAULT);40 bool DebugLogMetrics::loadModule(NSCAPI::moduleLoadMode mode) { 41 // timeout = SETTINGS_GET_INT() NSCModuleHelper::getSettingsInt(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_TIMEOUT ,EXTSCRIPT_SETTINGS_TIMEOUT_DEFAULT); 42 // scriptDirectory_ = NSCModuleHelper::getSettingsString(EXTSCRIPT_SECTION_TITLE, EXTSCRIPT_SETTINGS_SCRIPTDIR ,EXTSCRIPT_SETTINGS_SCRIPTDIR_DEFAULT); 43 43 root_ = NSCModuleHelper::getBasePath(); 44 44 pdhThread.createThread(_T("NSClient++")); -
trunk/modules/DebugLogMetrics/DebugLogMetrics.h
r201 r202 36 36 command_list commands; 37 37 command_list alias; 38 unsigned int timeout;39 std::wstring scriptDirectory_;38 // unsigned int timeout; 39 // std::wstring scriptDirectory_; 40 40 std::wstring root_; 41 41 PDHCollectorThread pdhThread; … … 45 45 virtual ~DebugLogMetrics(); 46 46 // Module calls 47 bool loadModule( );47 bool loadModule(NSCAPI::moduleLoadMode mode); 48 48 bool unloadModule(); 49 49 -
trunk/modules/DebugLogMetrics/PDHCollector.cpp
r201 r202 20 20 #include "stdafx.h" 21 21 #include "PDHCollector.h" 22 #include <Settings.h>23 22 #include <sysinfo.h> 24 23 … … 40 39 if (!systemInfo::isNTBased(osVer)) { 41 40 NSC_LOG_ERROR_STD(_T("Detected Windows 3.x or Windows 9x, PDH will be disabled.")); 42 NSC_LOG_ERROR_STD(_T("To manual set performance counters you need to first set ") C_SYSTEM_AUTODETECT_PDH _T("=0 in the config file, and then you also need to configure the various counter."));43 41 return false; 44 42 } … … 48 46 } 49 47 } catch (const systemInfo::SystemInfoException &e) { 50 NSC_LOG_ERROR_STD(_T("To manual set performance counters you need to first set ") C_SYSTEM_AUTODETECT_PDH _T("=0 in the config file, and then you also need to configure the various counter.")); 51 NSC_LOG_ERROR_STD(_T("The Error: ") + e.getError()); 48 NSC_LOG_ERROR_STD(_T("Unable to detect operating system: ") + e.getError()); 52 49 return false; 53 50 } catch (...) { 54 NSC_LOG_ERROR_STD(_T("To manual set performance counters you need to first set ") C_SYSTEM_AUTODETECT_PDH _T("=0 in the config file, and then you also need to configure the various counter.")); 55 NSC_LOG_ERROR_STD(_T("The Error: UNKNOWN_EXCEPTION")); 51 NSC_LOG_ERROR_STD(_T("Unable to detect operating system: <UNKNOWN EXCEPTION>")); 56 52 return false; 57 53 } -
trunk/modules/FileLogger/FileLogger.cpp
r201 r202 71 71 std::wstring FileLogger::getFileName() { 72 72 if (file_.empty()) { 73 file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);74 73 file_ = SETTINGS_GET_STRING(log::FILENAME); 75 74 if (file_.empty()) … … 92 91 93 92 try { 94 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {95 #define LOG_SECTION_TITLE _T("log")96 #define LOG_FILENAME _T("file")97 #define LOG_DATEMASK _T("date_mask")98 NSC_DEBUG_MSG(_T("Using compatibility mode in: LOGGING module"));99 100 SETTINGS_MAP_KEY_A(log::FILENAME, LOG_SECTION_TITLE, LOG_FILENAME);101 SETTINGS_MAP_KEY_A(log::DATEMASK, LOG_SECTION_TITLE, LOG_DATEMASK);102 SETTINGS_MAP_KEY_A(log::DEBUG_LOG, LOG_SECTION_TITLE, _T("debug"));103 }104 93 SETTINGS_REG_PATH(log::SECTION); 105 94 -
trunk/modules/LUAScript/LUAScript.cpp
r201 r202 44 44 //LUA Scripts 45 45 try { 46 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {47 NSC_DEBUG_MSG(_T("Using compatiblity mode in: EventLog Checker"));48 #define LUA_SCRIPT_SECTION_TITLE _T("LUA Scripts")49 SETTINGS_MAP_SECTION_A(lua::SECTION, LUA_SCRIPT_SECTION_TITLE);50 }51 46 SETTINGS_REG_PATH(lua::SECTION); 52 47 } catch (NSCModuleHelper::NSCMHExcpetion &e) { -
trunk/modules/NRPEClient/NRPEClient.cpp
r201 r202 117 117 118 118 std::wstring args = (*cit).second.arguments; 119 if ( NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT) == 1) {119 if (SETTINGS_GET_BOOL(nrpe::ALLOW_ARGS) == 1) { 120 120 arrayBuffer::arrayList arr = arrayBuffer::arrayBuffer2list(argLen, char_args); 121 121 arrayBuffer::arrayList::const_iterator cit2 = arr.begin(); … … 123 123 124 124 for (;cit2!=arr.end();cit2++,i++) { 125 if ( NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0) {125 if (SETTINGS_GET_INT(nrpe::ALLOW_NASTY) == 0) { 126 126 if ((*cit2).find_first_of(NASTY_METACHARS) != std::wstring::npos) { 127 127 NSC_LOG_ERROR(_T("Request string contained illegal metachars!")); -
trunk/modules/NRPEListener/NRPEListener.cpp
r201 r202 70 70 bool NRPEListener::loadModule(NSCAPI::moduleLoadMode mode) { 71 71 #ifdef USE_SSL 72 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {73 NSC_DEBUG_MSG(_T("Using compatiblity mode in: NRPE Module"));74 75 #define NRPE_SECTION_TITLE _T("NRPE")76 #define NRPE_SETTINGS_READ_TIMEOUT _T("socket_timeout")77 #define NRPE_SETTINGS_PORT _T("port")78 #define NRPE_SETTINGS_BINDADDR _T("bind_to_address")79 #define NRPE_SETTINGS_LISTENQUE _T("socket_back_log")80 #define NRPE_SETTINGS_USE_SSL _T("use_ssl")81 #define NRPE_SETTINGS_STRLEN _T("string_length")82 #define NRPE_SETTINGS_PERFDATA _T("performance_data")83 #define NRPE_HANDLER_SECTION_TITLE _T("NRPE Handlers")84 #define NRPE_SETTINGS_SCRIPTDIR _T("script_dir")85 #define NRPE_SETTINGS_TIMEOUT _T("command_timeout")86 #define NRPE_SETTINGS_ALLOW_ARGUMENTS _T("allow_arguments")87 #define NRPE_SETTINGS_ALLOW_NASTY_META _T("allow_nasty_meta_chars")88 89 SETTINGS_MAP_KEY_A(nrpe::PORT, NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT);90 SETTINGS_MAP_KEY_A(nrpe::BINDADDR, NRPE_SECTION_TITLE, NRPE_SETTINGS_BINDADDR);91 SETTINGS_MAP_KEY_A(nrpe::LISTENQUE, NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE);92 SETTINGS_MAP_KEY_A(nrpe::READ_TIMEOUT, NRPE_SECTION_TITLE, NRPE_SETTINGS_READ_TIMEOUT);93 SETTINGS_MAP_KEY_A(nrpe::USE_SSL, NRPE_SECTION_TITLE, NRPE_SETTINGS_USE_SSL);94 SETTINGS_MAP_KEY_A(nrpe::PAYLOAD_LENGTH,NRPE_SECTION_TITLE, NRPE_SETTINGS_STRLEN);95 SETTINGS_MAP_KEY_A(nrpe::ALLOW_PERFDATA,NRPE_SECTION_TITLE, NRPE_SETTINGS_PERFDATA);96 SETTINGS_MAP_KEY_A(nrpe::SCRIPT_PATH, NRPE_SECTION_TITLE, NRPE_SETTINGS_SCRIPTDIR);97 SETTINGS_MAP_KEY_A(nrpe::CMD_TIMEOUT, NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT);98 SETTINGS_MAP_KEY_A(nrpe::ALLOW_ARGS, NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS);99 SETTINGS_MAP_KEY_A(nrpe::ALLOW_NASTY, NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META);100 101 SETTINGS_MAP_SECTION_A(nrpe::SECTION_HANDLERS,NRPE_HANDLER_SECTION_TITLE);102 72 103 73 #else … … 106 76 } 107 77 #endif 108 noPerfData_ = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PERFDATA,NRPE_SETTINGS_PERFDATA_DEFAULT)==0;109 timeout = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT ,NRPE_SETTINGS_TIMEOUT_DEFAULT);110 socketTimeout_ = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_READ_TIMEOUT ,NRPE_SETTINGS_READ_TIMEOUT_DEFAULT);111 scriptDirectory_ = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_SCRIPTDIR ,NRPE_SETTINGS_SCRIPTDIR_DEFAULT);112 buffer_length_ = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_STRLEN, NRPE_SETTINGS_STRLEN_DEFAULT);113 114 78 SETTINGS_REG_KEY_I(nrpe::PORT); 115 79 SETTINGS_REG_KEY_S(nrpe::BINDADDR); 116 80 SETTINGS_REG_KEY_I(nrpe::LISTENQUE); 117 81 SETTINGS_REG_KEY_I(nrpe::READ_TIMEOUT); 118 SETTINGS_REG_KEY_B(nrpe:: USE_SSL);82 SETTINGS_REG_KEY_B(nrpe::KEYUSE_SSL); 119 83 SETTINGS_REG_KEY_I(nrpe::PAYLOAD_LENGTH); 120 84 SETTINGS_REG_KEY_B(nrpe::ALLOW_PERFDATA); … … 127 91 SETTINGS_REG_PATH(nrpe::SECTION_HANDLERS); 128 92 129 bUseSSL_ = SETTINGS_GET_BOOL(nrpe:: USE_SSL)==1;93 bUseSSL_ = SETTINGS_GET_BOOL(nrpe::KEYUSE_SSL)==1; 130 94 noPerfData_ = SETTINGS_GET_INT(nrpe::ALLOW_PERFDATA)==0; 131 95 timeout = SETTINGS_GET_INT(nrpe::CMD_TIMEOUT); … … 138 102 NSC_DEBUG_MSG_STD(_T("Non-standard buffer length (hope you have recompiled check_nrpe changing #define MAX_PACKETBUFFER_LENGTH = ") + strEx::itos(buffer_length_)); 139 103 NSC_DEBUG_MSG_STD(_T("Loading all commands (from NRPE)")); 140 std::list<std::wstring> commands = NSCModuleHelper::getSettingsSection( NRPE_HANDLER_SECTION_TITLE);104 std::list<std::wstring> commands = NSCModuleHelper::getSettingsSection(settings::nrpe::SECTION_HANDLERS_PATH); 141 105 std::list<std::wstring>::const_iterator it; 142 106 for (it = commands.begin(); it != commands.end(); ++it) { … … 149 113 command_name = (*it); 150 114 } 151 std::wstring s = NSCModuleHelper::getSettingsString( NRPE_HANDLER_SECTION_TITLE, (*it), _T(""));115 std::wstring s = NSCModuleHelper::getSettingsString(settings::nrpe::SECTION_HANDLERS_PATH, (*it), _T("")); 152 116 if (command_name.empty() || s.empty()) { 153 117 NSC_LOG_ERROR_STD(_T("Invalid command definition: ") + (*it)); … … 168 132 try { 169 133 NSC_DEBUG_MSG_STD(_T("Starting NRPE socket...")); 170 unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT); 171 std::wstring host = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_BINDADDR, NRPE_SETTINGS_BINDADDR_DEFAULT); 172 unsigned int backLog = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE, NRPE_SETTINGS_LISTENQUE_DEFAULT); 134 unsigned short port = SETTINGS_GET_INT(nrpe::PORT); 135 std::wstring host = SETTINGS_GET_STRING(nrpe::BINDADDR); 136 unsigned int backLog = SETTINGS_GET_INT(nrpe::LISTENQUE); 137 if (mode == NSCAPI::normalStart) { 173 138 #ifdef USE_SSL 174 if (bUseSSL_) {175 socket_ssl_.setHandler(this);176 socket_ssl_.StartListener(host, port, backLog);177 } else {139 if (bUseSSL_) { 140 socket_ssl_.setHandler(this); 141 socket_ssl_.StartListener(host, port, backLog); 142 } else { 178 143 #else 179 {144 { 180 145 #endif 181 socket_.setHandler(this); 182 socket_.StartListener(host, port, backLog); 146 socket_.setHandler(this); 147 socket_.StartListener(host, port, backLog); 148 } 183 149 } 184 150 } catch (simpleSocket::SocketException e) { … … 198 164 return true; 199 165 } 166 200 167 bool NRPEListener::unloadModule() { 201 168 try { -
trunk/modules/NSCAAgent/NSCAAgent.cpp
r201 r202 58 58 bool NSCAAgent::loadModule(NSCAPI::moduleLoadMode mode) { 59 59 try { 60 61 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {62 NSC_DEBUG_MSG(_T("Using compatiblity mode in: NSCA module"));63 64 #define NSCA_AGENT_SECTION_TITLE _T("NSCA Agent")65 #define NSCA_CMD_SECTION_TITLE _T("NSCA Commands")66 67 #define NSCA_INTERVAL _T("interval")68 #define NSCA_HOSTNAME _T("hostname")69 #define NSCA_SERVER _T("nsca_host")70 #define NSCA_PORT _T("nsca_port")71 #define NSCA_ENCRYPTION _T("encryption_method")72 #define NSCA_PASSWORD _T("password")73 #define NSCA_DEBUG_THREADS _T("debug_threads")74 #define NSCA_CACHE_HOST _T("cache_hostname")75 76 SETTINGS_MAP_KEY_A(nsca::INTERVAL, NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL);77 SETTINGS_MAP_KEY_A(nsca::HOSTNAME, NSCA_AGENT_SECTION_TITLE, NSCA_HOSTNAME);78 SETTINGS_MAP_KEY_A(nsca::SERVER_HOST, NSCA_AGENT_SECTION_TITLE, NSCA_SERVER);79 SETTINGS_MAP_KEY_A(nsca::SERVER_PORT, NSCA_AGENT_SECTION_TITLE, NSCA_PORT);80 SETTINGS_MAP_KEY_A(nsca::ENCRYPTION, NSCA_AGENT_SECTION_TITLE, NSCA_ENCRYPTION);81 SETTINGS_MAP_KEY_A(nsca::PASSWORD, NSCA_AGENT_SECTION_TITLE, NSCA_PASSWORD);82 SETTINGS_MAP_KEY_A(nsca::THREADS, NSCA_AGENT_SECTION_TITLE, NSCA_DEBUG_THREADS);83 SETTINGS_MAP_KEY_A(nsca::CACHE_HOST, NSCA_AGENT_SECTION_TITLE, NSCA_CACHE_HOST);84 85 SETTINGS_MAP_SECTION_A(nsca::CMD_SECTION, NSCA_CMD_SECTION_TITLE);86 }87 60 88 61 SETTINGS_REG_PATH(nsca::SECTION); -
trunk/modules/NSCAAgent/NSCAThread.cpp
r201 r202 20 20 #include "stdafx.h" 21 21 #include "NSCAThread.h" 22 #include <Settings.h>23 22 24 23 #define REPORT_ERROR 0x01 … … 67 66 68 67 NSCAThread::NSCAThread() : hStopEvent_(NULL) { 69 std::wstring tmpstr = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_TIME_DELTA, NSCA_TIME_DELTA_DEFAULT);68 std::wstring tmpstr = SETTINGS_GET_STRING(nsca::TIME_DELTA_DEFAULT); 70 69 if (tmpstr[0] == '-' && tmpstr.size() > 2) 71 70 timeDelta_ = 0 - strEx::stoui_as_time(tmpstr.substr(1)); … … 76 75 timeDelta_ = timeDelta_ / 1000; 77 76 NSC_DEBUG_MSG_STD(_T("Time difference for NSCA server is: ") + strEx::itos(timeDelta_)); 78 checkIntervall_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL, NSCA_INTERVAL_DEFAULT);79 hostname_ = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_HOSTNAME, NSCA_HOSTNAME_DEFAULT);80 nscahost_ = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_SERVER, NSCA_SERVER_DEFAULT);81 nscaport_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_PORT, NSCA_PORT_DEFAULT);82 payload_length_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_STRLEN, NSCA_STRLEN_DEFAULT);83 read_timeout_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_READ_TIMEOUT, NSCA_READ_TIMEOUT_DEFAULT);84 std::wstring report = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_REPORT, NSCA_REPORT_DEFAULT);77 checkIntervall_ = SETTINGS_GET_INT(nsca::INTERVAL); 78 hostname_ = SETTINGS_GET_STRING(nsca::HOSTNAME); 79 nscahost_ = SETTINGS_GET_STRING(nsca::SERVER_HOST); 80 nscaport_ = SETTINGS_GET_INT(nsca::SERVER_PORT); 81 payload_length_ = SETTINGS_GET_INT(nsca::PAYLOAD_LENGTH); 82 read_timeout_ = SETTINGS_GET_INT(nsca::READ_TIMEOUT); 83 std::wstring report = SETTINGS_GET_STRING(nsca::REPORT_MODE); 85 84 report_ = parse_report_string(report); 86 85 NSC_DEBUG_MSG_STD(_T("Only reporting: ") + generate_report_string(report_)); 87 86 88 encryption_method_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_ENCRYPTION, NSCA_ENCRYPTION_DEFAULT); 89 password_ = strEx::wstring_to_string(NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_PASSWORD, NSCA_PASSWORD_DEFAULT)); 90 cacheNscaHost_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_CACHE_HOST, NSCA_CACHE_HOST_DEFAULT) == 1; 91 std::list<std::wstring> items = NSCModuleHelper::getSettingsSection(NSCA_CMD_SECTION_TITLE); 87 encryption_method_ = SETTINGS_GET_INT(nsca::ENCRYPTION); 88 password_ = strEx::wstring_to_string(SETTINGS_GET_STRING(nsca::PASSWORD)); 89 cacheNscaHost_ = SETTINGS_GET_INT(nsca::CACHE_HOST); 90 read_timeout_ = SETTINGS_GET_INT(nsca::READ_TIMEOUT); 91 92 std::list<std::wstring> items = NSCModuleHelper::getSettingsSection(settings::nsca::CMD_SECTION_TITLE); 92 93 for (std::list<std::wstring>::const_iterator cit = items.begin(); cit != items.end(); ++cit) { 93 94 addCommand(*cit); -
trunk/modules/NSClientListener/NSClientListener.cpp
r201 r202 60 60 61 61 bool NSClientListener::loadModule(NSCAPI::moduleLoadMode mode) { 62 if (SETTINGS_GET_BOOL(settings_def::COMPATIBLITY)) {63 NSC_DEBUG_MSG(_T("Using compatiblity mode in: NSClientListener"));64 #define NSCLIENT_SECTION_TITLE _T("NSClient")65 #define NSCLIENT_SETTINGS_PORT _T("port")66 #define NSCLIENT_SETTINGS_VERSION _T("version")67 #define NSCLIENT_SETTINGS_BINDADDR _T("bind_to_address")68 #define NSCLIENT_SETTINGS_LISTENQUE _T("socket_back_log")69 #define NSCLIENT_SETTINGS_READ_TIMEOUT _T("socket_timeout")70 71 SETTINGS_MAP_KEY_A(nsclient::PORT, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT);72 SETTINGS_MAP_KEY_A(nsclient::VERSION, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_VERSION);73 SETTINGS_MAP_KEY_A(nsclient::BINDADDR, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR);74 SETTINGS_MAP_KEY_A(nsclient::LISTENQUE, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_LISTENQUE);75 SETTINGS_MAP_KEY_A(nsclient::READ_TIMEOUT, NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_READ_TIMEOUT);76 }77 62 SETTINGS_REG_PATH(nsclient::SECTION); 78 63 SETTINGS_REG_KEY_I(nsclient::PORT); -
trunk/release-build.bat
r201 r202 3 3 4 4 SET _ERROR= 5 SET w32=0 6 SET x64=0 7 SET IA64=0 8 SET hdr=0 9 SET src=0 10 SET clean=0 11 SET upload=0 5 12 echo Starting build > build.log 6 13 14 if "%1" == "" goto args_build_all 15 16 :args_loop 17 if "%1" == "" goto args_done 18 if "%1" == "w32" set w32=1 19 if "%1" == "x64" set x64=1 20 if "%1" == "hdr" set hdr=1 21 if "%1" == "src" set hdr=1 22 if "%1" == "clean" set clean=1 23 if "%1" == "upload" set upload=1 24 shift 25 goto args_loop 26 27 :args_build_all 28 echo ### BUILDING ALL ### : %1 -- 29 SET w32=1 30 SET x64=1 31 SET IA64=1 32 SET hdr=1 33 SET src=1 34 35 :args_done 36 37 38 if not "%clean%" == "1" goto no_build_clean 39 @del/S/Q stage 40 @del/S/Q bjam-tmp-build 41 @del/S/Q bin 42 :no_build_clean 43 44 if not "%hdr%" == "1" goto no_build_hdr 7 45 echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log 8 46 %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers 9 47 if %ERRORLEVEL% == -1 goto :error 10 48 echo :: Result: %ERRORLEVEL% >> build.log 49 :no_build_hdr 11 50 51 if not "%src%" == "1" goto no_build_src 12 52 echo %jam% --toolset=msvc source-archive >> build.log 13 53 %jam% --toolset=msvc source-archive 14 54 if %ERRORLEVEL% == -1 goto :error 15 55 echo :: Result: %ERRORLEVEL% >> build.log 56 :no_build_src 16 57 58 if not "%w32%" == "1" goto no_build_x86 17 59 call :build_one address-model=32 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 18 60 IF DEFINED _ERROR goto :error 61 :no_build_x86 62 63 if not "%x64%" == "1" goto no_build_x64 19 64 call :build_one address-model=64 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%" 20 65 IF DEFINED _ERROR goto :error 66 :no_build_x64 21 67 rem call build.bat runtime-link=static variant=release architecture=ia64 --library-path=%TARGET_LIB_IA64_DIR% 68 69 70 if not "%upload%" == "1" goto no_build_upload 71 pscp.exe "stage\archive\*.zip" "stage\installer\*.msi" nscp@nsclient.org:/var/nsclient/www/files/nightly/ 72 :no_build_upload 22 73 23 74 echo ************* -
trunk/service/NSClient++-2005.vcproj
r201 r202 2693 2693 </File> 2694 2694 <File 2695 RelativePath=".\include\INISettings.h"2696 >2697 </File>2698 <File2699 2695 RelativePath=".\include\Mutex.h" 2700 2696 > … … 2729 2725 </File> 2730 2726 <File 2731 RelativePath=".\include\OLDSettings.hpp"2732 >2733 </File>2734 <File2735 2727 RelativePath=".\include\PDHCounter.h" 2736 2728 > 2737 2729 </File> 2738 2730 <File 2739 RelativePath=".\include\REGSettings.h"2740 >2741 </File>2742 <File2743 2731 RelativePath=".\include\remote_processes.hpp" 2744 2732 > … … 2753 2741 </File> 2754 2742 <File 2755 RelativePath=".\include\Settings.h" 2743 RelativePath=".\include\settings\Settings.h" 2744 > 2745 </File> 2746 <File 2747 RelativePath=".\include\settings\settings_ini.hpp" 2748 > 2749 </File> 2750 <File 2751 RelativePath=".\include\settings\settings_old.hpp" 2752 > 2753 </File> 2754 <File 2755 RelativePath=".\include\settings\settings_registry.hpp" 2756 2756 > 2757 2757 </File> … … 3110 3110 CommandLine="echo Copying $(InputFileName)...
cmd /c "copy "$(InputDir)\$(InputFileName)" "$(TargetDir)""
" 3111 3111 Outputs="$(TargetDir)$(InputFileName)" 3112 />3113 </FileConfiguration>3114 </File>3115 <File3116 RelativePath=".\Doxyfile"3117 >3118 <FileConfiguration3119 Name="Release|Win32"3120 ExcludedFromBuild="true"3121 >3122 <Tool3123 Name="VCCustomBuildTool"3124 CommandLine="doxygen.exe $(InputPath)
"3125 Outputs=".\Doc"3126 />3127 </FileConfiguration>3128 <FileConfiguration3129 Name="Release|x64"3130 ExcludedFromBuild="true"3131 >3132 <Tool3133 Name="VCCustomBuildTool"3134 CommandLine="doxygen.exe $(InputPath)
"3135 Outputs=".\Doc"3136 />3137 </FileConfiguration>3138 <FileConfiguration3139 Name="Debug|Win32"3140 >3141 <Tool3142 Name="VCCustomBuildTool"3143 CommandLine="doxygen.exe $(InputPath)
"3144 Outputs="html"3145 />3146 </FileConfiguration>3147 <FileConfiguration3148 Name="Debug|x64"3149 ExcludedFromBuild="true"3150 >3151 <Tool3152 Name="VCCustomBuildTool"3153 CommandLine="doxygen.exe $(InputPath)
"3154 />3155 </FileConfiguration>3156 <FileConfiguration3157 Name="Distribution|Win32"3158 ExcludedFromBuild="true"3159 >3160 <Tool3161 Name="VCCustomBuildTool"3162 CommandLine="doxygen.exe $(InputPath)
"3163 Outputs=".\Doc"3164 />3165 </FileConfiguration>3166 <FileConfiguration3167 Name="Distribution|x64"3168 ExcludedFromBuild="true"3169 >3170 <Tool3171 Name="VCCustomBuildTool"3172 CommandLine="doxygen.exe $(InputPath)
"3173 Outputs=".\Doc"3174 />3175 </FileConfiguration>3176 <FileConfiguration3177 Name="Nightly|Win32"3178 ExcludedFromBuild="true"3179 >3180 <Tool3181 Name="VCCustomBuildTool"3182 CommandLine="doxygen.exe $(InputPath)
"3183 Outputs=".\Doc"3184 />3185 </FileConfiguration>3186 <FileConfiguration3187 Name="Nightly|x64"3188 ExcludedFromBuild="true"3189 >3190 <Tool3191 Name="VCCustomBuildTool"3192 CommandLine="doxygen.exe $(InputPath)
"3193 Outputs=".\Doc"3194 />3195 </FileConfiguration>3196 <FileConfiguration3197 Name="Debug-MemCheck|Win32"3198 ExcludedFromBuild="true"3199 >3200 <Tool3201 Name="VCCustomBuildTool"3202 CommandLine="doxygen.exe $(InputPath)
"3203 />3204 </FileConfiguration>3205 <FileConfiguration3206 Name="Debug-MemCheck|x64"3207 ExcludedFromBuild="true"3208 >3209 <Tool3210 Name="VCCustomBuildTool"3211 CommandLine="doxygen.exe $(InputPath)
"3212 />3213 </FileConfiguration>3214 <FileConfiguration3215 Name="OP5|Win32"3216 ExcludedFromBuild="true"3217 >3218 <Tool3219 Name="VCCustomBuildTool"3220 CommandLine="doxygen.exe $(InputPath)
"3221 Outputs=".\Doc"3222 />3223 </FileConfiguration>3224 <FileConfiguration3225 Name="OP5|x64"3226 ExcludedFromBuild="true"3227 >3228 <Tool3229 Name="VCCustomBuildTool"3230 CommandLine="doxygen.exe $(InputPath)
"3231 Outputs=".\Doc"3232 />3233 </FileConfiguration>3234 <FileConfiguration3235 Name="Release|Itanium"3236 ExcludedFromBuild="true"3237 >3238 <Tool3239 Name="VCCustomBuildTool"3240 CommandLine="doxygen.exe $(InputPath)
"3241 Outputs=".\Doc"3242 />3243 </FileConfiguration>3244 <FileConfiguration3245 Name="Debug|Itanium"3246 ExcludedFromBuild="true"3247 >3248 <Tool3249 Name="VCCustomBuildTool"3250 CommandLine="doxygen.exe $(InputPath)
"3251 />3252 </FileConfiguration>3253 <FileConfiguration3254 Name="Distribution|Itanium"3255 ExcludedFromBuild="true"3256 >3257 <Tool3258 Name="VCCustomBuildTool"3259 CommandLine="doxygen.exe $(InputPath)
"3260 Outputs=".\Doc"3261 />3262 </FileConfiguration>3263 <FileConfiguration3264 Name="Nightly|Itanium"3265 ExcludedFromBuild="true"3266 >3267 <Tool3268 Name="VCCustomBuildTool"3269 CommandLine="doxygen.exe $(InputPath)
"3270 Outputs=".\Doc"3271 />3272 </FileConfiguration>3273 <FileConfiguration3274 Name="Debug-MemCheck|Itanium"3275 ExcludedFromBuild="true"3276 >3277 <Tool3278 Name="VCCustomBuildTool"3279 CommandLine="doxygen.exe $(InputPath)
"3280 3112 /> 3281 3113 </FileConfiguration> -
trunk/service/NSClient++.cpp
r201 r202 16 16 #include <winsvc.h> 17 17 #include "NSClient++.h" 18 #include < Settings.h>18 #include <settings/Settings.h> 19 19 #include <charEx.h> 20 20 #include <Socket.h> … … 28 28 #include <crtdbg.h> 29 29 //#endif 30 #include <settings.h> 31 #include <INISettings.h> 32 #include <REGSettings.h> 33 #include <OLDSettings.hpp> 30 #include <settings/settings_ini.hpp> 31 #include <settings/settings_registry.hpp> 32 #include <settings/settings_old.hpp> 34 33 #include <Userenv.h> 35 34 #include <remote_processes.hpp> … … 72 71 73 72 static bool start(DWORD dwSessionId) { 74 std::wstring program = mainClient.getBasePath() + _T("\\") + S ettings::getInstance()->getString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_SYSTRAY_EXE, NSCLIENT_SETTINGS_SYSTRAY_EXE_DEFAULT);73 std::wstring program = mainClient.getBasePath() + _T("\\") + SETTINGS_GET_STRING(nsclient::SYSTRAY_EXE); 75 74 std::wstring cmdln = _T("\"") + program + _T("\" -channel __") + strEx::itos(dwSessionId) + _T("__"); 76 75 return tray_starter::startTrayHelper(dwSessionId, program, cmdln); … … 234 233 } 235 234 }; 236 237 235 238 236 #define SETTINGS_GET_BOOL(key) \ … … 303 301 throw SettingsException(_T("Undefined settings type: ") + SettingsCore::type_to_string(type)); 304 302 } 303 305 304 }; 306 305 307 306 typedef Singleton<NSCSettingsImpl> SettingsHandler; 307 308 308 // Alias to make handling "compatible" with old syntax 309 309 Settings::SettingsInterface* get_settings() { … … 316 316 SettingsHandler::destroyInstance(); 317 317 } 318 318 319 319 320 bool init_settings() { … … 322 323 get_core()->set_base(mainClient.getBasePath()); 323 324 get_core()->boot(_T("boot.ini")); 324 #define MAIN_MODULES_SECTION_OLD _T("modules")325 #define MAIN_SECTION_TITLE _T("Settings")326 #define MAIN_STRING_LENGTH _T("string_length")327 get_core()->add_mapping(MAIN_MODULES_SECTION, MAIN_MODULES_SECTION_OLD);328 get_core()->add_mapping(settings::settings_def::PAYLOAD_LEN_PATH, settings::settings_def::PAYLOAD_LEN, MAIN_SECTION_TITLE, MAIN_STRING_LENGTH);329 325 get_core()->register_key(SETTINGS_REG_KEY_I_GEN(settings_def::PAYLOAD_LEN, Settings::SettingsCore::key_integer)); 330 326 get_core()->register_key(SETTINGS_REG_KEY_S_GEN(protocol_def::ALLOWED_HOSTS, Settings::SettingsCore::key_string)); … … 995 991 } 996 992 try { 997 loadPlugins( );993 loadPlugins(boot?NSCAPI::normalStart:NSCAPI::dontStart); 998 994 } catch (...) { 999 995 LOG_ERROR_STD(_T("Unknown exception loading plugins")); … … 1143 1139 return mainClient.service_ctrl_ex(dwControl, dwEventType, lpEventData, lpContext); 1144 1140 } 1145 1146 1141 /** 1147 1142 * Forward this to the main service dispatcher helper class … … 1165 1160 tray_starter::start(dwSessionId); 1166 1161 } 1167 1168 1162 1169 1163 ////////////////////////////////////////////////////////////////////////// … … 1292 1286 } 1293 1287 1294 void NSClientT::loadPlugins( ) {1288 void NSClientT::loadPlugins(NSCAPI::moduleLoadMode mode) { 1295 1289 bool hasBroken = false; 1296 1290 { … … 1315 1309 LOG_ERROR_STD(_T("Could not load plugin: ") + (*it)->getModule()); 1316 1310 } 1311 } 1317 1312 } 1318 1313 for (pluginList::iterator it=plugins_.begin(); it != plugins_.end();) { 1319 1314 LOG_DEBUG_STD(_T("Loading plugin: ") + (*it)->getName() + _T("...")); 1320 1315 try { 1321 (*it)->load_plugin( );1316 (*it)->load_plugin(mode); 1322 1317 ++it; 1323 1318 } catch(NSPluginException e) { … … 1513 1508 void NSClientT::listPlugins() { 1514 1509 ReadLock readLock(&m_mutexRW, true, 10000); 1510 if (!readLock.IsLocked()) { 1511 LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex.")); 1512 return; 1513 } 1514 for (pluginList::iterator it=plugins_.begin(); it != plugins_.end(); ++it) { 1515 1515 try { 1516 std::wstring msg, perf; 1517 int returnCode = shared_client_->inject(command, arrayBuffer::arrayBuffer2string(argument, argLen, _T(" ")), L' ', true, msg, perf); 1518 NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, msg, returnCode); 1519 return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, perf, returnCode); 1520 } catch (nsclient_session::session_exception &e) { 1521 LOG_ERROR_STD(_T("Failed to inject remote command: ") + e.what()); 1522 int returnCode = NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, _T("Failed to inject remote command: ") + e.what(), NSCAPI::returnCRIT); 1523 return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, _T(""), returnCode); 1524 } catch (...) { 1525 LOG_ERROR_STD(_T("Failed to inject remote command: Unknown exception")); 1526 int returnCode = NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, _T("Failed to inject remote command: + e.what()"), NSCAPI::returnCRIT); 1527 return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, _T(""), returnCode); 1528 } 1529 } else { 1530 ReadLock readLock(&m_mutexRW, true, 5000); 1531 if (!readLock.IsLocked()) { 1532 LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex.")); 1533 return NSCAPI::returnUNKNOWN; 1534 } 1535 for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) { 1536 try { 1537 NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen); 1538 switch (c) { 1539 case NSCAPI::returnInvalidBufferLen: 1540 LOG_ERROR(_T("UNKNOWN: Return buffer to small to handle this command.")); 1541 return c; 1542 case NSCAPI::returnIgnored: 1543 break; 1544 case NSCAPI::returnOK: 1545 case NSCAPI::returnWARN: 1546 case NSCAPI::returnCRIT: 1547 case NSCAPI::returnUNKNOWN: 1548 LOG_DEBUG_STD(_T("Injected Result: ") + NSCHelper::translateReturn(c) + _T(" '") + (std::wstring)(returnMessageBuffer) + _T("'")); 1549 LOG_DEBUG_STD(_T("Injected Performance Result: '") +(std::wstring)(returnPerfBuffer) + _T("'")); 1550 return c; 1551 default: 1552 LOG_ERROR_STD(_T("Unknown error from handleCommand: ") + strEx::itos(c) + _T(" the injected command was: ") + (std::wstring)command); 1553 return c; 1554 } 1555 } catch(const NSPluginException& e) { 1556 LOG_ERROR_STD(_T("Exception raised: ") + e.error_ + _T(" in module: ") + e.file_); 1557 return NSCAPI::returnCRIT; 1558 } catch(...) { 1559 LOG_ERROR_STD(_T("Unknown exception raised in module")); 1560 return NSCAPI::returnCRIT; 1561 } 1562 } 1563 LOG_MESSAGE_STD(_T("No handler for command: '") + command + _T("'")); 1564 return NSCAPI::returnIgnored; 1565 } 1516 if ((*it)->isBroken()) { 1517 std::wcout << (*it)->getModule() << _T(": ") << _T("broken") << std::endl; 1518 } else { 1519 std::wcout << (*it)->getModule() << _T(": ") << (*it)->getName() << std::endl; 1520 } 1521 } catch (NSPluginException e) { 1522 LOG_ERROR_STD(_T("Could not load plugin: ") + e.file_ + _T(": ") + e.error_); 1523 } 1524 } 1525 1566 1526 } 1567 1527 … … 1579 1539 return (debug_ == log_debug); 1580 1540 } 1581 void NSClientT::enableDebug(bool debug) {1582 if (debug) {1583 debug_ = log_debug;1584 LOG_DEBUG(_T("Enabling debug mode..."));1585 }1586 else1587 debug_ = log_nodebug;1588 }1589 1590 1541 1591 1542 void log_broken_message(std::wstring msg) { … … 1949 1900 return NSCAPI::isSuccess; 1950 1901 } 1951 NSCAPI::errorReturn NSAPISettingsAddKeyMapping(const TCHAR* source_path, const TCHAR* source_key, const TCHAR* destination_path, const TCHAR* destination_key) {1952 try {1953 settings_manager::get_core()->add_mapping(source_path, source_key, destination_path, destination_key);1954 } catch (SettingsException e) {1955 LOG_ERROR_STD(_T("Failed to add mapping: ") + e.getMessage());1956 return NSCAPI::hasFailed;1957 } catch (...) {1958 LOG_ERROR_STD(_T("Failed to add mapping"));1959 return NSCAPI::hasFailed;1960 }1961 return NSCAPI::isSuccess;1962 }1963 NSCAPI::errorReturn NSAPISettingsAddPathMapping(const TCHAR* src, const TCHAR* dst) {1964 try {1965 settings_manager::get_core()->add_mapping(src, dst);1966 } catch (SettingsException e) {1967 LOG_ERROR_STD(_T("Failed to add mapping: ") + e.getMessage());1968 return NSCAPI::hasFailed;1969 } catch (...) {1970 LOG_ERROR_STD(_T("Failed to add mapping"));1971 return NSCAPI::hasFailed;1972 }1973 return NSCAPI::isSuccess;1974 }1975 1976 1902 NSCAPI::errorReturn NSAPISettingsRegKey(const TCHAR* path, const TCHAR* key, int type, const TCHAR* title, const TCHAR* description, const TCHAR* defVal, int advanced) { 1977 1903 try { … … 2100 2026 if (_wcsicmp(buffer, _T("NSAPIRegisterCommand")) == 0) 2101 2027 return &NSAPIRegisterCommand; 2102 if (_wcsicmp(buffer, _T("NSAPISettingsAddKeyMapping")) == 0)2103 return &NSAPISettingsAddKeyMapping;2104 if (_wcsicmp(buffer, _T("NSAPISettingsAddPathMapping")) == 0)2105 return &NSAPISettingsAddPathMapping;2106 2107 2028 if (_wcsicmp(buffer, _T("NSAPISettingsRegKey")) == 0) 2108 2029 return &NSAPISettingsRegKey; -
trunk/service/NSClient++.h
r201 r202 115 115 public: 116 116 // c-tor, d-tor 117 NSClientT(void) : debug_(log_unknown), boot_(true) {}118 117 NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false) {} 119 118 virtual ~NSClientT(void) {} … … 123 122 else 124 123 debug_ = log_nodebug; 125 }126 void setBoot(bool boot = true) {127 boot_ = boot;128 124 } 129 125 … … 149 145 void addPlugins(const std::list<std::wstring> plugins); 150 146 plugin_type loadPlugin(const std::wstring plugin); 151 void loadPlugins( void);147 void loadPlugins(NSCAPI::moduleLoadMode mode); 152 148 void unloadPlugins(bool unloadLoggers); 153 149 std::wstring describeCommand(std::wstring command); … … 218 214 NSCAPI::errorReturn NSAPIReleaseAllCommandNamessBuffer(TCHAR***, unsigned int *); 219 215 NSCAPI::errorReturn NSAPIRegisterCommand(const TCHAR*,const TCHAR*); 220 NSCAPI::errorReturn NSAPISettingsAddKeyMapping(const TCHAR*, const TCHAR*, const TCHAR*, const TCHAR*);221 NSCAPI::errorReturn NSAPISettingsAddPathMapping(const TCHAR*, const TCHAR*);222 216 NSCAPI::errorReturn NSAPISettingsRegKey(const TCHAR*, const TCHAR*, int, const TCHAR*, const TCHAR*, const TCHAR*, int); 223 217 NSCAPI::errorReturn NSAPISettingsRegPath(const TCHAR*, const TCHAR*, const TCHAR*, int); … … 225 219 NSCAPI::errorReturn NSAPIReleasePluginList(int,NSCAPI::plugin_info*[]); 226 220 NSCAPI::errorReturn NSAPISettingsSave(void); 227 228 221 229 222
Note: See TracChangeset
for help on using the changeset viewer.
