X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=d5be4c01b57447c901280546bcc9e1cf12e48e72;hb=bf3a95a3d129e18937f88c349bfe5cdcaef42d55;hp=589609b0a1850d174de5f56d8ca8e4a1bd762aa4;hpb=a43ecb687bb299c0affce3561917cb7878e855a5;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 589609b0..d5be4c01 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 18:53:02 $ - Version: $Revision: 1.73 $ + Date: $Date: 2005/01/15 22:40:23 $ + Version: $Revision: 1.96 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,6 +18,7 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" +#include // For GetCurrentDate, GetCurrentTime #include @@ -37,23 +38,68 @@ #endif #endif +// For GetMACAddress +#ifdef _WIN32 +#include +#include +#else +#include +#include +#include +#include +#endif + +// How do I do that in CMake ? +#ifdef __APPLE__ +#define HAVE_SA_LEN +#define CMAKE_HAVE_NET_IF_DL_H +#define CMAKE_HAVE_NETINET_IN_H +#define CMAKE_HAVE_NET_IF_H +#endif //APPLE + +#ifdef CMAKE_HAVE_SYS_IOCTL_H +#include // For SIOCGIFCONF on Linux +#endif +#ifdef CMAKE_HAVE_SYS_SOCKET_H +#include +#endif +#ifdef CMAKE_HAVE_SYS_SOCKIO_H +#include // For SIOCGIFCONF on SunOS +#endif +#ifdef CMAKE_HAVE_NET_IF_H +#include +#endif +#ifdef CMAKE_HAVE_NETINET_IN_H +#include //For IPPROTO_IP +#endif +#ifdef CMAKE_HAVE_NET_IF_DL_H +#include +#endif +#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) +// This is absolutely necesseray on SunOS +#include +#endif + namespace gdcm { /** * \ingroup Globals * \brief Provide a better 'c++' approach for sprintf * For example c code is: - * sprintf(trash, "%04x|%04x", group , element); + * sprintf(trash, "%04x|%04x", group , elem); * - * c++ is + * c++ code is * std::ostringstream buf; * buf << std::right << std::setw(4) << std::setfill('0') << std::hex * << group << "|" << std::right << std::setw(4) << std::setfill('0') - * << std::hex << element; + * << std::hex << elem; * buf.str(); + * + * gdcm style code is + * Format("%04x|%04x", group , elem); */ -std::string Util::Format(const char* format, ...) +std::string Util::Format(const char *format, ...) { char buffer[2048]; va_list args; @@ -70,8 +116,8 @@ std::string Util::Format(const char* format, ...) * \ingroup Globals * \brief Because not available in C++ (?) */ -void Util::Tokenize (const std::string& str, - std::vector& tokens, +void Util::Tokenize (const std::string &str, + std::vector &tokens, const std::string& delimiters) { std::string::size_type lastPos = str.find_first_not_of(delimiters,0); @@ -90,8 +136,8 @@ void Util::Tokenize (const std::string& str, * Counts the number of occurences of a substring within a string */ -int Util::CountSubstring (const std::string& str, - const std::string& subStr) +int Util::CountSubstring (const std::string &str, + const std::string &subStr) { int count = 0; // counts how many times it appears std::string::size_type x = 0; // The index position in the string @@ -116,7 +162,7 @@ int Util::CountSubstring (const std::string& str, * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from */ -std::string Util::CreateCleanString(std::string const & s) +std::string Util::CreateCleanString(std::string const &s) { std::string str = s; @@ -147,7 +193,7 @@ std::string Util::CreateCleanString(std::string const & s) * \brief Add a SEPARATOR to the end of the name is necessary * @param pathname file/directory name to normalize */ -std::string Util::NormalizePath(std::string const & pathname) +std::string Util::NormalizePath(std::string const &pathname) { const char SEPARATOR_X = '/'; const char SEPARATOR_WIN = '\\'; @@ -167,7 +213,7 @@ std::string Util::NormalizePath(std::string const & pathname) * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ -std::string Util::GetPath(std::string const & fullName) +std::string Util::GetPath(std::string const &fullName) { std::string res = fullName; int pos1 = res.rfind("/"); @@ -189,7 +235,7 @@ std::string Util::GetPath(std::string const & fullName) * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ -std::string Util::GetName(std::string const & fullName) +std::string Util::GetName(std::string const &fullName) { std::string filename = fullName; @@ -240,10 +286,10 @@ std::string Util::GetCurrentTime() * that needed to be escaped with an extra backslash for doxygen) \\0 * as you want. */ -std::string Util::DicomString(const char* s, size_t l) +std::string Util::DicomString(const char *s, size_t l) { std::string r(s, s+l); - assert( !(r.size() % 2) ); // == basically 'l' is even + gdcmAssertMacro( !(r.size() % 2) ); // == basically 'l' is even return r; } @@ -259,7 +305,7 @@ std::string Util::DicomString(const char* s, size_t l) * except it doesn't take a lenght. * It only pad with a null character if length is odd */ -std::string Util::DicomString(const char* s) +std::string Util::DicomString(const char *s) { size_t l = strlen(s); if( l%2 ) @@ -267,7 +313,7 @@ std::string Util::DicomString(const char* s) l++; } std::string r(s, s+l); - assert( !(r.size() % 2) ); + gdcmAssertMacro( !(r.size() % 2) ); return r; } @@ -278,7 +324,7 @@ std::string Util::DicomString(const char* s) * - We allow padding of even lenght string by either a null * character of a space */ -bool Util::DicomStringEqual(const std::string& s1, const char *s2) +bool Util::DicomStringEqual(const std::string &s1, const char *s2) { // s2 is the string from the DICOM reference: 'MONOCHROME1' std::string s1_even = s1; //Never change input parameter @@ -298,27 +344,16 @@ bool Util::DicomStringEqual(const std::string& s1, const char *s2) */ bool Util::IsCurrentProcessorBigEndian() { - uint16_t intVal = 1; - uint8_t bigEndianRepr[4] = { 0x00, 0x00, 0x00, 0x01 }; - int res = memcmp(reinterpret_cast(&intVal), - reinterpret_cast(bigEndianRepr), 4); - if (res == 0) - return true; - else - return false; +#ifdef GDCM_WORDS_BIGENDIAN + return true; +#else + return false; +#endif } -#include -#include -#include -#include //for bzero -#include #ifdef _WIN32 -#include -#include -#include typedef BOOL(WINAPI * pSnmpExtensionInit) ( IN DWORD dwTimeZeroReference, OUT HANDLE * hPollForTrapEvent, @@ -341,89 +376,52 @@ typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( OUT AsnObjectIdentifier * supportedView); #endif //_WIN32 -#ifdef __linux__ -#include -#include -#include -#include -#include -#endif - -#ifdef __HP_aCC -#include -#endif - -#ifdef _AIX -#include -#include -#endif -long GetMacAddrSys ( u_char *addr) +long GetMacAddrSys ( unsigned char *addr) { #ifdef _WIN32 WSADATA WinsockData; - if (WSAStartup(MAKEWORD(2, 0), &WinsockData) != 0) { - fprintf(stderr, "This program requires Winsock 2.x!\n"); - return; + if (WSAStartup(MAKEWORD(2, 0), &WinsockData) != 0) + { + std::cerr << "This program requires Winsock 2.x!" << std::endl; + return -1; } - HINSTANCE m_hInst; - pSnmpExtensionInit m_Init; - pSnmpExtensionInitEx m_InitEx; - pSnmpExtensionQuery m_Query; - pSnmpExtensionTrap m_Trap; HANDLE PollForTrapEvent; AsnObjectIdentifier SupportedView; - UINT OID_ifEntryType[] = { - 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 - }; - UINT OID_ifEntryNum[] = { - 1, 3, 6, 1, 2, 1, 2, 1 - }; - UINT OID_ipMACEntAddr[] = { - 1, 3, 6, 1, 2, 1, 2, 2, 1, 6 - }; //, 1 ,6 }; - AsnObjectIdentifier MIB_ifMACEntAddr = - { sizeof(OID_ipMACEntAddr) / sizeof(UINT), OID_ipMACEntAddr }; + UINT OID_ifEntryType[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 }; + UINT OID_ifEntryNum[] = { 1, 3, 6, 1, 2, 1, 2, 1 }; + UINT OID_ipMACEntAddr[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 6 }; + AsnObjectIdentifier MIB_ifMACEntAddr = { + sizeof(OID_ipMACEntAddr) / sizeof(UINT), OID_ipMACEntAddr }; AsnObjectIdentifier MIB_ifEntryType = { - sizeof(OID_ifEntryType) / sizeof(UINT), OID_ifEntryType - }; + sizeof(OID_ifEntryType) / sizeof(UINT), OID_ifEntryType }; AsnObjectIdentifier MIB_ifEntryNum = { - sizeof(OID_ifEntryNum) / sizeof(UINT), OID_ifEntryNum - }; + sizeof(OID_ifEntryNum) / sizeof(UINT), OID_ifEntryNum }; RFC1157VarBindList varBindList; RFC1157VarBind varBind[2]; AsnInteger errorStatus; AsnInteger errorIndex; - AsnObjectIdentifier MIB_NULL = { - 0, 0 - }; + AsnObjectIdentifier MIB_NULL = { 0, 0 }; int ret; int dtmp; int i = 0, j = 0; BOOL found = FALSE; - char TempEthernet[13]; - m_Init = NULL; - m_InitEx = NULL; - m_Query = NULL; - m_Trap = NULL; - - /* Load the SNMP dll and get the addresses of the functions - necessary */ - m_hInst = LoadLibrary("inetmib1.dll"); - if (m_hInst < (HINSTANCE) HINSTANCE_ERROR) { - m_hInst = NULL; - return; + + // Load the SNMP dll and get the addresses of the functions necessary + HINSTANCE m_hInst = LoadLibrary("inetmib1.dll"); + if (m_hInst < (HINSTANCE) HINSTANCE_ERROR) + { + m_hInst = NULL; + return -1; } - m_Init = + pSnmpExtensionInit m_Init = (pSnmpExtensionInit) GetProcAddress(m_hInst, "SnmpExtensionInit"); - m_InitEx = - (pSnmpExtensionInitEx) GetProcAddress(m_hInst, - "SnmpExtensionInitEx"); - m_Query = - (pSnmpExtensionQuery) GetProcAddress(m_hInst, - "SnmpExtensionQuery"); - m_Trap = + pSnmpExtensionInitEx m_InitEx = + (pSnmpExtensionInitEx) GetProcAddress(m_hInst, "SnmpExtensionInitEx"); + pSnmpExtensionQuery m_Query = + (pSnmpExtensionQuery) GetProcAddress(m_hInst, "SnmpExtensionQuery"); + pSnmpExtensionTrap m_Trap = (pSnmpExtensionTrap) GetProcAddress(m_hInst, "SnmpExtensionTrap"); m_Init(GetTickCount(), &PollForTrapEvent, &SupportedView); @@ -432,235 +430,260 @@ long GetMacAddrSys ( u_char *addr) varBind[0].name = MIB_NULL; varBind[1].name = MIB_NULL; - /* Copy in the OID to find the number of entries in the - Inteface table */ - varBindList.len = 1; /* Only retrieving one item */ + // Copy in the OID to find the number of entries in the + // Inteface table + varBindList.len = 1; // Only retrieving one item SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryNum); - ret = - m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, - &errorIndex); + ret = m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, + &errorIndex); // printf("# of adapters in this system : %i\n", // varBind[0].value.asnValue.number); varBindList.len = 2; - /* Copy in the OID of ifType, the type of interface */ + // Copy in the OID of ifType, the type of interface SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryType); - /* Copy in the OID of ifPhysAddress, the address */ + // Copy in the OID of ifPhysAddress, the address SNMP_oidcpy(&varBind[1].name, &MIB_ifMACEntAddr); - do { - - /* Submit the query. Responses will be loaded into varBindList. - We can expect this call to succeed a # of times corresponding - to the # of adapters reported to be in the system */ - ret = - m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, - &errorIndex); if (!ret) ret = 1; - - else - /* Confirm that the proper type has been returned */ - ret = - SNMP_oidncmp(&varBind[0].name, &MIB_ifEntryType, - MIB_ifEntryType.idLength); if (!ret) { - j++; - dtmp = varBind[0].value.asnValue.number; - //printf("Interface #%i type : %i\n", j, dtmp); - - /* Type 6 describes ethernet interfaces */ - if (dtmp == 6) { - - /* Confirm that we have an address here */ - ret = - SNMP_oidncmp(&varBind[1].name, &MIB_ifMACEntAddr, - MIB_ifMACEntAddr.idLength); - if ((!ret) - && (varBind[1].value.asnValue.address.stream != NULL)) { - if ( - (varBind[1].value.asnValue.address.stream[0] == - 0x44) - && (varBind[1].value.asnValue.address.stream[1] == - 0x45) - && (varBind[1].value.asnValue.address.stream[2] == - 0x53) - && (varBind[1].value.asnValue.address.stream[3] == - 0x54) - && (varBind[1].value.asnValue.address.stream[4] == - 0x00)) { - - /* Ignore all dial-up networking adapters */ - //printf("Interface #%i is a DUN adapter\n", j); - continue; - } - if ( - (varBind[1].value.asnValue.address.stream[0] == - 0x00) - && (varBind[1].value.asnValue.address.stream[1] == - 0x00) - && (varBind[1].value.asnValue.address.stream[2] == - 0x00) - && (varBind[1].value.asnValue.address.stream[3] == - 0x00) - && (varBind[1].value.asnValue.address.stream[4] == - 0x00) - && (varBind[1].value.asnValue.address.stream[5] == - 0x00)) { - - /* Ignore NULL addresses returned by other network - interfaces */ - //printf("Interface #%i is a NULL address\n", j); - continue; - } - sprintf(addr, "%02x%02x%02x%02x%02x%02x", - varBind[1].value.asnValue.address.stream[0], - varBind[1].value.asnValue.address.stream[1], - varBind[1].value.asnValue.address.stream[2], - varBind[1].value.asnValue.address.stream[3], - varBind[1].value.asnValue.address.stream[4], - varBind[1].value.asnValue.address.stream[5]); - //printf("MAC Address of interface #%i: %s\n", j, TempEthernet); - } - } - } - } while (!ret); /* Stop only on an error. An error will occur - when we go exhaust the list of interfaces to - be examined */ - //getch(); - - /* Free the bindings */ - SNMP_FreeVarBind(&varBind[0]); - SNMP_FreeVarBind(&varBind[1]); - return 0; -#endif //_WIN32 - -/* implementation for Linux */ -#ifdef __linux__ - struct ifreq ifr; - struct ifreq *IFR; - struct ifconf ifc; - char buf[1024]; - int s, i; - int ok = 0; - - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s==-1) { - return -1; - } + do + { + // Submit the query. Responses will be loaded into varBindList. + // We can expect this call to succeed a # of times corresponding + // to the # of adapters reported to be in the system + ret = m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, + &errorIndex); + if (!ret) + { + ret = 1; + } + else + { + // Confirm that the proper type has been returned + ret = SNMP_oidncmp(&varBind[0].name, &MIB_ifEntryType, + MIB_ifEntryType.idLength); + } + if (!ret) + { + j++; + dtmp = varBind[0].value.asnValue.number; + printf("Interface #%i type : %i\n", j, dtmp); - ifc.ifc_len = sizeof(buf); - ifc.ifc_buf = buf; - ioctl(s, SIOCGIFCONF, &ifc); - - IFR = ifc.ifc_req; - for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; IFR++) { - - strcpy(ifr.ifr_name, IFR->ifr_name); - if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) { - if (! (ifr.ifr_flags & IFF_LOOPBACK)) { - if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0) { - ok = 1; - break; - } + // Type 6 describes ethernet interfaces + if (dtmp == 6) + { + // Confirm that we have an address here + ret = SNMP_oidncmp(&varBind[1].name, &MIB_ifMACEntAddr, + MIB_ifMACEntAddr.idLength); + if ( !ret && varBind[1].value.asnValue.address.stream != NULL ) + { + if ( (varBind[1].value.asnValue.address.stream[0] == 0x44) + && (varBind[1].value.asnValue.address.stream[1] == 0x45) + && (varBind[1].value.asnValue.address.stream[2] == 0x53) + && (varBind[1].value.asnValue.address.stream[3] == 0x54) + && (varBind[1].value.asnValue.address.stream[4] == 0x00) ) + { + // Ignore all dial-up networking adapters + printf("Interface #%i is a DUN adapter\n", j); + continue; + } + if ( (varBind[1].value.asnValue.address.stream[0] == 0x00) + && (varBind[1].value.asnValue.address.stream[1] == 0x00) + && (varBind[1].value.asnValue.address.stream[2] == 0x00) + && (varBind[1].value.asnValue.address.stream[3] == 0x00) + && (varBind[1].value.asnValue.address.stream[4] == 0x00) + && (varBind[1].value.asnValue.address.stream[5] == 0x00) ) + { + // Ignore NULL addresses returned by other network + // interfaces + printf("Interface #%i is a NULL address\n", j); + continue; + } + memcpy( addr, varBind[1].value.asnValue.address.stream, 6); } - } - } - - close(s); - if (ok) { - bcopy( ifr.ifr_hwaddr.sa_data, addr, 6); - } - else { - return -1; - } - return 0; -#endif - -/* implementation for HP-UX */ -#ifdef __HP_aCC - -#define LAN_DEV0 "/dev/lan0" - - int fd; - struct fis iocnt_block; - int i; - char net_buf[sizeof(LAN_DEV0)+1]; - char *p; - - (void)sprintf(net_buf, "%s", LAN_DEV0); - p = net_buf + strlen(net_buf) - 1; - - /* - * Get 802.3 address from card by opening the driver and interrogating it. - */ - for (i = 0; i < 10; i++, (*p)++) { - if ((fd = open (net_buf, O_RDONLY)) != -1) { - iocnt_block.reqtype = LOCAL_ADDRESS; - ioctl (fd, NETSTAT, &iocnt_block); - close (fd); + } + } + } while (!ret); - if (iocnt_block.vtype == 6) - break; - } - } + // Free the bindings + SNMP_FreeVarBind(&varBind[0]); + SNMP_FreeVarBind(&varBind[1]); + return 0; +#endif //Win32 version + + +// implementation for POSIX system +#ifdef __sun + //The POSIX version is broken anyway on Solaris, plus would require full + //root power + int i; + struct arpreq parpreq; + struct sockaddr_in sa, *psa; + struct in_addr inaddr; + struct hostent *phost; + char hostname[MAXHOSTNAMELEN]; + unsigned char *ptr; + char **paddrs; + int sock, status=0; + + gethostname(hostname, MAXHOSTNAMELEN); + phost = gethostbyname(hostname); + paddrs = phost->h_addr_list; + + //memcpy(&inaddr.s_addr, *paddrs, sizeof(inaddr.s_addr)); + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if(sock == -1) + { + perror("sock"); + return -1; + } + memset(&parpreq, 0, sizeof(struct arpreq)); + psa = (struct sockaddr_in *) &parpreq.arp_pa; + memset(psa, 0, sizeof(struct sockaddr_in)); + psa->sin_family = AF_INET; + memcpy(&psa->sin_addr, *paddrs, sizeof(struct in_addr)); - if (fd == -1 || iocnt_block.vtype != 6) { - return -1; - } + status = ioctl(sock, SIOCGARP, &parpreq); - bcopy( &iocnt_block.value.s[0], addr, 6); - return 0; + if(status == -1) + { + perror("SIOCGARP"); + //exit(-1); + return -1; + } -#endif /* HPUX */ + memcpy(addr, parpreq.arp_ha.sa_data, 6); +// printf("MAC Address: %x:%x:%x:%x:%x:%x\n", +// +// parpreq.arp_ha.sa_data[0], +// parpreq.arp_ha.sa_data[1], +// parpreq.arp_ha.sa_data[2], +// parpreq.arp_ha.sa_data[3], +// parpreq.arp_ha.sa_data[4], +// +// parpreq.arp_ha.sa_data[5]); -/* implementation for AIX */ -#ifdef _AIX + return 0; +#else +#ifdef CMAKE_HAVE_NET_IF_H + int sd; + struct ifreq ifr, *ifrp; + struct ifconf ifc; + char buf[1024]; + int n, i; + unsigned char *a; +#ifdef AF_LINK + struct sockaddr_dl *sdlp; +#endif - int size; - struct kinfo_ndd *nddp; +// +// BSD 4.4 defines the size of an ifreq to be +// max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len +// However, under earlier systems, sa_len isn't present, so the size is +// just sizeof(struct ifreq) +// We should investiage the use of SIZEOF_ADDR_IFREQ +// +#ifdef HAVE_SA_LEN +#ifndef max +#define max(a,b) ((a) > (b) ? (a) : (b)) +#endif +#define ifreq_size(i) max(sizeof(struct ifreq),\ + sizeof((i).ifr_name)+(i).ifr_addr.sa_len) +#else +#define ifreq_size(i) sizeof(struct ifreq) +#endif // HAVE_SA_LEN - size = getkerninfo(KINFO_NDD, 0, 0, 0); - if (size <= 0) { - return -1; - } - nddp = (struct kinfo_ndd *)malloc(size); - - if (!nddp) { - return -1; - } - if (getkerninfo(KINFO_NDD, nddp, &size, 0) < 0) { - free(nddp); - return -1; - } - bcopy(nddp->ndd_addr, addr, 6); - free(nddp); - return 0; -#endif //_AIX + if( (sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0 ) + { + return -1; + } + memset(buf, 0, sizeof(buf)); + ifc.ifc_len = sizeof(buf); + ifc.ifc_buf = buf; + if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) + { + close(sd); + return -1; + } + n = ifc.ifc_len; + for (i = 0; i < n; i+= ifreq_size(*ifrp) ) + { + ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i); + strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ); +#ifdef SIOCGIFHWADDR + if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0) + continue; + a = (unsigned char *) &ifr.ifr_hwaddr.sa_data; +#else +#ifdef SIOCGENADDR + // In theory this call should also work on Sun Solaris, but apparently + // SIOCGENADDR is not implemented properly thus the call + // ioctl(sd, SIOCGENADDR, &ifr) always returns errno=2 + // (No such file or directory) + // Furthermore the DLAPI seems to require full root access + if (ioctl(sd, SIOCGENADDR, &ifr) < 0) + continue; + a = (unsigned char *) ifr.ifr_enaddr; +#else +#ifdef AF_LINK + sdlp = (struct sockaddr_dl *) &ifrp->ifr_addr; + if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen != 6)) + continue; + a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen]; +#else + /* + * XXX we don't have a way of getting the hardware + * address + */ + close(sd); + return -1; +#endif // AF_LINK +#endif // SIOCGENADDR +#endif // SIOCGIFHWADDR + if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5]) continue; + + if (addr) + { + memcpy(addr, a, 6); + close(sd); + return 0; + } + } + close(sd); +#endif + return -1; +#endif //__sun -/* Not implemented platforms */ - return -1; } -//std::string Util::GetMACAddress() -//{ -// // This is a rip from: http://cplus.kompf.de/macaddr.html for Linux, HPUX and AIX -// // and http://tangentsoft.net/wskfaq/examples/src/snmpmac.cpp for windows version -// long stat; -// int i; -// u_char addr[6]; -// -// stat = mac_addr_sys( addr); -// if (0 == stat) -// { -// printf( "MAC address = "); -// for (i=0; i<6; ++i) { -// printf("%2.2x", addr[i]); -// } -// printf( "\n"); -// } -// else { -// fprintf( stderr, "can't get MAC address\n"); -// exit( 1); -// } -//} +std::string Util::GetMACAddress() +{ + // This code is the result of a long internet search to find something + // as compact as possible (not OS independant). We only have to separate + // 3 OS: Win32, SunOS and 'real' POSIX + // http://groups-beta.google.com/group/comp.unix.solaris/msg/ad36929d783d63be + // http://bdn.borland.com/article/0,1410,26040,00.html + u_char addr[6]; + std::string macaddr; + + long stat = GetMacAddrSys(addr); + if (0 == stat) + { + //printf( "MAC address = "); + for (int i=0; i<6; ++i) + { + //printf("%2.2x", addr[i]); + macaddr += Format("%2.2x", addr[i]); + } + //printf( "\n"); + return macaddr; + } + else + { + //printf( "No MAC address !\n" ); + return ""; + } +} /** * \ingroup Util @@ -668,7 +691,8 @@ long GetMacAddrSys ( u_char *addr) */ std::string Util::GetIPAddress() { - // This is a rip from http://www.codeguru.com/Cpp/I-N/internet/network/article.php/c3445/ + // This is a rip from + // http://www.codeguru.com/Cpp/I-N/internet/network/article.php/c3445/ #ifndef HOST_NAME_MAX // SUSv2 guarantees that `Host names are limited to 255 bytes'. // POSIX 1003.1-2001 guarantees that `Host names (not including the @@ -681,9 +705,10 @@ std::string Util::GetIPAddress() WORD wVersionRequested = MAKEWORD(1,0); WSADATA WSAData; int err = WSAStartup(wVersionRequested,&WSAData); - if (err != 0) { - /* Tell the user that we could not find a usable */ - /* WinSock DLL. */ + if (err != 0) + { + // Tell the user that we could not find a usable + // WinSock DLL. WSACleanup(); return "127.0.0.1"; } @@ -698,7 +723,7 @@ std::string Util::GetIPAddress() if( r == 0 ) { // Get host adresses - struct hostent * pHost = gethostbyname(szHostName); + struct hostent *pHost = gethostbyname(szHostName); for( int i = 0; pHost!= NULL && pHost->h_addr_list[i]!= NULL; i++ ) { @@ -728,7 +753,7 @@ std::string Util::GetIPAddress() * each time a DICOM image is create it should have * a unique identifier (URI) */ -std::string Util::CreateUniqueUID(const std::string& root) +std::string Util::CreateUniqueUID(const std::string &root) { // The code works as follow: // echo "gdcm" | od -b @@ -754,12 +779,12 @@ std::string Util::CreateUniqueUID(const std::string& root) } template -std::ostream& binary_write(std::ostream& os, const T& val) +std::ostream &binary_write(std::ostream &os, const T &val) { return os.write(reinterpret_cast(&val), sizeof val); } -std::ostream& binary_write(std::ostream& os, const uint16_t& val) +std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #ifdef GDCM_WORDS_BIGENDIAN uint16_t swap; @@ -770,7 +795,7 @@ std::ostream& binary_write(std::ostream& os, const uint16_t& val) #endif //GDCM_WORDS_BIGENDIAN } -std::ostream& binary_write(std::ostream& os, const uint32_t& val) +std::ostream &binary_write(std::ostream &os, const uint32_t &val) { #ifdef GDCM_WORDS_BIGENDIAN uint32_t swap; @@ -782,12 +807,12 @@ std::ostream& binary_write(std::ostream& os, const uint32_t& val) #endif //GDCM_WORDS_BIGENDIAN } -std::ostream& binary_write(std::ostream& os, const char* val) +std::ostream &binary_write(std::ostream &os, const char *val) { return os.write(val, strlen(val)); } -std::ostream& binary_write(std::ostream& os, std::string const & val) +std::ostream &binary_write(std::ostream &os, std::string const &val) { return os.write(val.c_str(), val.size()); }