- Timestamp:
- 11/01/09 11:06:01 (4 years ago)
- Branches:
- master, 0.4.0, 0.4.1, 0.4.2
- Children:
- 5229435
- Parents:
- 5da0459
- Location:
- modules
- Files:
-
- 16 edited
-
CheckDisk/CheckDisk.cpp (modified) (8 diffs)
-
CheckEventLog/CheckEventLog.cpp (modified) (5 diffs)
-
CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (16 diffs)
-
CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)
-
CheckSystem/CheckSystem.cpp (modified) (2 diffs)
-
CheckSystem/PDHCollector.cpp (modified) (2 diffs)
-
DebugLogMetrics/DebugLogMetrics.cpp (modified) (1 diff)
-
DebugLogMetrics/DebugLogMetrics.h (modified) (2 diffs)
-
DebugLogMetrics/PDHCollector.cpp (modified) (3 diffs)
-
FileLogger/FileLogger.cpp (modified) (2 diffs)
-
LUAScript/LUAScript.cpp (modified) (1 diff)
-
NRPEClient/NRPEClient.cpp (modified) (2 diffs)
-
NRPEListener/NRPEListener.cpp (modified) (7 diffs)
-
NSCAAgent/NSCAAgent.cpp (modified) (1 diff)
-
NSCAAgent/NSCAThread.cpp (modified) (3 diffs)
-
NSClientListener/NSClientListener.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
modules/CheckDisk/CheckDisk.cpp
r5da0459 rf0eb62d 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")) { -
modules/CheckEventLog/CheckEventLog.cpp
r5da0459 rf0eb62d 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("..."); -
modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj
r5da0459 rf0eb62d 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 -
modules/CheckExternalScripts/CheckExternalScripts.cpp
r5da0459 rf0eb62d 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!")); -
modules/CheckSystem/CheckSystem.cpp
r5da0459 rf0eb62d 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_); -
modules/CheckSystem/PDHCollector.cpp
r5da0459 rf0eb62d 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; -
modules/DebugLogMetrics/DebugLogMetrics.cpp
rb1ac2fa rf0eb62d 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++")); -
modules/DebugLogMetrics/DebugLogMetrics.h
r3692371 rf0eb62d 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 -
modules/DebugLogMetrics/PDHCollector.cpp
rb1ac2fa rf0eb62d 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 } -
modules/FileLogger/FileLogger.cpp
r5da0459 rf0eb62d 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 -
modules/LUAScript/LUAScript.cpp
r5da0459 rf0eb62d 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) { -
modules/NRPEClient/NRPEClient.cpp
r5da0459 rf0eb62d 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!")); -
modules/NRPEListener/NRPEListener.cpp
r5da0459 rf0eb62d 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 { -
modules/NSCAAgent/NSCAAgent.cpp
r5da0459 rf0eb62d 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); -
modules/NSCAAgent/NSCAThread.cpp
r5da0459 rf0eb62d 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); -
modules/NSClientListener/NSClientListener.cpp
r5da0459 rf0eb62d 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);
Note: See TracChangeset
for help on using the changeset viewer.








