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

Diff for /pegasus/src/Server/cimserver.cpp between version 1.191.4.4 and 1.191.4.5

version 1.191.4.4, 2007/07/03 21:50:08 version 1.191.4.5, 2008/01/09 05:55:53
Line 80 
Line 80 
 // //
 ////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
  
   //NOCHKSRC
  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/Constants.h> #include <Pegasus/Common/Constants.h>
Line 1303 
Line 1304 
     //CimserverHolder cimserverHolder( &server );     //CimserverHolder cimserverHolder( &server );
     _cimServer = new CIMServer(_monitor);     _cimServer = new CIMServer(_monitor);
  
       Boolean addIP6Acceptor = false;
       Boolean addIP4Acceptor = false;
   
   #ifdef PEGASUS_OS_TYPE_WINDOWS
          addIP4Acceptor = true;
   #endif
   
   #ifdef PEGASUS_ENABLE_IPV6
         // If IPv6 stack is disabled swicth to IPv4 stack.
         if (System::isIPv6StackActive())
         {
             addIP6Acceptor = true;
         }
         else
         {
             MessageLoaderParms parms(
                 "src.Server.cimserver.IPV6_STACK_NOT_ACTIVE",
                 "IPv6 stack is not active, using IPv4 socket.");
             Logger::put(
                 Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
                 MessageLoader::getMessage(parms));
   #if defined(PEGASUS_DEBUG)
             cout << MessageLoader::getMessage(parms) << endl;
   #endif
         }
   #endif
         if (!addIP6Acceptor)
         {
             addIP4Acceptor = true;
         }
  
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
 #ifdef PEGASUS_ENABLE_IPV6              if (addIP6Acceptor)
               {
             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,
                 portNumberHttp, false);                 portNumberHttp, false);
 #endif              }
               if (addIP4Acceptor)
 #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)              {
             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,
                 portNumberHttp, false);                 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 1325 
Line 1357 
         }         }
         if (enableHttpsConnection)         if (enableHttpsConnection)
         {         {
 #ifdef PEGASUS_ENABLE_IPV6              if (addIP6Acceptor)
               {
             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,             _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION,
                 portNumberHttps, true);                 portNumberHttps, true);
 #endif              }
               if (addIP4Acceptor)
 #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)              {
             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,             _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,
                 portNumberHttps, true);                 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);


Legend:
Removed from v.1.191.4.4  
changed lines
  Added in v.1.191.4.5

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2