(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.207 and 1.208

version 1.207, 2007/08/06 07:07:48 version 1.208, 2007/08/13 11:23:20
Line 938 
Line 938 
         }         }
 #endif #endif
  
           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;
           }
   
         // The server HTTP and HTTPS ports are determined via this algorithm:         // The server HTTP and HTTPS ports are determined via this algorithm:
         // 1) If the user explicitly specified a port, use it.         // 1) If the user explicitly specified a port, use it.
         // 2) If the user did not specify a port, get the port from the         // 2) If the user did not specify a port, get the port from the
Line 974 
Line 1005 
                 }                 }
             }             }
  
 #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              }
  
             MessageLoaderParms parms(             MessageLoaderParms parms(
                 "src.Server.cimserver.LISTENING_ON_HTTP_PORT",                 "src.Server.cimserver.LISTENING_ON_HTTP_PORT",
Line 1020 
Line 1052 
                     throw InvalidPropertyValue("httpsPort", httpsPort);                     throw InvalidPropertyValue("httpsPort", httpsPort);
                 }                 }
             }             }
               if (addIP6Acceptor)
 #ifdef PEGASUS_ENABLE_IPV6              {
             _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              }
   
             MessageLoaderParms parms(             MessageLoaderParms parms(
                 "src.Server.cimserver.LISTENING_ON_HTTPS_PORT",                 "src.Server.cimserver.LISTENING_ON_HTTPS_PORT",
                 "Listening on HTTPS port $0.", portNumberHttps);                 "Listening on HTTPS port $0.", portNumberHttps);


Legend:
Removed from v.1.207  
changed lines
  Added in v.1.208

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2