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

Diff for /pegasus/src/Pegasus/Listener/CIMListener.cpp between version 1.47.6.2 and 1.47.6.3

version 1.47.6.2, 2007/06/12 09:37:30 version 1.47.6.3, 2007/06/22 10:46:13
Line 121 
Line 121 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     HTTPAcceptor *_ip6Acceptor;     HTTPAcceptor *_ip6Acceptor;
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     HTTPAcceptor *_ip4Acceptor;     HTTPAcceptor *_ip4Acceptor;
 #endif #endif
     Boolean _dieNow;     Boolean _dieNow;
Line 141 
Line 140 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     _ip6Acceptor(NULL),     _ip6Acceptor(NULL),
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     _ip4Acceptor(NULL),     _ip4Acceptor(NULL),
 #endif #endif
     _dieNow(false),     _dieNow(false),
Line 159 
Line 157 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     _ip6Acceptor(NULL),     _ip6Acceptor(NULL),
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     _ip4Acceptor(NULL),     _ip4Acceptor(NULL),
 #endif #endif
     _dieNow(svc._dieNow),     _dieNow(svc._dieNow),
Line 177 
Line 174 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     delete _ip6Acceptor;     delete _ip6Acceptor;
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     delete _ip4Acceptor;     delete _ip4Acceptor;
 #endif #endif
     delete _monitor;     delete _monitor;
Line 209 
Line 205 
             _portNumber, _sslContext, false);             _portNumber, _sslContext, false);
     }     }
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     if (NULL == _ip4Acceptor)     if (NULL == _ip4Acceptor)
     {     {
         _ip4Acceptor = new HTTPAcceptor(         _ip4Acceptor = new HTTPAcceptor(
Line 238 
Line 233 
             _portNumber);             _portNumber);
     }     }
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     if (_ip4Acceptor != NULL)     if (_ip4Acceptor != NULL)
     {     {
         _ip4Acceptor->bind();         _ip4Acceptor->bind();
Line 303 
Line 297 
         _ip6Acceptor->reopenConnectionSocket();         _ip6Acceptor->reopenConnectionSocket();
     }     }
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     if (_ip4Acceptor != NULL)     if (_ip4Acceptor != NULL)
     {     {
         _ip4Acceptor->reopenConnectionSocket();         _ip4Acceptor->reopenConnectionSocket();
Line 327 
Line 320 
         _ip6Acceptor->closeConnectionSocket();         _ip6Acceptor->closeConnectionSocket();
     }     }
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     if (_ip4Acceptor != NULL)     if (_ip4Acceptor != NULL)
     {     {
         _ip4Acceptor->closeConnectionSocket();         _ip4Acceptor->closeConnectionSocket();
Line 343 
Line 335 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     cnt = _ip6Acceptor->getOutstandingRequestCount();     cnt = _ip6Acceptor->getOutstandingRequestCount();
 #endif #endif
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     cnt += _ip4Acceptor->getOutstandingRequestCount();     cnt += _ip4Acceptor->getOutstandingRequestCount();
 #endif #endif
  
Line 374 
Line 365 
     }     }
 #endif #endif
  
 #if defined (PEGASUS_ENABLE_IPV6) && defined (PEGASUS_OS_TYPE_WINDOWS) \  #if !defined (PEGASUS_ENABLE_IPV6) || defined (PEGASUS_OS_TYPE_WINDOWS)
     || !defined (PEGASUS_ENABLE_IPV6)  
     if ((portNumber == 0) && (_ip4Acceptor != 0))     if ((portNumber == 0) && (_ip4Acceptor != 0))
     {     {
         portNumber = _ip4Acceptor->getPortNumber();         portNumber = _ip4Acceptor->getPortNumber();

Legend:
Removed from v.1.47.6.2  
changed lines
  Added in v.1.47.6.3
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2