(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.77 and 1.79.2.1

version 1.77, 2009/12/15 11:39:34 version 1.79.2.1, 2013/06/03 22:35:13
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 241 
Line 249 
     return dirname;     return dirname;
 } }
  
 String System::getHostName()  //Wrapper on ::gethostname to be used in different parts of
   //this file avoiding class membership fee
   //
   // If gethostname() fails, an empty or truncated value is used.
   static void _get_hostName(char *hostname, const Uint32 len)
   {
       if( 0 > gethostname(hostname, len))
 { {
     static String _hostname;          hostname[0] = 0;
     static MutexType _mutex = PEGASUS_MUTEX_INITIALIZER;          PEG_TRACE((TRC_OS_ABSTRACTION, Tracer::LEVEL1,
              "gethostname failed: %s",
              (const char*)PEGASUS_SYSTEM_ERRORMSG.getCString()));
       }
   }
  
   String System::getHostName()
   {
     // 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())
         {         {
             char hostname[PEGASUS_MAXHOSTNAMELEN + 1];             char hostname[PEGASUS_MAXHOSTNAMELEN + 1];
             // If gethostname() fails, an empty or truncated value is used.              _get_hostName(hostname, sizeof(hostname));
             hostname[0] = 0;  
             gethostname(hostname, sizeof(hostname));  
             hostname[sizeof(hostname)-1] = 0;             hostname[sizeof(hostname)-1] = 0;
             _hostname.assign(hostname);             _hostname.assign(hostname);
         }         }
   
         mutex_unlock(&_mutex);  
     }     }
  
     return _hostname;     return _hostname;
Line 273 
Line 289 
 { {
     char hostName[PEGASUS_MAXHOSTNAMELEN + 1];     char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
  
     // Get the short name of the local host.      _get_hostName(hostName, sizeof(hostName));
     // If gethostname() fails, an empty or truncated value is used.  
     hostName[0] = 0;  
     gethostname(hostName, sizeof(hostName));  
     hostName[sizeof(hostName)-1] = 0;     hostName[sizeof(hostName)-1] = 0;
  
 #if defined(PEGASUS_OS_ZOS)|| \ #if defined(PEGASUS_OS_ZOS)|| \
Line 334 
Line 347 
  
 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))
       {
           _get_hostName(localHostName, sizeof(localHostName));
           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 405 
     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 422 
     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 440 
     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 667 
Line 696 
  
 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();
     struct addrinfo hints, *res1, *res2, *res1root, *res2root;     struct addrinfo hints, *res1, *res2, *res1root, *res2root;
     char localHostName[PEGASUS_MAXHOSTNAMELEN];     char localHostName[PEGASUS_MAXHOSTNAMELEN];
     gethostname(localHostName, PEGASUS_MAXHOSTNAMELEN);      _get_hostName(localHostName, sizeof(localHostName));
     Boolean isLocal = false;     Boolean isLocal = false;
  
     memset(&hints, 0, sizeof(hints));     memset(&hints, 0, sizeof(hints));
Line 807 
Line 846 
  
     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 882 
Line 919 
         char hostName[PEGASUS_MAXHOSTNAMELEN + 1];         char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
         if (String::equalNoCase("localhost", String(name)))         if (String::equalNoCase("localhost", String(name)))
         {         {
             gethostname(hostName, PEGASUS_MAXHOSTNAMELEN);              _get_hostName(hostName, sizeof(hostName));
             hostName[sizeof(hostName) - 1] = 0;             hostName[sizeof(hostName) - 1] = 0;
             hostEntry = gethostbyname(hostName);             hostEntry = gethostbyname(hostName);
         }         }
Line 947 
Line 984 
     return hostEntry;     return hostEntry;
 } }
  
 #if defined(PEGASUS_OS_ZOS) || \  
     defined(PEGASUS_OS_VMS) || \  
     defined(PEGASUS_ENABLE_IPV6)  
  
 int System::getAddrInfo( int System::getAddrInfo(
     const char *hostname,     const char *hostname,
Line 958 
Line 992 
     struct addrinfo **res)     struct addrinfo **res)
 { {
     int rc = 0;     int rc = 0;
     unsigned int maxTries = 5;      Uint16 maxTries = 5;
  
 #ifdef PEGASUS_OS_PASE #ifdef PEGASUS_OS_PASE
     CString hostNameCString;     CString hostNameCString;
Line 969 
Line 1003 
     }     }
 #endif #endif
  
     while ((rc = getaddrinfo(hostname,      do
       {
           rc = getaddrinfo(hostname,
                      servname,                      servname,
                      hints,                      hints,
                      res)) == EAI_AGAIN &&                       res);
            maxTries-- > 0)          if( 0 != rc && rc != EAI_AGAIN)
         ;          {
               PEG_TRACE((TRC_OS_ABSTRACTION, Tracer::LEVEL1,
                           "getaddrinfo failed: %s",gai_strerror(rc)));
               break;
           }
       } while( rc == EAI_AGAIN && --maxTries > 0);
     return rc;     return rc;
 } }
  
Line 988 
Line 1029 
     int flags)     int flags)
 { {
     int rc = 0;     int rc = 0;
     unsigned int maxTries = 5;      Uint16 maxTries = 5;
       do
     while ((rc = getnameinfo(sa,      {
           rc = getnameinfo(sa,
                      salen,                      salen,
                      host,                      host,
                      hostlen,                      hostlen,
                      serv,                      serv,
                      servlen,                      servlen,
                      flags)) == EAI_AGAIN &&                  flags);
            maxTries-- > 0)          if( rc != 0 && rc != EAI_AGAIN)
         ;          {
               PEG_TRACE((TRC_OS_ABSTRACTION, Tracer::LEVEL1,
                           "getnameinfo failed: %s",gai_strerror(rc)));
               break;
           }
       } while( rc == EAI_AGAIN && --maxTries > 0);
     return rc;     return rc;
 } }
  
 #endif  
  
 // System ID constants for Logger::put and Logger::trace // System ID constants for Logger::put and Logger::trace
 #ifdef PEGASUS_FLAVOR #ifdef PEGASUS_FLAVOR

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