(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.53 and 1.76

version 1.53, 2007/07/10 19:59:55 version 1.76, 2009/12/15 10:52:33
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   //
   //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #endif  
  
 #include <fstream> #include <fstream>
 #include <cctype>  // for tolower() #include <cctype>  // for tolower()
Line 48 
Line 44 
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # include "SystemWindows.cpp" # include "SystemWindows.cpp"
 #elif defined(PEGASUS_OS_TYPE_UNIX) || defined(PEGASUS_OS_VMS)  #elif defined(PEGASUS_OS_TYPE_UNIX)
 # include "SystemPOSIX.cpp" # include "SystemPOSIX.cpp"
   # include "SystemUnix.cpp"
   #elif defined(PEGASUS_OS_VMS)
   # include "SystemPOSIX.cpp"
   # include "SystemVms.cpp"
 #else #else
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
Line 183 
Line 183 
     return dirname;     return dirname;
 } }
  
   String System::getHostName()
   {
       static String _hostname;
       static MutexType _mutex = PEGASUS_MUTEX_INITIALIZER;
   
       // Use double-checked locking pattern to avoid overhead of
       // mutex on subsequent calls.
   
       if (0 == _hostname.size())
       {
           mutex_lock(&_mutex);
   
           if (0 == _hostname.size())
           {
               char hostname[PEGASUS_MAXHOSTNAMELEN + 1];
               // If gethostname() fails, an empty or truncated value is used.
               hostname[0] = 0;
               gethostname(hostname, sizeof(hostname));
               hostname[sizeof(hostname)-1] = 0;
               _hostname.assign(hostname);
           }
   
           mutex_unlock(&_mutex);
       }
   
       return _hostname;
   }
   
   static String _getFullyQualifiedHostName()
   {
       char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
   
       // Get the short name of the local host.
       // If gethostname() fails, an empty or truncated value is used.
       hostName[0] = 0;
       gethostname(hostName, sizeof(hostName));
       hostName[sizeof(hostName)-1] = 0;
   
   #if defined(PEGASUS_OS_ZOS)|| \
       defined(PEGASUS_OS_VMS)
   
       String fqName;
       struct addrinfo *resolv;
       struct addrinfo hint;
       struct hostent *he;
   
       memset (&hint, 0, sizeof(struct addrinfo));
       hint.ai_flags = AI_CANONNAME;
       hint.ai_family = AF_UNSPEC; // any family
       hint.ai_socktype = 0;       // any socket type
       hint.ai_protocol = 0;       // any protocol
       int success = System::getAddrInfo(hostName, NULL, &hint, &resolv);
       if (success==0)
       {
           // assign fully qualified hostname
           fqName.assign(resolv->ai_canonname);
       }
       else
       {
           if ((he = System::getHostByName(hostName)))
           {
               strncpy(hostName, he->h_name, sizeof(hostName) - 1);
           }
           // assign hostName
           // if gethostbyname was successful assign that result
           // else assign unqualified hostname
           fqName.assign(hostName);
       }
       if (resolv)
       {
           freeaddrinfo(resolv);
       }
   
       return fqName;
   
   #else /* !PEGASUS_OS_ZOS && !PEGASUS_OS_VMS */
   
       char hostEntryBuffer[8192];
       struct hostent hostEntryStruct;
       struct hostent* hostEntry = System::getHostByName(
           hostName, &hostEntryStruct, hostEntryBuffer, sizeof (hostEntryBuffer));
   
       if (hostEntry)
       {
           strncpy(hostName, hostEntry->h_name, sizeof(hostName) - 1);
       }
       return String(hostName);
   
   #endif
   }
   
   String System::getFullyQualifiedHostName()
   {
       static String _hostname;
       static MutexType _mutex = PEGASUS_MUTEX_INITIALIZER;
   
       // Use double-checked locking pattern to avoid overhead of
       // mutex on subsequent calls.
   
       if (0 == _hostname.size())
       {
           mutex_lock(&_mutex);
   
           if (0 == _hostname.size())
           {
               try
               {
                   _hostname = _getFullyQualifiedHostName();
               }
               catch (...)
               {
                   mutex_unlock(&_mutex);
                   throw;
               }
           }
   
           mutex_unlock(&_mutex);
       }
   
       return _hostname;
   }
   
 Boolean System::getHostIP(const String &hostName, int *af, String &hostIP) Boolean System::getHostIP(const String &hostName, int *af, String &hostIP)
 { {
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
Line 194 
Line 316 
     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(hostName.getCString(), 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,
             &((struct sockaddr_in*)(info->ai_addr))->sin_addr, ipAddress,              &(reinterpret_cast<struct sockaddr_in*>(info->ai_addr))->sin_addr,
               ipAddress,
             PEGASUS_INET_ADDRSTR_LEN);             PEGASUS_INET_ADDRSTR_LEN);
         hostIP = ipAddress;         hostIP = ipAddress;
         freeaddrinfo(info);         freeaddrinfo(info);
Line 210 
Line 333 
     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(hostName.getCString(), 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,
             &((struct sockaddr_in6*)(info->ai_addr))->sin6_addr, ipAddress,              &(reinterpret_cast<struct sockaddr_in6*>(info->ai_addr))->sin6_addr,
               ipAddress,
             PEGASUS_INET6_ADDRSTR_LEN);             PEGASUS_INET6_ADDRSTR_LEN);
         hostIP = ipAddress;         hostIP = ipAddress;
         freeaddrinfo(info);         freeaddrinfo(info);
