pegasus/src/Pegasus/Common/System.cpp - diff

Return to System.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/System.cpp between version 1.34 and 1.37

version 1.34, 2005/11/15 14:40:29

version 1.37, 2006/01/30 16:17:08

Line 1

//%2005////////////////////////////////////////////////////////////////////////

//%2006////////////////////////////////////////////////////////////////////////

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

Line 8

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a copy

// of this software and associated documentation files (the "Software"), to

Line 37

Line 39

// Robert Kieninger, IBM (kieningr@de.ibm.com) for Bug#667

// Dave Sudlik, IBM (dsudlik@us.ibm.com) for Bug#1462

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// David Dillard, Symantec Corp. (david_dillard@symantec.com)

//%/////////////////////////////////////////////////////////////////////////////

Line 51

Line 54

#include "System.h"

#include "Socket.h"

#ifdef PEGASUS_PLATFORM_WIN32_IX86_MSVC

#ifdef PEGASUS_OS_TYPE_WINDOWS

# include <windows.h>

#else

# include <arpa/inet.h>

Line 204

Line 207

String System::getHostIP(const String &hostName)

{

struct hostent * phostent;

struct hostent* hostEntry;

struct in_addr inaddr;

String ipAddress = String::EMPTY;

String ipAddress;

CString csName = hostName.getCString();

CString hostNameCString = hostName.getCString();

const char * ccName = csName;

const char* hostNamePtr = hostNameCString;

#ifndef PEGASUS_OS_OS400

if ((phostent = ::gethostbyname(ccName)) != NULL)

#if defined(PEGASUS_OS_LINUX)

#else

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];

struct hostent hostEntryStruct;

int hostEntryErrno;

hostEntry = gethostbyname_r(

(char *)hostNamePtr,

&hostEntryStruct,

hostEntryBuffer,

sizeof(hostEntryBuffer),

&hostEntryErrno);

#elif defined(PEGASUS_OS_OS400)

char ebcdicHost[PEGASUS_MAXHOSTNAMELEN];

if (strlen(ccName) < PEGASUS_MAXHOSTNAMELEN)

if (strlen(hostNamePtr) < PEGASUS_MAXHOSTNAMELEN)

strcpy(ebcdicHost, ccName);

strcpy(ebcdicHost, hostNamePtr);

else

return ipAddress;

AtoE(ebcdicHost);

if ((phostent = ::gethostbyname(ebcdicHost)) != NULL)

hostEntry = gethostbyname(ebcdicHost);

#else

hostEntry = gethostbyname(hostNamePtr);

#endif

if (hostEntry)

{

::memcpy( &inaddr, phostent->h_addr,4);

::memcpy( &inaddr, hostEntry->h_addr,4);

#if defined(PEGASUS_OS_OS400)

char * gottenIPAdress = NULL;

gottenIPAdress = ::inet_ntoa( inaddr );

Line 273

Line 302

Uint32 tmp_addr = inet_addr((char *) hostname);

#endif

struct hostent *entry;

struct hostent* hostEntry;

// Note: 0xFFFFFFFF is actually a valid IP address (255.255.255.255).

// A better solution would be to use inet_aton() or equivalent, as

Line 281

Line 310

if (tmp_addr == 0xFFFFFFFF) // if hostname is not an IP address

{

#ifdef PEGASUS_PLATFORM_SOLARIS_SPARC_CC

#if defined(PEGASUS_OS_LINUX)

#define HOSTENT_BUFF_SIZE 8192

char hostEntryBuffer[8192];

char buf[HOSTENT_BUFF_SIZE];

struct hostent hostEntryStruct;

int h_errorp;

int hostEntryErrno;

struct hostent hp;

gethostbyname_r(

entry = gethostbyname_r((char *)hostname, &hp, buf,

hostname,

HOSTENT_BUFF_SIZE, &h_errorp);

&hostEntryStruct,

hostEntryBuffer,

sizeof(hostEntryBuffer),

&hostEntry,

&hostEntryErrno);

#elif defined(PEGASUS_OS_SOLARIS)

char hostEntryBuffer[8192];

struct hostent hostEntryStruct;

int hostEntryErrno;

hostEntry = gethostbyname_r(

(char *)hostname,

&hostEntryStruct,

hostEntryBuffer,

sizeof(hostEntryBuffer),

&hostEntryErrno);

#elif defined(PEGASUS_OS_OS400)

entry = gethostbyname(ebcdicHost);

hostEntry = gethostbyname(ebcdicHost);

#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;

entry = gethostbyname(hostName);

hostEntry = gethostbyname(hostName);

} else

{

entry = gethostbyname((char *)hostname);

hostEntry = gethostbyname((char *)hostname);

}

#else

entry = gethostbyname((char *)hostname);

hostEntry = gethostbyname((char *)hostname);

#endif

if (!entry)

if (!hostEntry)

{

return 0xFFFFFFFF;

}

unsigned char ip_part1,ip_part2,ip_part3,ip_part4;

ip_part1 = entry->h_addr[0];

ip_part1 = hostEntry->h_addr[0];

ip_part2 = entry->h_addr[1];

ip_part2 = hostEntry->h_addr[1];

ip_part3 = entry->h_addr[2];

ip_part3 = hostEntry->h_addr[2];

ip_part4 = entry->h_addr[3];

ip_part4 = hostEntry->h_addr[3];

ip = ip_part1;

ip = (ip << 8) + ip_part2;

ip = (ip << 8) + ip_part3;

Line 325

Line 369

// resolve hostaddr to a real host entry

// casting to (const char *) as (char *) will work as (void *) too, those it fits all platforms

#ifndef PEGASUS_OS_OS400

entry = gethostbyaddr((const char *) &tmp_addr, sizeof(tmp_addr), AF_INET);

hostEntry = gethostbyaddr((const char *) &tmp_addr, sizeof(tmp_addr), AF_INET);

#else

entry = gethostbyaddr((char *) &tmp_addr, sizeof(tmp_addr), AF_INET);

hostEntry = gethostbyaddr((char *) &tmp_addr, sizeof(tmp_addr), AF_INET);

#endif

if (entry == 0)

if (hostEntry == 0)

{

// error, couldn't resolve the ip

return 0xFFFFFFFF;

Line 338

Line 382

unsigned char ip_part1,ip_part2,ip_part3,ip_part4;

ip_part1 = entry->h_addr[0];

ip_part1 = hostEntry->h_addr[0];

ip_part2 = entry->h_addr[1];

ip_part2 = hostEntry->h_addr[1];

ip_part3 = entry->h_addr[2];

ip_part3 = hostEntry->h_addr[2];

ip_part4 = entry->h_addr[3];

ip_part4 = hostEntry->h_addr[3];

ip = ip_part1;

ip = (ip << 8) + ip_part2;

ip = (ip << 8) + ip_part3;

Legend:

Removed from v.1.34
changed lines
	Added in v.1.37

No CVS admin address has been configured