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

Diff for /pegasus/src/Pegasus/Common/System.cpp between version 1.74.2.1 and 1.81

version 1.74.2.1, 2009/10/20 13:21:19 version 1.81, 2012/08/30 12:06:41
Line 60 
Line 60 
  
 Boolean System::bindVerbose = false; Boolean System::bindVerbose = false;
  
   Mutex System::_mutexForGetHostName;
   
   Mutex System::_mutexForGetFQHN;
   
   String System::_hostname;
   String System::_fullyQualifiedHostname;
   
   
 Boolean System::copyFile(const char* fromPath, const char* toPath) Boolean System::copyFile(const char* fromPath, const char* toPath)
 { {
     ifstream is(fromPath PEGASUS_IOS_BINARY);     ifstream is(fromPath PEGASUS_IOS_BINARY);
Line 243 
Line 251 
  
 String System::getHostName() String System::getHostName()
 { {
     static String _hostname;  
     static MutexType _mutex = PEGASUS_MUTEX_INITIALIZER;  
   
     // Use double-checked locking pattern to avoid overhead of     // Use double-checked locking pattern to avoid overhead of
     // mutex on subsequent calls.     // mutex on subsequent calls.
  
     if (0 == _hostname.size())     if (0 == _hostname.size())
     {     {
         mutex_lock(&_mutex);          AutoMutex lock(_mutexForGetHostName);
  
         if (0 == _hostname.size())         if (0 == _hostname.size())
         {         {
Line 262 
Line 267 
             hostname[sizeof(hostname)-1] = 0;             hostname[sizeof(hostname)-1] = 0;
             _hostname.assign(hostname);             _hostname.assign(hostname);
         }         }
   
         mutex_unlock(&_mutex);  
     }     }
  
     return _hostname;     return _hostname;
Line 334 
Line 337 
  
 String System::getFullyQualifiedHostName() String System::getFullyQualifiedHostName()
 { {
     static String _hostname;  
     static MutexType _mutex = PEGASUS_MUTEX_INITIALIZER;  
   
     // Use double-checked locking pattern to avoid overhead of     // Use double-checked locking pattern to avoid overhead of
     // mutex on subsequent calls.     // mutex on subsequent calls.
  
     if (0 == _hostname.size())      if (0 == _fullyQualifiedHostname.size())
     {     {
         mutex_lock(&_mutex);          AutoMutex lock(_mutexForGetFQHN);
  
         if (0 == _hostname.size())          if (0 == _fullyQualifiedHostname.size())
         {  
             try  
             {             {
                 _hostname = _getFullyQualifiedHostName();              _fullyQualifiedHostname = _getFullyQualifiedHostName();
             }             }
             catch (...)  
             {  
                 mutex_unlock(&_mutex);  
                 throw;  
             }             }
   
       return _fullyQualifiedHostname;
         }         }
  
         mutex_unlock(&_mutex);  void System::setHostName(const String & hostName)
   {
       AutoMutex lock(_mutexForGetHostName);
       _hostname.assign(hostName);
     }     }
  
     return _hostname;  void System::setFullyQualifiedHostName(const String & fullHostName)
   {
       AutoMutex lock(_mutexForGetFQHN);
       _fullyQualifiedHostname.assign(fullHostName);
 } }
  
   
 Boolean System::getHostIP(const String &hostName, int *af, String &hostIP) Boolean System::getHostIP(const String &hostName, int *af, String &hostIP)
 { {
       CString hostNameCString = hostName.getCString();
       char localHostName[PEGASUS_MAXHOSTNAMELEN+1] = {};
       const char* hostNamePtr;
   
       // In case hostName equals _hostname or _fullyQualifiedHostname
       // we need to use the system-supplied hostname instead for IP resolution
       // _hostname or _fullyQualifiedHostname might be configured values
       // which cannot be resolved by the system to an IP address
       if (String::equalNoCase(hostName, _hostname) ||
           String::equalNoCase(hostName, _fullyQualifiedHostname))
       {
           gethostname(localHostName, PEGASUS_MAXHOSTNAMELEN);
           hostNamePtr= (const char*) localHostName;
       }
       else
       {
           hostNamePtr = hostNameCString;
       }
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     struct addrinfo *info, hints;     struct addrinfo *info, hints;
     memset (&hints, 0, sizeof(struct addrinfo));     memset (&hints, 0, sizeof(struct addrinfo));
Line 374 
Line 395 
     hints.ai_family = *af;     hints.ai_family = *af;
     hints.ai_protocol = IPPROTO_TCP;     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_socktype = SOCK_STREAM;     hints.ai_socktype = SOCK_STREAM;
     if (!getAddrInfo(hostName.getCString(), 0, &hints, &info))      if (!getAddrInfo(hostNamePtr, 0, &hints, &info))
     {     {
         char ipAddress[PEGASUS_INET_ADDRSTR_LEN];         char ipAddress[PEGASUS_INET_ADDRSTR_LEN];
         HostAddress::convertBinaryToText(info->ai_family,         HostAddress::convertBinaryToText(info->ai_family,
Line 391 
Line 412 
     hints.ai_family = *af;     hints.ai_family = *af;
     hints.ai_protocol = IPPROTO_TCP;     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_socktype = SOCK_STREAM;     hints.ai_socktype = SOCK_STREAM;
     if (!getAddrInfo(hostName.getCString(), 0, &hints, &info))      if (!getAddrInfo(hostNamePtr, 0, &hints, &info))
     {     {
         char ipAddress[PEGASUS_INET6_ADDRSTR_LEN];         char ipAddress[PEGASUS_INET6_ADDRSTR_LEN];
         HostAddress::convertBinaryToText(info->ai_family,         HostAddress::convertBinaryToText(info->ai_family,
Line 409 
Line 430 
     struct hostent* hostEntry;     struct hostent* hostEntry;
     struct in_addr inaddr;     struct in_addr inaddr;
     String ipAddress;     String ipAddress;
     CString hostNameCString = hostName.getCString();  
     const char* hostNamePtr = hostNameCString;  
  
     char hostEntryBuffer[8192];     char hostEntryBuffer[8192];
     struct hostent hostEntryStruct;     struct hostent hostEntryStruct;
Line 646 
Line 665 
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     struct in6_addr ip6 = PEGASUS_IPV6_LOOPBACK_INIT;     struct in6_addr ip6 = PEGASUS_IPV6_LOOPBACK_INIT;
 #endif #endif
     Uint32 ip4 = PEGASUS_IPV4_LOOPBACK_INIT;  
     switch (af)     switch (af)
     {     {
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
Line 658 
Line 676 
             Uint32 tmp;             Uint32 tmp;
             memcpy(&tmp, binIPAddress, sizeof(Uint32));             memcpy(&tmp, binIPAddress, sizeof(Uint32));
             Uint32 n = ntohl(tmp);             Uint32 n = ntohl(tmp);
             return !memcmp(&ip4, &n, sizeof (ip4));              return n >= PEGASUS_IPV4_LOOPBACK_RANGE_START &&
                   n <= PEGASUS_IPV4_LOOPBACK_RANGE_END;
         }         }
     }     }
  
Line 667 
Line 686 
  
 Boolean System::isLocalHost(const String &hostName) Boolean System::isLocalHost(const String &hostName)
 { {
       // if value of hostName is "localhost" or equals the value of _hostname or
       // equals the value of _fullyQualifiedHostname we can safely assume it to
       // be the local host
       if (String::equalNoCase(hostName,String("localhost")) ||
           String::equalNoCase(hostName, _hostname) ||
           String::equalNoCase(hostName, _fullyQualifiedHostname))
       {
           return true;
       }
   
 // Get all ip addresses on the node and compare them with the given hostname. // Get all ip addresses on the node and compare them with the given hostname.
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     CString csName = hostName.getCString();     CString csName = hostName.getCString();
Line 807 
Line 836 
  
     if (!hostNameIsIPNotation)  // if hostname is not an IP address     if (!hostNameIsIPNotation)  // if hostname is not an IP address
     {     {
         // localhost ?  
         if (String::equalNoCase(hostName,String("localhost"))) return true;  
         char localHostName[PEGASUS_MAXHOSTNAMELEN];         char localHostName[PEGASUS_MAXHOSTNAMELEN];
         CString cstringLocalHostName = System::getHostName().getCString();         CString cstringLocalHostName = System::getHostName().getCString();
         strcpy(localHostName, (const char*) cstringLocalHostName);         strcpy(localHostName, (const char*) cstringLocalHostName);
Line 1005 
Line 1032 
 #endif #endif
  
 // System ID constants for Logger::put and Logger::trace // System ID constants for Logger::put and Logger::trace
   #ifdef PEGASUS_FLAVOR
   const String System::CIMLISTENER = "cimlistener" PEGASUS_FLAVOR;
   #else
 const String System::CIMLISTENER = "cimlistener"; // Listener systme ID const String System::CIMLISTENER = "cimlistener"; // Listener systme ID
   #endif
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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