Changeset 3f569d3 in nscp


Ignore:
Timestamp:
11/26/07 21:45:47 (5 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2, stable
Children:
978bd31
Parents:
a60995a
Message:

2007-11-26 MickeM

+ Fixed a socket issue (erroneously reported "Could not read NSClient packet from socket :(")

  • More 2k5 build tweaks
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • AutoBuild.h

    r7e33d82 r3f569d3  
    33// change the FALSE to TRUE for autoincrement of build number 
    44#define INCREMENT_VERSION TRUE 
    5 #define FILEVER        0,2,7,96 
    6 #define PRODUCTVER     0,2,7,194 
    7 #define STRFILEVER     _T("0.2.7.96") 
    8 #define STRPRODUCTVER  _T("0.2.7.194") 
    9 #define STRPRODUCTDATE  _T("2007-11-24") 
     5#define FILEVER        0,2,7,99 
     6#define PRODUCTVER     0,2,7,197 
     7#define STRFILEVER     _T("0.2.7.99") 
     8#define STRPRODUCTVER  _T("0.2.7.197") 
     9#define STRPRODUCTDATE  _T("2007-11-26") 
    1010#endif // AUTOBUILD_H 

  • NSClient++-2005.sln

    r7e33d82 r3f569d3  
    175175    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Mixed Platforms.Build.0 = Release|x64 
    176176    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Win32.ActiveCfg = Release|Win32 
     177    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Win32.Build.0 = Release|Win32 
    177178    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|x64.ActiveCfg = Release|Win32 
    178179    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    211212    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Mixed Platforms.Build.0 = Release|x64 
    212213    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Win32.ActiveCfg = Release|Win32 
     214    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Win32.Build.0 = Release|Win32 
    213215    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|x64.ActiveCfg = Release|Win32 
    214216    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    284286    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Mixed Platforms.Build.0 = Release|x64 
    285287    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Win32.ActiveCfg = Release|Win32 
     288    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Win32.Build.0 = Release|Win32 
    286289    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|x64.ActiveCfg = Release|Win32 
    287290    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    320323    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Mixed Platforms.Build.0 = Release|x64 
    321324    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Win32.ActiveCfg = Release|Win32 
     325    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Win32.Build.0 = Release|Win32 
    322326    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|x64.ActiveCfg = Release|Win32 
    323327    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    393397    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Mixed Platforms.Build.0 = Release|x64 
    394398    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Win32.ActiveCfg = Release|Win32 
     399    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Win32.Build.0 = Release|Win32 
    395400    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|x64.ActiveCfg = Release|Win32 
    396401    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    429434    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Mixed Platforms.Build.0 = Release|x64 
    430435    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Win32.ActiveCfg = Release|Win32 
     436    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Win32.Build.0 = Release|Win32 
    431437    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|x64.ActiveCfg = Release|Win32 
    432438    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Any CPU.ActiveCfg = Debug|x64 
    … …  
    467473    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|Mixed Platforms.Build.0 = Release|x64 
    468474    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|Win32.ActiveCfg = Release|Win32 
     475    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|Win32.Build.0 = Release|Win32 
    469476    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|x64.ActiveCfg = Release|x64 
    470477    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Release|x64.Build.0 = Release|x64 

  • NSClient++-2005.vcproj

    r7e33d82 r3f569d3  
    2424    <Configuration 
    2525      Name="Release|Win32" 
    26       OutputDirectory="$(ConfigurationName)" 
    27       IntermediateDirectory="$(ConfigurationName)" 
     26      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" 
     27      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)" 
    2828      ConfigurationType="1" 
    2929      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    126126    <Configuration 
    127127      Name="Release|x64" 
    128       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
    129       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
     128      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" 
     129      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)" 
    130130      ConfigurationType="1" 
    131131      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    621621      Name="Nightly|Win32" 
    622622      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" 
    623       IntermediateDirectory="$(ConfigurationName)" 
     623      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)" 
    624624      ConfigurationType="1" 
    625625      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    634634      <Tool 
    635635        Name="VCCustomBuildTool" 
    636         CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y &quot;$(InputDir)\scripts\*.*&quot; &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;echo Removing old archive and files we dont want&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.lib&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.exp&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/" 
     636        CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y &quot;$(InputDir)\scripts\*.*&quot; &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;echo Removing old archive and files we dont want&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.lib&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.exp&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;" 
    637637        Outputs="$(TargetDir)\$(ProjectName)-$(PlatformName).zip" 
    638638      /> 
    … …  
    721721      <Tool 
    722722        Name="VCCustomBuildTool" 
    723         CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y &quot;$(InputDir)\scripts\*.*&quot; &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;echo Removing old archive and files we dont want&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.lib&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.exp&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/" 
     723        CommandLine="echo Seting up scripts&#x0D;&#x0A;cmd /c &quot;mkdir &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;cmd /c &quot;xcopy /Q /Y &quot;$(InputDir)\scripts\*.*&quot; &quot;$(TargetDir)\scripts\&quot;&quot;&#x0D;&#x0A;echo Removing old archive and files we dont want&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.lib&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\modules\*.exp&quot;&quot;&#x0D;&#x0A;cmd /c &quot;del &quot;$(TargetDir)\*.zip&quot;&quot;&#x0D;&#x0A;echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\$(ProjectName)-$(PlatformName).zip&quot;&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;" 
    724724        Outputs="$(TargetDir)\$(ProjectName)-$(PlatformName).zip" 
    725725      /> 
    … …  
    24532453          <Tool 
    24542454            Name="VCCustomBuildTool" 
    2455             CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputName)&quot; &quot;$(InputDir)\Dist\&quot;&quot;&#x0D;&#x0A;" 
     2455            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputName)&quot; &quot;$(TargetDir)&quot;&quot;&#x0D;&#x0A;" 
     2456            Outputs="$(TargetDir)\$(InputFileName)" 
    24562457          /> 
    24572458        </FileConfiguration> 
    … …  
    24612462          <Tool 
    24622463            Name="VCCustomBuildTool" 
    2463             CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputName)&quot; &quot;$(InputDir)\Dist\&quot;&quot;&#x0D;&#x0A;" 
     2464            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputName)&quot; &quot;$(TargetDir)&quot;&quot;&#x0D;&#x0A;" 
     2465            Outputs="$(TargetDir)\$(InputFileName)" 
    24642466          /> 
    24652467        </FileConfiguration> 
    … …  
    28782880        > 
    28792881        <FileConfiguration 
     2882          Name="Release|Win32" 
     2883          > 
     2884          <Tool 
     2885            Name="VCCustomBuildTool" 
     2886            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;" 
     2887            Outputs="$(TargetDir)\$(InputName).ini" 
     2888          /> 
     2889        </FileConfiguration> 
     2890        <FileConfiguration 
     2891          Name="Release|x64" 
     2892          > 
     2893          <Tool 
     2894            Name="VCCustomBuildTool" 
     2895            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;" 
     2896            Outputs="$(TargetDir)\$(InputName).ini" 
     2897          /> 
     2898        </FileConfiguration> 
     2899        <FileConfiguration 
    28802900          Name="Distribution|Win32" 
    28812901          > 
    … …  
    29002920          <Tool 
    29012921            Name="VCCustomBuildTool" 
    2902             CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;" 
     2922            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;&#x0D;&#x0A;" 
    29032923            Outputs="$(TargetDir)\$(InputName).ini" 
    29042924          /> 
    … …  
    29092929          <Tool 
    29102930            Name="VCCustomBuildTool" 
    2911             CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;" 
     2931            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(TargetDir)\$(InputName).ini&quot;&quot;&#x0D;&#x0A;&#x0D;&#x0A;" 
    29122932            Outputs="$(TargetDir)\$(InputName).ini" 
    29132933          /> 

  • NSClient++.manifest

    r860f310 r3f569d3  
    11<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
    22<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
    3    
     3  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> 
     4    <security> 
     5      <requestedPrivileges> 
     6        <requestedExecutionLevel level="requireAdministrator"/> 
     7      </requestedPrivileges> 
     8    </security> 
     9  </trustInfo> 
    410</assembly> 

  • changelog

    r99e4d8f r3f569d3  
    66 * Add API for rehashing the daemon (or implement it the API is there but does nothing) 
    77 
     82007-11-26 MickeM 
     9 + Fixed a socket issue (erroneously reported "Could not read NSClient packet from socket :(") 
     10 * More 2k5 build tweaks 
     11 
    8122007-11-23 MickeM 
    9  * Converted to unicode (damn sometimes I **HATE** C++) 
     13 * Converted to Unicode (damn sometimes I **HATE** C++) 
    1014 + Added support for escaping " on the /test syntax so now you can do: CheckWMI MaxCrit=3 "MinWarn=1" "Query:load=Select * from win32_Processor" 
    1115 
    … …  
    15192007-11-21 MickeM 
    1620 * Fixed process counter so checkProcState  now return the *correct* number (previously it was correct-1) 
    17  * Fixed som missing exceptions that were not caught 
     21 * Fixed some missing exceptions that were not caught 
    1822 + Added "AliasCol" option to CheckWMIValue to allow a column to be used as "alias" for a result set: 
    1923     CheckWMIValue -a "Query=select Caption, ThreadCount from Win32_Process" MaxWarn=50 MaxCrit=100 Check:threads=ThreadCount AliasCol=Caption 
    2024    will give you: "System threads: 98 > warning, svchost.exe threads: 87 > warning" 
    21  - Removed documenation from SVN (as it is old and outdated and no longer used) 
     25 - Removed from SVN (as it is old and outdated and no longer used) 
    2226 
    23272007-11-20 MickeM 
    … …  
    2832 + Added -noboot option to startup used for running command line utilities without booting the client 
    2933   "nsclient++ -noboot RemoteConfigruation ini2reg" for instance 
    30  + Added fallback to try <module> and <module>.dll if the module was nhot loaded (when running command lines) 
    31  * Migrated 2008 project files to new name and backported to 2005 project files. 
     34 + Added fall back to try <module> and <module>.dll if the module was not loaded (when running command lines) 
     35 * Migrated 2008 project files to new name and back ported to 2005 project files. 
    3236 
    33372007-11-16 MickeM 
    3438 * Fixed an NRPE issue I added when I improved the sockets_timeout (now SSL works as well :). 
    35  + Added sample VBS script and defenitions 
     39 + Added sample VBS script and definitions 
    3640 
    37412007-11-15 MickeM 
    38  * Improved error message when external NRPE command failes. 
     42 * Improved error message when external NRPE command failles. 
    3943 
    40442007-11-14 MickeM 
    … …  
    4246 * Improved error handling for external commands 
    4347 * Fixed an issue with NRPE/NSClient socket-reading (introduced by the socket_timeout) 
    44  + Added an english fallback if "local" language PDH counters fail. 
     48 + Added an English fall back if "local" language PDH counters fail. 
    4549 
    46502007-11-12 MickeM 

  • include/SSLSocket.cpp

    r99e4d8f r3f569d3  
    6060  if (add) { 
    6161    count++; 
    62     std::cout << "+++SSSL::Socket" << count << std::endl; 
     62    std::wcout << "+++SSSL::Socket" << count << std::endl; 
    6363  } else { 
    6464    count--; 
    65     std::cout << "---SSSL::Socket" << count << std::endl; 
     65    std::wcout << "---SSSL::Socket" << count << std::endl; 
    6666  } 
    6767} 
    … …  
    7979  if (n <= 0) { 
    8080    int rc = getError(n); 
     81    if ((rc == SSL_ERROR_WANT_READ) || (rc == SSL_ERROR_WANT_WRITE)) 
     82      return true; 
    8183    report_to->printError(_T(__FILE__), __LINE__, _T("Could not read from socket: ") + strEx::itos(rc)); 
    82     return (rc == SSL_ERROR_WANT_READ) || (rc == SSL_ERROR_WANT_WRITE); 
     84    throw simpleSocket::SocketException(_T("Could not read from socket: ") + strEx::itos(rc)); 
    8385  } 
    84   return true; 
     86  return n>0; 
    8587} 
    8688void simpleSSL::sSSL::send(const char * buf, unsigned int len) { 

  • include/ServiceCmd.cpp

    r99e4d8f r3f569d3  
    232232      // try to stop the service 
    233233      if ( ControlService( schService, SERVICE_CONTROL_STOP, &ssStatus ) ) { 
    234         std::cout << _T("Stopping service."); 
     234        std::wcout << _T("Stopping service."); 
    235235        Sleep( 1000 ); 
    236236        while( QueryServiceStatus( schService, &ssStatus ) ) { 
    … …  
    241241            break; 
    242242        } 
    243         std::cout << std::endl; 
     243        std::wcout << std::endl; 
    244244        if ( ssStatus.dwCurrentState != SERVICE_STOPPED ) { 
    245245          CloseServiceHandle(schService); 

  • include/Socket.cpp

    r99e4d8f r3f569d3  
    4747      buffer.append(tmpBuffer, n); 
    4848      n=recv(socket_,tmpBuffer,tmpBufferLength,0); 
    49  
    5049    } else { 
    5150      // Buffer not full, we got it "all" 
    5251      buffer.append(tmpBuffer, n); 
    5352      break; 
     53 
    5454    } 
    5555  } 
    5656  delete [] tmpBuffer; 
    57   return n!=SOCKET_ERROR; 
     57  if (n == SOCKET_ERROR) { 
     58    int ret = ::WSAGetLastError(); 
     59    if (ret == WSAEWOULDBLOCK) 
     60      return true; 
     61    throw SocketException(_T("recv returned SOCKET_ERROR: "), ret); 
     62  } 
     63  return n>0; 
    5864} 
    5965 

  • include/arrayBuffer.cpp

    r7e33d82 r3f569d3  
    144144    // p1 = start of "this token" 
    145145    // p2 = end of "this token" (next split char) 
    146     std::wcout << _T("found token: ") << p1 << _T(":") << p2; 
     146    //std::wcout << _T("found token: ") << p1 << _T(":") << p2; 
    147147 
    148148    assert(p2>p1); 
    … …  
    153153      token = token.substr(0, token.size()-1); 
    154154 
    155     std::wcout << _T(" -- ") << token << std::endl; 
     155    //std::wcout << _T(" -- ") << token << std::endl; 
    156156 
    157157    token_list.push_back(token); 
    … …  
    257257 */ 
    258258void arrayBuffer::test_createEmptyArrayBuffer() { 
    259   std::cout << "arrayBuffer::test_createEmptyArrayBuffer() : "; 
     259  std::wcout << "arrayBuffer::test_createEmptyArrayBuffer() : "; 
    260260  unsigned int argLen; 
    261261  TCHAR ** c = createEmptyArrayBuffer(argLen); 
    262262  if ((c) && (argLen == 0)) 
    263     std::cout << "Succeeded" << std::endl; 
     263    std::wcout << "Succeeded" << std::endl; 
    264264  else 
    265     std::cout << "Failed" << std::endl; 
     265    std::wcout << "Failed" << std::endl; 
    266266  destroyArrayBuffer(c, argLen); 
    267267} 

  • modules/CheckDisk/CheckDisk-2005.vcproj

    r7e33d82 r3f569d3  
    187187    <Configuration 
    188188      Name="Release|Win32" 
    189       OutputDirectory="Release" 
    190       IntermediateDirectory="Release" 
     189      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     190      IntermediateDirectory="$(ConfigurationName)" 
    191191      ConfigurationType="2" 
    192192      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    266266    <Configuration 
    267267      Name="Release|x64" 
    268       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     268      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    269269      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    270270      ConfigurationType="2" 

  • modules/CheckEventLog/CheckEventLog-2005.vcproj

    r7e33d82 r3f569d3  
    2424    <Configuration 
    2525      Name="Release|Win32" 
    26       OutputDirectory="$(ConfigurationName)" 
     26      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    2727      IntermediateDirectory="$(ConfigurationName)" 
    2828      ConfigurationType="2" 
    … …  
    104104    <Configuration 
    105105      Name="Release|x64" 
    106       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     106      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    107107      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    108108      ConfigurationType="2" 

  • modules/CheckEventLog/CheckEventLog.cpp

    r99e4d8f r3f569d3  
    220220#define BUFFER_SIZE 1024*64 
    221221NSCAPI::nagiosReturn CheckEventLog::handleCommand(const strEx::blindstr command, const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) { 
    222   NSC_DEBUG_MSG_STD(_T("000-1")) ; 
    223222  if (command != _T("CheckEventLog")) 
    224223    return NSCAPI::returnIgnored; 
    … …  
    299298    return NSCAPI::returnUNKNOWN; 
    300299  } 
    301     NSC_DEBUG_MSG_STD(_T("001") + message) ; 
    302300 
    303301  unsigned long int hit_count = 0; 

  • modules/CheckHelpers/CheckHelpers-2005.vcproj

    r7e33d82 r3f569d3  
    187187    <Configuration 
    188188      Name="Release|Win32" 
    189       OutputDirectory="Release" 
    190       IntermediateDirectory="Release" 
     189      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     190      IntermediateDirectory="$(ConfigurationName)" 
    191191      ConfigurationType="2" 
    192192      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    266266    <Configuration 
    267267      Name="Release|x64" 
    268       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     268      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    269269      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    270270      ConfigurationType="2" 

  • modules/CheckSystem/CheckSystem-2005.vcproj

    r7e33d82 r3f569d3  
    189189    <Configuration 
    190190      Name="Release|Win32" 
    191       OutputDirectory="$(ConfigurationName)" 
     191      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    192192      IntermediateDirectory="$(ConfigurationName)" 
    193193      ConfigurationType="2" 
    … …  
    269269    <Configuration 
    270270      Name="Release|x64" 
    271       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     271      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    272272      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    273273      ConfigurationType="2" 

  • modules/CheckWMI/CheckWMI-2005.vcproj

    r7e33d82 r3f569d3  
    191191    <Configuration 
    192192      Name="Release|Win32" 
    193       OutputDirectory="Release" 
    194       IntermediateDirectory="Release" 
     193      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     194      IntermediateDirectory="$(ConfigurationName)" 
    195195      ConfigurationType="2" 
    196196      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    272272    <Configuration 
    273273      Name="Release|x64" 
    274       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     274      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    275275      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    276276      ConfigurationType="2" 

  • modules/FileLogger/FileLogger-2005.vcproj

    r7e33d82 r3f569d3  
    2424    <Configuration 
    2525      Name="Release|Win32" 
    26       OutputDirectory="$(ConfigurationName)" 
     26      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    2727      IntermediateDirectory="$(ConfigurationName)" 
    2828      ConfigurationType="2" 
    … …  
    103103    <Configuration 
    104104      Name="Release|x64" 
    105       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     105      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    106106      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    107107      ConfigurationType="2" 

  • modules/NRPEListener/NRPEListener-2005.vcproj

    r7e33d82 r3f569d3  
    192192    <Configuration 
    193193      Name="Release|Win32" 
    194       OutputDirectory="Release" 
    195       IntermediateDirectory="Release" 
     194      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     195      IntermediateDirectory="$(ConfigurationName)" 
    196196      ConfigurationType="2" 
    197197      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    273273    <Configuration 
    274274      Name="Release|x64" 
    275       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     275      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    276276      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    277277      ConfigurationType="2" 

  • modules/NRPEListener/NRPEListener.cpp

    r99e4d8f r3f569d3  
    355355    int maxWait = socketTimeout_*10; 
    356356    for (i=0;i<maxWait;i++) { 
    357       bool lastReadRet = client->readAll(block, 1048); 
     357      bool lastReadHasMore = false; 
     358      try { 
     359        lastReadHasMore = client->readAll(block, 1048); 
     360      } catch (simpleSocket::SocketException e) { 
     361        NSC_LOG_MESSAGE(_T("Could not read NRPE packet from socket :") + e.getMessage()); 
     362        client->close(); 
     363        return; 
     364      } 
    358365      if (block.getLength() >= NRPEPacket::getBufferLength()) 
    359366        break; 
    360       if (!lastReadRet) { 
    361         NSC_LOG_MESSAGE(_T("Could not read NRPE packet from socket :(")); 
     367      if (!lastReadHasMore) { 
    362368        client->close(); 
    363369        return; 

  • modules/NSClientListener/NSClientListener-2005.vcproj

    r7e33d82 r3f569d3  
    189189    <Configuration 
    190190      Name="Release|Win32" 
    191       OutputDirectory="Release" 
    192       IntermediateDirectory="Release" 
     191      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     192      IntermediateDirectory="$(ConfigurationName)" 
    193193      ConfigurationType="2" 
    194194      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    269269    <Configuration 
    270270      Name="Release|x64" 
    271       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     271      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    272272      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    273273      ConfigurationType="2" 

  • modules/NSClientListener/NSClientListener.cpp

    r99e4d8f r3f569d3  
    252252  unsigned int maxWait = socketTimeout_*10; 
    253253  for (i=0;i<maxWait;i++) { 
    254     bool lastReadRet = client->readAll(db); 
     254    bool lastReadHasMore = false; 
     255    try { 
     256      lastReadHasMore = client->readAll(db); 
     257    } catch (simpleSocket::SocketException e) { 
     258      NSC_LOG_ERROR_STD(_T("Read on socket failed: ") + e.getMessage()); 
     259      client->close(); 
     260      return; 
     261    } 
    255262    if (db.getLength() > 0) { 
    256263      unsigned long long pos = db.find('\n'); 
    … …  
    267274        sendTheResponse(client, parseRequest(incoming) + "\n"); 
    268275      } else { 
     276        db.nibble(1); 
    269277        NSC_LOG_ERROR_STD(_T("First char should (i think) not be a \\n :(")); 
    270278      } 
    271     } else if (!lastReadRet) { 
    272       NSC_LOG_MESSAGE(_T("Could not read NSClient packet from socket :(")); 
     279    } else if (!lastReadHasMore) { 
    273280      client->close(); 
    274281      return; 
    … …  
    291298    return; 
    292299  } 
     300  //client->setNonBlock(); 
    293301  retrivePacket(client); 
    294302 

  • modules/RemoteConfiguration/RemoteConfiguration-2005.vcproj

    r7e33d82 r3f569d3  
    187187    <Configuration 
    188188      Name="Release|Win32" 
    189       OutputDirectory="Release" 
    190       IntermediateDirectory="Release" 
     189      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
     190      IntermediateDirectory="$(ConfigurationName)" 
    191191      ConfigurationType="2" 
    192192      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 
    … …  
    266266    <Configuration 
    267267      Name="Release|x64" 
    268       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     268      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    269269      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    270270      ConfigurationType="2" 

  • modules/SysTray/SysTray-2005.vcproj

    r7e33d82 r3f569d3  
    2424    <Configuration 
    2525      Name="Release|Win32" 
    26       OutputDirectory="$(ConfigurationName)" 
     26      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    2727      IntermediateDirectory="$(ConfigurationName)" 
    2828      ConfigurationType="2" 
    … …  
    103103    <Configuration 
    104104      Name="Release|x64" 
    105       OutputDirectory="$(PlatformName)\$(ConfigurationName)" 
     105      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules" 
    106106      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 
    107107      ConfigurationType="2" 
Note: See TracChangeset for help on using the changeset viewer.