(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / WMIMapper / WMIServer

Diff for /pegasus/src/WMIMapper/WMIServer/cimserver.cpp between version 1.27.18.2 and 1.28

version 1.27.18.2, 2007/07/03 21:50:09 version 1.28, 2007/04/03 18:51:02
Line 165 
Line 165 
         return PEGASUS_CIMSERVER_START_FILE;         return PEGASUS_CIMSERVER_START_FILE;
     }     }
  
     int cimserver_run(      int cimserver_run(int argc, char** argv, bool shutdownOption);
         int argc,  
         char** argv,  
         Boolean shutdownOption,  
         Boolean debugOutputOption);  
  
     void cimserver_stop(void);     void cimserver_stop(void);
 }; };
Line 539 
Line 535 
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;      String pegasusHome;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Boolean debugOutputOption = false;  
  
 //l10n //l10n
 // Set Message loading to process locale // Set Message loading to process locale
Line 736 
Line 731 
     // Do the plaform specific run     // Do the plaform specific run
     //     //
  
     return _cimServerProcess->platform_run(      return _cimServerProcess->platform_run( argc, argv, shutdownOption );
         argc, argv, shutdownOption, debugOutputOption);  
 } }
  
 void CIMServerProcess::cimserver_stop() void CIMServerProcess::cimserver_stop()
Line 758 
Line 752 
 // specific runs may need to deal with bettter (instead of exit(), etc). // specific runs may need to deal with bettter (instead of exit(), etc).
 // //
  
 int CIMServerProcess::cimserver_run(  int CIMServerProcess::cimserver_run( int argc, char** argv, Boolean shutdownOption )
     int argc,  
     char** argv,  
     Boolean shutdownOption,  
     Boolean debugOutputOption)  
 { {
     String logsDirectory = String::EMPTY;      String logsDirectory;
     Boolean daemonOption = false;     Boolean daemonOption = false;
  
     //     //
Line 1157 
Line 1147 
  
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
 #ifdef PEGASUS_ENABLE_IPV6              _cimServer->addAcceptor(false, portNumberHttp, false, false);
             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,  
                 portNumberHttp, false);  
 #endif  
   
 #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)  
             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,  
                 portNumberHttp, false);  
 #endif  
   
             //l10n             //l10n
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         //"Listening on HTTP port $0.", portNumberHttp);                         //"Listening on HTTP port $0.", portNumberHttp);
Line 1177 
Line 1158 
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
 #ifdef PEGASUS_ENABLE_IPV6              _cimServer->addAcceptor(false, portNumberHttps, true, false);
             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,  
                 portNumberHttps, true);  
 #endif  
   
 #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)  
             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,  
                 portNumberHttps, true);  
 #endif  
   
             //l10n             //l10n
             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,             //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                         //"Listening on HTTPS port $0.", portNumberHttps);                         //"Listening on HTTPS port $0.", portNumberHttps);
Line 1196 
Line 1168 
         }         }
  
 #ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
         _cimServer->addAcceptor(HTTPAcceptor::LOCAL_CONNECTION, 0, false);          _cimServer->addAcceptor(true, 0, false, false);
         //l10n         //l10n
         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                     //"Listening on local connection socket.");                     //"Listening on local connection socket.");


Legend:
Removed from v.1.27.18.2  
changed lines
  Added in v.1.28

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2