(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.50 and 1.51

version 1.50, 2007/02/13 18:30:58 version 1.51, 2007/06/05 09:41:53
Line 52 
Line 52 
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
  
 #if defined(PEGASUS_OS_OS400)  
 # include "EBCDIC_OS400.h"  
 #endif  
   
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
Line 216 
Line 212 
         hostEntryBuffer,         hostEntryBuffer,
         sizeof(hostEntryBuffer),         sizeof(hostEntryBuffer),
         &hostEntryErrno);         &hostEntryErrno);
 #elif defined(PEGASUS_OS_OS400)  
     char ebcdicHost[PEGASUS_MAXHOSTNAMELEN];  
     if (strlen(hostNamePtr) < PEGASUS_MAXHOSTNAMELEN)  
         strcpy(ebcdicHost, hostNamePtr);  
     else  
         return ipAddress;  
     AtoE(ebcdicHost);  
     hostEntry = gethostbyname(ebcdicHost);  
 #else #else
     hostEntry = gethostbyname(hostNamePtr);     hostEntry = gethostbyname(hostNamePtr);
 #endif #endif
Line 231 
Line 219 
     if (hostEntry)     if (hostEntry)
     {     {
         ::memcpy( &inaddr, hostEntry->h_addr,4);         ::memcpy( &inaddr, hostEntry->h_addr,4);
 #if defined(PEGASUS_OS_OS400)  
         char * gottenIPAdress = NULL;  
         gottenIPAdress = ::inet_ntoa( inaddr );  
   
         if (gottenIPAdress != NULL)  
         {  
             EtoA(gottenIPAdress);  
             ipAddress.assign(gottenIPAdress);  
         }  
 #else  
         ipAddress = ::inet_ntoa( inaddr );         ipAddress = ::inet_ntoa( inaddr );
 #endif  
     }     }
     return ipAddress;     return ipAddress;
 } }
Line 255 
Line 232 
     Uint32 ip = 0xFFFFFFFF;     Uint32 ip = 0xFFFFFFFF;
     if (!hostname) return 0xFFFFFFFF;     if (!hostname) return 0xFFFFFFFF;
  
 #ifdef PEGASUS_OS_OS400  
     char ebcdicHost[PEGASUS_MAXHOSTNAMELEN];  
     if (strlen(hostname) < PEGASUS_MAXHOSTNAMELEN)  
         strcpy(ebcdicHost, hostname);  
     else  
         return 0xFFFFFFFF;  
     AtoE(ebcdicHost);  
 #endif  
   
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 // 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
 // to indicate hostname instead of IP address. But RFC 1123, section 2.1, // to indicate hostname instead of IP address. But RFC 1123, section 2.1,
Line 276 
Line 244 
 // Hence the call to inet_addr() first. // Hence the call to inet_addr() first.
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 #ifdef PEGASUS_OS_OS400  
     Uint32 tmp_addr = inet_addr(ebcdicHost);  
 #else  
     Uint32 tmp_addr = inet_addr((char *) hostname);     Uint32 tmp_addr = inet_addr((char *) hostname);
 #endif  
  
     struct hostent* hostEntry;     struct hostent* hostEntry;
  
Line 313 
Line 277 
             hostEntryBuffer,             hostEntryBuffer,
             sizeof(hostEntryBuffer),             sizeof(hostEntryBuffer),
             &hostEntryErrno);             &hostEntryErrno);
 #elif defined(PEGASUS_OS_OS400)  
         hostEntry = gethostbyname(ebcdicHost);  
 #elif defined(PEGASUS_OS_ZOS) #elif defined(PEGASUS_OS_ZOS)
         char hostName[PEGASUS_MAXHOSTNAMELEN + 1];         char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
         if (String::equalNoCase("localhost",String(hostname)))         if (String::equalNoCase("localhost",String(hostname)))
Line 377 
Line 339 
             hostEntryBuffer,             hostEntryBuffer,
             sizeof(hostEntryBuffer),             sizeof(hostEntryBuffer),
             &hostEntryErrno);             &hostEntryErrno);
 #elif defined(PEGASUS_OS_OS400)  
         hostEntry =  
             gethostbyaddr((char *) &tmp_addr, sizeof(tmp_addr), AF_INET);  
 #else #else
         hostEntry =         hostEntry =
             gethostbyaddr((const char *) &tmp_addr, sizeof(tmp_addr), AF_INET);             gethostbyaddr((const char *) &tmp_addr, sizeof(tmp_addr), AF_INET);
Line 526 
Line 485 
 { {
     struct hostent *entry;     struct hostent *entry;
  
 #ifndef PEGASUS_OS_OS400  
     entry = gethostbyaddr((const char *) &ip_addr, sizeof(ip_addr), AF_INET);     entry = gethostbyaddr((const char *) &ip_addr, sizeof(ip_addr), AF_INET);
 #else  
     entry = gethostbyaddr((char *) &ip_addr, sizeof(ip_addr), AF_INET);  
 #endif  
     if (entry == 0)     if (entry == 0)
     {     {
         // error, couldn't resolve the ip         // error, couldn't resolve the ip
Line 562 
Line 518 
     Uint32 tmp_addr = 0xFFFFFFFF;     Uint32 tmp_addr = 0xFFFFFFFF;
     Boolean hostNameIsIPNotation;     Boolean hostNameIsIPNotation;
  
 #ifdef PEGASUS_OS_OS400  
     AtoE(cc_hostname);  
 #endif  
   
     // 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

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