Line 230 
Line 354 
     CString hostNameCString = hostName.getCString();     CString hostNameCString = hostName.getCString();
     const char* hostNamePtr = hostNameCString;     const char* hostNamePtr = hostNameCString;
  
 #if defined(PEGASUS_OS_LINUX)  
     char hostEntryBuffer[8192];  
     struct hostent hostEntryStruct;  
     int hostEntryErrno;  
   
     gethostbyname_r(  
         hostNamePtr,  
         &hostEntryStruct,  
         hostEntryBuffer,  
         sizeof(hostEntryBuffer),  
         &hostEntry,  
         &hostEntryErrno);  
 #elif defined(PEGASUS_OS_SOLARIS)  
     char hostEntryBuffer[8192];     char hostEntryBuffer[8192];
     struct hostent hostEntryStruct;     struct hostent hostEntryStruct;
     int hostEntryErrno;      hostEntry = getHostByName(hostNamePtr, &hostEntryStruct,
           hostEntryBuffer, sizeof (hostEntryBuffer));
     hostEntry = gethostbyname_r(  
         (char *)hostNamePtr,  
         &hostEntryStruct,  
         hostEntryBuffer,  
         sizeof(hostEntryBuffer),  
         &hostEntryErrno);  
 #else  
     hostEntry = gethostbyname(hostNamePtr);  
 #endif  
  
     if (hostEntry)     if (hostEntry)
     {     {
         ::memcpy( &inaddr, hostEntry->h_addr,4);         ::memcpy( &inaddr, hostEntry->h_addr,4);
         ipAddress = ::inet_ntoa( inaddr );         ipAddress = ::inet_ntoa( inaddr );
     }  
     hostIP = ipAddress;     hostIP = ipAddress;
     return true;     return true;
       }
       return false;
 #endif #endif
 } }
  
   
   #ifdef PEGASUS_ENABLE_IPV6
   Boolean System::isIPv6StackActive()
   {
       SocketHandle ip6Socket;
       if ((ip6Socket = Socket::createSocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP))
           == PEGASUS_INVALID_SOCKET)
       {
           if (getSocketError() == PEGASUS_INVALID_ADDRESS_FAMILY)
           {
               return false;
           }
       }
       else
       {
   #if defined(PEGASUS_OS_VMS)
           // vms has tcpipv6 support in the kernel so socket
           // will always work so a call to "bind" is needed
           // to complete this test.
   
           struct sockaddr_storage listenAddress;
           memset(&listenAddress, 0, sizeof (listenAddress));
           SocketLength addressLength;
   
           HostAddress::convertTextToBinary(
               HostAddress::AT_IPV6,
               "::1",
               &reinterpret_cast<struct sockaddr_in6*>(&listenAddress)->sin6_addr);
           listenAddress.ss_family = AF_INET6;
           reinterpret_cast<struct sockaddr_in6*>(&listenAddress)->sin6_port = 0;
   
           addressLength = sizeof(struct sockaddr_in6);
   
           if (::bind(
               ip6Socket,
               reinterpret_cast<struct sockaddr*>(&listenAddress),
               addressLength) < 0)
           {
               Socket::close(ip6Socket);
               return false;
           }
   #endif  // PEGASUS_OS_VMS
   
           Socket::close(ip6Socket);
       }
   
       return true;
   }
   #endif
   
 // ------------------------------------------------------------------------ // ------------------------------------------------------------------------
 // Convert a hostname into a a single host unique integer representation // Convert a hostname into a a single host unique integer representation
 // ------------------------------------------------------------------------ // ------------------------------------------------------------------------
 Boolean System::_acquireIP(const char* hostname, int *af, void *dst)  Boolean System::acquireIP(const char* hostname, int *af, void *dst)
 { {
 #ifdef PEGASUS_ENABLE_IPV6 #ifdef PEGASUS_ENABLE_IPV6
     String ipAddress;     String ipAddress;
Line 283 
Line 436 
 #else #else
     *af = AF_INET;     *af = AF_INET;
     Uint32 ip = 0xFFFFFFFF;     Uint32 ip = 0xFFFFFFFF;
     if (!hostname) return 0xFFFFFFFF;      if (!hostname)
       {
           *af = 0xFFFFFFFF;
           return false;
       }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 // This code used to check if the first character of "hostname" was alphabetic // This code used to check if the first character of "hostname" was alphabetic
Line 298 
Line 455 
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
     Uint32 tmp_addr = inet_addr((char *) hostname);     Uint32 tmp_addr = inet_addr((char *) hostname);
   
     struct hostent* hostEntry;     struct hostent* hostEntry;
  
 // Note: 0xFFFFFFFF is actually a valid IP address (255.255.255.255). // Note: 0xFFFFFFFF is actually a valid IP address (255.255.255.255).
Line 307 
Line 463 
  
     if (tmp_addr == 0xFFFFFFFF)  // if hostname is not an IP address     if (tmp_addr == 0xFFFFFFFF)  // if hostname is not an IP address
     {     {
 #if defined(PEGASUS_OS_LINUX)  
         char hostEntryBuffer[8192];  
         struct hostent hostEntryStruct;  
         int hostEntryErrno;  
   
         gethostbyname_r(  
             hostname,  
             &hostEntryStruct,  
             hostEntryBuffer,  
             sizeof(hostEntryBuffer),  
             &hostEntry,  
             &hostEntryErrno);  
 #elif defined(PEGASUS_OS_SOLARIS)  
         char hostEntryBuffer[8192];         char hostEntryBuffer[8192];
         struct hostent hostEntryStruct;         struct hostent hostEntryStruct;
         int hostEntryErrno;          hostEntry = getHostByName(hostname, &hostEntryStruct,
               hostEntryBuffer, sizeof (hostEntryBuffer));
  
         hostEntry = gethostbyname_r(  
             (char *)hostname,  
             &hostEntryStruct,  
             hostEntryBuffer,  
             sizeof(hostEntryBuffer),  
             &hostEntryErrno);  
 #elif defined(PEGASUS_OS_ZOS)  
         char hostName[PEGASUS_MAXHOSTNAMELEN + 1];  
         if (String::equalNoCase("localhost",String(hostname)))  
         {  
             gethostname( hostName, PEGASUS_MAXHOSTNAMELEN );  
             hostName[sizeof(hostName)-1] = 0;  
             hostEntry = gethostbyname(hostName);  
         }  
         else  
         {  
             hostEntry = gethostbyname((char *)hostname);  
         }  
 #else  
         hostEntry = gethostbyname((char *)hostname);  
 #endif  
         if (!hostEntry)         if (!hostEntry)
         {         {
             // error, couldn't resolve the ip             // error, couldn't resolve the ip
Line 367 
Line 490 
         // resolve hostaddr to a real host entry         // resolve hostaddr to a real host entry
         // casting to (const char *) as (char *) will work as (void *) too,         // casting to (const char *) as (char *) will work as (void *) too,
         // those it fits all platforms         // those it fits all platforms
 #if defined(PEGASUS_OS_LINUX)  
         char hostEntryBuffer[8192];         char hostEntryBuffer[8192];
         struct hostent hostEntryStruct;         struct hostent hostEntryStruct;
         int hostEntryErrno;  
   
         gethostbyaddr_r(  
             (const char*) &tmp_addr,  
             sizeof(tmp_addr),  
             AF_INET,  
             &hostEntryStruct,  
             hostEntryBuffer,  
             sizeof(hostEntryBuffer),  
             &hostEntry,  
             &hostEntryErrno);  
 #elif defined(PEGASUS_OS_SOLARIS)  
         char hostEntryBuffer[8192];  
         struct hostent hostEntryStruct;  
         int hostEntryErrno;  
   
         hostEntry = gethostbyaddr_r(  
             (const char *) &tmp_addr,  
             sizeof(tmp_addr),  
             AF_INET,  
             &hostEntryStruct,  
             hostEntryBuffer,  
             sizeof(hostEntryBuffer),  
             &hostEntryErrno);  
 #else  
         hostEntry =         hostEntry =
             gethostbyaddr((const char *) &tmp_addr, sizeof(tmp_addr), AF_INET);              getHostByAddr((const char*) &tmp_addr, sizeof(tmp_addr), AF_INET,
 #endif                  &hostEntryStruct, hostEntryBuffer, sizeof (hostEntryBuffer));
   
         if (hostEntry == 0)         if (hostEntry == 0)
         {         {
             // error, couldn't resolve the ip             // error, couldn't resolve the ip
Line 428 
Line 526 
     const char* hostname,     const char* hostname,
     Uint32* resolvedNameIP)     Uint32* resolvedNameIP)
 { {
       struct hostent* hostEntry;
   
     // ask the DNS for hostname resolution to IP address     // ask the DNS for hostname resolution to IP address
     // this can mean a time delay for as long as the DNS     // this can mean a time delay for as long as the DNS
     // takes to answer     // takes to answer
     struct hostent* hostEntry;  
   
 #if defined(PEGASUS_OS_LINUX)  
     char hostEntryBuffer[8192];  
     struct hostent hostEntryStruct;  
     int hostEntryErrno;  
   
     gethostbyname_r(  
         hostname,  
         &hostEntryStruct,  
         hostEntryBuffer,  
         sizeof(hostEntryBuffer),  
         &hostEntry,  
         &hostEntryErrno);  
 #elif defined(PEGASUS_OS_SOLARIS)  
     char hostEntryBuffer[8192];     char hostEntryBuffer[8192];
     struct hostent hostEntryStruct;     struct hostent hostEntryStruct;
     int hostEntryErrno;      hostEntry = getHostByName(hostname, &hostEntryStruct,
           hostEntryBuffer, sizeof (hostEntryBuffer));
  
     hostEntry = gethostbyname_r(  
         (char *)hostname,  
         &hostEntryStruct,  
         hostEntryBuffer,  
         sizeof(hostEntryBuffer),  
         &hostEntryErrno);  
 #else  
     hostEntry = gethostbyname((char *)hostname);  
 #endif  
     if (hostEntry == 0)     if (hostEntry == 0)
     {     {
         // error, couldn't resolve the hostname to an ip address         // error, couldn't resolve the hostname to an ip address
Line 483 
Line 560 
 { {
     struct hostent *entry;     struct hostent *entry;
  
     entry = gethostbyaddr((const char *) &ip_addr, sizeof(ip_addr), AF_INET);      entry = getHostByAddr((const char *) &ip_addr, sizeof(ip_addr), AF_INET);
  
     if (entry == 0)     if (entry == 0)
     {     {
Line 511 
Line 588 
 #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 519 
Line 595 
             return !memcmp(&ip6, binIPAddress, sizeof (ip6));             return !memcmp(&ip6, binIPAddress, sizeof (ip6));
 #endif #endif
         case AF_INET:         case AF_INET:
             Uint32 n = ntohl( *(Uint32*)binIPAddress);          {
             return !memcmp(&ip4, &n, sizeof (ip4));              Uint32 tmp;
               memcpy(&tmp, binIPAddress, sizeof(Uint32));
               Uint32 n = ntohl(tmp);
               return n >= PEGASUS_IPV4_LOOPBACK_RANGE_START &&
                   n <= PEGASUS_IPV4_LOOPBACK_RANGE_END;
           }
     }     }
  
     return false;     return false;
Line 541 
Line 622 
     hints.ai_socktype = SOCK_STREAM;     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;     hints.ai_protocol = IPPROTO_TCP;
     res1root = res2root = 0;     res1root = res2root = 0;
     getaddrinfo(csName, 0, &hints, &res1root);      getAddrInfo(csName, 0, &hints, &res1root);
     getaddrinfo(localHostName, 0, &hints, &res2root);      getAddrInfo(localHostName, 0, &hints, &res2root);
  
     res1 = res1root;     res1 = res1root;
     while (res1 && !isLocal)     while (res1 && !isLocal)
     {     {
         if (isLoopBack(AF_INET,         if (isLoopBack(AF_INET,
             &((struct sockaddr_in*)res1->ai_addr)->sin_addr))              &(reinterpret_cast<struct sockaddr_in*>(res1->ai_addr))->sin_addr))
         {         {
             isLocal = true;             isLocal = true;
             break;             break;
Line 557 
Line 638 
         res2 = res2root;         res2 = res2root;
         while (res2)         while (res2)
         {         {
             if (!memcmp(&((struct sockaddr_in*)res1->ai_addr)->sin_addr,              if (!memcmp(
                 &((struct sockaddr_in*)res2->ai_addr)->sin_addr,                      &(reinterpret_cast<struct sockaddr_in*>(res1->ai_addr))->
                           sin_addr,
                       &(reinterpret_cast<struct sockaddr_in*>(res2->ai_addr))->
                           sin_addr,
                 sizeof (struct in_addr)))                 sizeof (struct in_addr)))
             {             {
                 isLocal = true;                 isLocal = true;
Line 568 
Line 652 
         }         }
         res1 = res1->ai_next;         res1 = res1->ai_next;
     }     }
       if (res1root)
       {
     freeaddrinfo(res1root);     freeaddrinfo(res1root);
       }
       if (res2root)
       {
     freeaddrinfo(res2root);     freeaddrinfo(res2root);
       }
     if (isLocal)     if (isLocal)
     {     {
         return true;         return true;
Line 577 
Line 667 
  
     hints.ai_family = AF_INET6;     hints.ai_family = AF_INET6;
     res1root = res2root = 0;     res1root = res2root = 0;
     getaddrinfo(csName, 0, &hints, &res1root);      getAddrInfo(csName, 0, &hints, &res1root);
     getaddrinfo(localHostName, 0, &hints, &res2root);      getAddrInfo(localHostName, 0, &hints, &res2root);
  
     res1 = res1root;     res1 = res1root;
     while (res1 && !isLocal)     while (res1 && !isLocal)
     {     {
         if (isLoopBack(AF_INET6,          if (isLoopBack(
             &((struct sockaddr_in6*)res1->ai_addr)->sin6_addr))                  AF_INET6,
                   &(reinterpret_cast<struct sockaddr_in6*>(res1->ai_addr))->
                       sin6_addr))
         {         {
             isLocal = true;             isLocal = true;
             break;             break;
Line 593 
Line 685 
         res2 = res2root;         res2 = res2root;
         while (res2)         while (res2)
         {         {
             if (!memcmp(&((struct sockaddr_in6*)res1->ai_addr)->sin6_addr,              if (!memcmp(
                 &((struct sockaddr_in6*)res2->ai_addr)->sin6_addr,                      &(reinterpret_cast<struct sockaddr_in6*>(res1->ai_addr))->
                           sin6_addr,
                       &(reinterpret_cast<struct sockaddr_in6*>(res2->ai_addr))->
                           sin6_addr,
                 sizeof (struct in6_addr)))                 sizeof (struct in6_addr)))
             {             {
                 isLocal = true;                 isLocal = true;
Line 604 
Line 699 
         }         }
         res1 = res1->ai_next;         res1 = res1->ai_next;
     }     }
       if (res1root)
       {
     freeaddrinfo(res1root);     freeaddrinfo(res1root);
       }
       if (res2root)
       {
     freeaddrinfo(res2root);     freeaddrinfo(res2root);
       }
     return isLocal;     return isLocal;
 #else #else
  
Line 621 
Line 721 
     // Note: Platforms already supporting the inet_aton()     // Note: Platforms already supporting the inet_aton()
     //       should define their platform here,     //       should define their platform here,
     //        as this is the superior way to work     //        as this is the superior way to work
 #if defined(PEGASUS_OS_LINUX) || defined(PEGASUS_OS_AIX)  #if defined(PEGASUS_OS_LINUX) || \
       defined(PEGASUS_OS_AIX) || \
       defined(PEGASUS_OS_HPUX) || \
       defined(PEGASUS_OS_PASE) || \
       defined(PEGASUS_OS_VMS)
  
     struct in_addr inaddr;     struct in_addr inaddr;
     // if inet_aton failed(return=0),     // if inet_aton failed(return=0),
Line 691 
Line 795 
 #endif #endif
 } }
  
   struct hostent* System::getHostByName(
       const char* name,
       struct hostent* he,
       char* buf,
       size_t len)
   {
       int hostEntryErrno = 0;
       struct hostent* hostEntry = 0;
       unsigned int maxTries = 5;
   
       do
       {
   #if defined(PEGASUS_OS_LINUX)
           gethostbyname_r(name,
               he,
               buf,
               len,
               &hostEntry,
               &hostEntryErrno);
   #elif defined(PEGASUS_OS_SOLARIS)
           hostEntry = gethostbyname_r((char *)name,
                           he,
                           buf,
                           len,
                           &hostEntryErrno);
   #elif defined(PEGASUS_OS_ZOS)
           char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
           if (String::equalNoCase("localhost", String(name)))
           {
               gethostname(hostName, PEGASUS_MAXHOSTNAMELEN);
               hostName[sizeof(hostName) - 1] = 0;
               hostEntry = gethostbyname(hostName);
           }
           else
           {
               hostEntry = gethostbyname((char *)name);
           }
           hostEntryErrno = h_errno;
   #else
           hostEntry = gethostbyname((char *)name);
           hostEntryErrno = h_errno;
   #endif
       } while (hostEntry == 0 && hostEntryErrno == TRY_AGAIN &&
                maxTries-- > 0);
   
       return hostEntry;
   }
   
   struct hostent* System::getHostByAddr(
       const char *addr,
       int len,
       int type,
       struct hostent* he,
       char* buf,
       size_t buflen)
   {
       int hostEntryErrno = 0;
       struct hostent* hostEntry = 0;
       unsigned int maxTries = 5;
   
       do
       {
   #if defined(PEGASUS_OS_LINUX)
           gethostbyaddr_r(addr,
               len,
               type,
               he,
               buf,
               buflen,
               &hostEntry,
               &hostEntryErrno);
   #elif defined(PEGASUS_OS_SOLARIS)
           char hostEntryBuffer[8192];
           struct hostent hostEntryStruct;
   
           hostEntry = gethostbyaddr_r(addr,
                           len,
                           type,
                           he,
                           buf,
                           buflen,
                           &hostEntryErrno);
   #else
           hostEntry = gethostbyaddr(addr,
                           len,
                           type);
           hostEntryErrno = h_errno;
   #endif
       } while (hostEntry == 0 && hostEntryErrno == TRY_AGAIN &&
                maxTries-- > 0);
   
       return hostEntry;
   }
   
   #if defined(PEGASUS_OS_ZOS) || \
       defined(PEGASUS_OS_VMS) || \
       defined(PEGASUS_ENABLE_IPV6)
   
   int System::getAddrInfo(
       const char *hostname,
       const char *servname,
       const struct addrinfo *hints,
       struct addrinfo **res)
   {
       int rc = 0;
       unsigned int maxTries = 5;
   
   #ifdef PEGASUS_OS_PASE
       CString hostNameCString;
       if (String::equalNoCase(hostname, "localhost"))
       {
           hostNameCString = getHostName().getCString();
           hostname = (const char*)hostNameCString;
       }
   #endif
   
       while ((rc = getaddrinfo(hostname,
                        servname,
                        hints,
                        res)) == EAI_AGAIN &&
              maxTries-- > 0)
           ;
       return rc;
   }
   
   int System::getNameInfo(
       const struct sockaddr *sa,
       size_t salen,
       char *host,
       size_t hostlen,
       char *serv,
       size_t servlen,
       int flags)
   {
       int rc = 0;
       unsigned int maxTries = 5;
   
       while ((rc = getnameinfo(sa,
                        salen,
                        host,
                        hostlen,
                        serv,
                        servlen,
                        flags)) == EAI_AGAIN &&
              maxTries-- > 0)
           ;
       return rc;
   }
   
   #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.53  
changed lines
  Added in v.1.76

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2