Changeset 23c63eb in nscp
- Timestamp:
- 11/16/07 22:32:58 (6 years ago)
- Branches:
- master, 0.4.0, 0.4.1, 0.4.2, stable
- Children:
- 5044c09
- Parents:
- b0ae738
- Files:
-
- 1 added
- 7 edited
-
AutoBuild.h (modified) (1 diff)
-
NSC.dist (modified) (1 diff)
-
NSClient++.vcproj (modified) (3 diffs)
-
changelog (modified) (1 diff)
-
include/SSLSocket.cpp (modified) (2 diffs)
-
include/SSLSocket.h (modified) (2 diffs)
-
modules/NRPEListener/NRPEListener.cpp (modified) (1 diff)
-
scripts/check_vb.vbs (added)
Legend:
- Unmodified
- Added
- Removed
-
AutoBuild.h
rb0ae738 r23c63eb 3 3 // change the FALSE to TRUE for autoincrement of build number 4 4 #define INCREMENT_VERSION TRUE 5 #define FILEVER 0,2,7, 756 #define PRODUCTVER 0,2,7,1 737 #define STRFILEVER "0.2.7. 75"8 #define STRPRODUCTVER "0.2.7.1 73"9 #define STRPRODUCTDATE "2007-11-1 4"5 #define FILEVER 0,2,7,83 6 #define PRODUCTVER 0,2,7,181 7 #define STRFILEVER "0.2.7.83" 8 #define STRPRODUCTVER "0.2.7.181" 9 #define STRPRODUCTDATE "2007-11-16" 10 10 #endif // AUTOBUILD_H -
NSC.dist
rb0ae738 r23c63eb 163 163 ;nrpe_ok=scripts\ok.bat 164 164 ;check_multi_line=scripts\multi_line.bat 165 ;# 166 ;# The sample scripts 167 ;# 168 ;check_long=scripts\long.bat 169 ;check_ok=scripts\ok.bat 170 ;check_nok=scripts\xlong.bat 171 ;check_vbs=cscript.exe //T:30 //NoLogo scripts\check_vb.vbs 165 172 166 173 -
NSClient++.vcproj
rb0ae738 r23c63eb 624 624 <Tool 625 625 Name="VCCustomBuildTool" 626 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
"626 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Copying scripts
cmd /c "mkdir "$(TargetDir)\scripts""
cmd /c "xcopy /Q /Y "$(InputDir)\scripts" "$(TargetDir)\scripts""
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
" 627 627 Outputs="$(InputDir)\Dist\$(ProjectName).zip" 628 628 /> … … 726 726 <Tool 727 727 Name="VCCustomBuildTool" 728 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
"728 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Copying scripts
cmd /c "mkdir "$(TargetDir)\scripts""
cmd /c "xcopy /Q /Y "$(InputDir)\scripts" "$(TargetDir)\scripts""
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
" 729 729 Outputs="$(InputDir)\Dist\$(ProjectName).zip" 730 730 /> … … 829 829 <Tool 830 830 Name="VCCustomBuildTool" 831 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
"831 CommandLine="echo Copying dependency DLLs
cmd /c "xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\"
echo Copying scripts
cmd /c "mkdir "$(TargetDir)\scripts""
cmd /c "xcopy /Q /Y "$(InputDir)\scripts" "$(TargetDir)\scripts""
echo Removing old archive
cmd /c "del "$(InputDir)\Dist\modules\*.pdb""
cmd /c "del "$(InputDir)\Dist\*.zip""
echo Making archive: 7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
7z.exe a -r -tzip -bd "$(TargetDir)\$(InputName)-$(PlatformName).zip" "$(TargetDir)\*"
echo Renaming archive
postbuild.pl "$(TargetDir)\$(InputName)-$(PlatformName).zip"
echo Sending to server
echo pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
pscp.exe "$(TargetDir)\*.zip" mickem@ssl.nakednuns.org:/var/www/files/nightly/
" 832 832 Outputs="$(InputDir)\Dist\$(ProjectName).zip" 833 833 /> -
changelog
rb0ae738 r23c63eb 6 6 * Add API for rehashing the daemon (or implement it the API is there but does nothing) 7 7 8 2007-11-16 MickeM 9 * Fixed an NRPE issue I added when I improved the sockets_timeout (now SSL works as well :). 10 + Added sample VBS script and defenitions 11 12 2007-11-15 MickeM 13 * Improved error message when external NRPE command failes. 14 8 15 2007-11-14 MickeM 9 16 + Added multi-line output support ( issue #91 ) 10 17 * Improved error handling for external commands 11 18 * Fixed an issue with NRPE/NSClient socket-reading (introduced by the socket_timeout) 19 + Added an english fallback if "local" language PDH counters fail. 12 20 13 21 2007-11-12 MickeM -
include/SSLSocket.cpp
rb0ae738 r23c63eb 68 68 69 69 70 bool simpleSSL::sSSL::readAll(simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/) { 71 // @todo this could be optimized a bit if we want to 72 // If only one buffer is needed we could "reuse" the buffer instead of copying it. 70 bool simpleSSL::sSSL::readAll(simpleSocket::Socket *report_to, simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/) { 73 71 char *tmpBuffer = new char[tmpBufferLength+1]; 74 72 if (!ssl_) … … 78 76 buffer.append(tmpBuffer, n); 79 77 } 80 /*81 while (n>0) {82 if (n == tmpBufferLength) {83 // We filled the buffer (There is more to get)84 // buffer.append(tmpBuffer, n);85 n=SSL_read(ssl_,tmpBuffer,tmpBufferLength);86 break;87 } else {88 // Buffer not full, we got it "all"89 // buffer.append(tmpBuffer, n);90 break;91 }92 }93 */94 78 delete [] tmpBuffer; 95 return n >= 0;96 /*97 79 if (n <= 0) { 98 80 int rc = getError(n); 99 if ((rc != SSL_ERROR_WANT_READ) && (rc != SSL_ERROR_WANT_WRITE))100 throw SSLException("Socket read failed: ", n, rc);81 report_to->printError(__FILE__, __LINE__, "Could not read from socket: " + strEx::itos(rc)); 82 return (rc == SSL_ERROR_WANT_READ) || (rc == SSL_ERROR_WANT_WRITE); 101 83 } 102 */84 return true; 103 85 } 104 86 void simpleSSL::sSSL::send(const char * buf, unsigned int len) { -
include/SSLSocket.h
rb0ae738 r23c63eb 227 227 context_ = context; 228 228 } 229 bool readAll (simpleSocket:: DataBuffer &buffer, unsigned int tmpBufferLength = 1024);229 bool readAll (simpleSocket::Socket *report_to, simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024); 230 230 void send(const char * buf, unsigned int len); 231 231 }; … … 259 259 virtual bool readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024) { 260 260 try { 261 return ssl.readAll( buffer, tmpBufferLength);261 return ssl.readAll(this, buffer, tmpBufferLength); 262 262 } catch (simpleSSL::SSLException e) { 263 263 throw simpleSocket::SocketException(e.getMessage()); -
modules/NRPEListener/NRPEListener.cpp
rb0ae738 r23c63eb 328 328 } 329 329 else { 330 msg = "NRPE_NT failed to create process , exiting...";330 msg = "NRPE_NT failed to create process (" + command + "): " + error::lookup::last_error(); 331 331 result = NSCAPI::returnUNKNOWN; 332 332 CloseHandle(hChildInR);
Note: See TracChangeset
for help on using the changeset viewer.
