X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=443abb45e88445858ee6d2c23713b9b1045e8bb3;hb=5887c4beef24959af83e43efad0bb86acac9339e;hp=ad20827e6542ef94053bd6fac7202fe5e30581a8;hpb=b5852623a3326debfd509da4735f3ac8462e0b87;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index ad20827e..443abb45 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 19:39:24 $ - Version: $Revision: 1.76 $ + Date: $Date: 2005/01/11 00:24:44 $ + Version: $Revision: 1.89 $ 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,71 @@ #endif #endif +// For GetMACAddress +#include +#include +#include + +#ifdef _WIN32 +#include +#include +#else +#include //for bzero on unix +#endif + +#ifdef __linux__ +#include +#include +#include +#include +#include +#endif + +#ifdef __FreeBSD__ +#include +#include +#include +#include +#endif + +#ifdef __HP_aCC +#include +#endif + +#ifdef _AIX +#include +#include +#endif + +#ifdef __APPLE__ +#include +#include +#include +#include +#include +#endif //__APPLE__ +// End For GetMACAddress + 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 +119,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 +139,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 +165,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 +196,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 +216,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 +238,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 +289,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 +308,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 +316,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 +327,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,25 +347,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 #ifdef _WIN32 -#include -#include -#include typedef BOOL(WINAPI * pSnmpExtensionInit) ( IN DWORD dwTimeZeroReference, OUT HANDLE * hPollForTrapEvent, @@ -337,25 +377,150 @@ typedef BOOL(WINAPI * pSnmpExtensionQuery) ( typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( OUT AsnObjectIdentifier * supportedView); -#else -#include //for bzero on unix #endif //_WIN32 -#ifdef __linux__ -#include -#include -#include -#include -#include -#endif - -#ifdef __HP_aCC -#include -#endif -#ifdef _AIX -#include -#include +#ifdef __APPLE__ +// Returns an iterator containing the primary (built-in) Ethernet interface. The caller is responsible for +// releasing the iterator after the caller is done with it. +static kern_return_t FindEthernetInterfaces(io_iterator_t *matchingServices) +{ + kern_return_t kernResult; + mach_port_t masterPort; + CFMutableDictionaryRef matchingDict; + CFMutableDictionaryRef propertyMatchDict; + + // Retrieve the Mach port used to initiate communication with I/O Kit + kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort); + if (KERN_SUCCESS != kernResult) + { + printf("IOMasterPort returned %d\n", kernResult); + return kernResult; + } + + // Ethernet interfaces are instances of class kIOEthernetInterfaceClass. + // IOServiceMatching is a convenience function to create a dictionary with the key kIOProviderClassKey and + // the specified value. + matchingDict = IOServiceMatching(kIOEthernetInterfaceClass); + + // Note that another option here would be: + // matchingDict = IOBSDMatching("en0"); + + if (NULL == matchingDict) + { + printf("IOServiceMatching returned a NULL dictionary.\n"); + } + else { + // Each IONetworkInterface object has a Boolean property with the key kIOPrimaryInterface. Only the + // primary (built-in) interface has this property set to TRUE. + + // IOServiceGetMatchingServices uses the default matching criteria defined by IOService. This considers + // only the following properties plus any family-specific matching in this order of precedence + // (see IOService::passiveMatch): + // + // kIOProviderClassKey (IOServiceMatching) + // kIONameMatchKey (IOServiceNameMatching) + // kIOPropertyMatchKey + // kIOPathMatchKey + // kIOMatchedServiceCountKey + // family-specific matching + // kIOBSDNameKey (IOBSDNameMatching) + // kIOLocationMatchKey + + // The IONetworkingFamily does not define any family-specific matching. This means that in + // order to have IOServiceGetMatchingServices consider the kIOPrimaryInterface property, we must + // add that property to a separate dictionary and then add that to our matching dictionary + // specifying kIOPropertyMatchKey. + + propertyMatchDict = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + + if (NULL == propertyMatchDict) + { + printf("CFDictionaryCreateMutable returned a NULL dictionary.\n"); + } + else { + // Set the value in the dictionary of the property with the given key, or add the key + // to the dictionary if it doesn't exist. This call retains the value object passed in. + CFDictionarySetValue(propertyMatchDict, CFSTR(kIOPrimaryInterface), kCFBooleanTrue); + + // Now add the dictionary containing the matching value for kIOPrimaryInterface to our main + // matching dictionary. This call will retain propertyMatchDict, so we can release our reference + // on propertyMatchDict after adding it to matchingDict. + CFDictionarySetValue(matchingDict, CFSTR(kIOPropertyMatchKey), propertyMatchDict); + CFRelease(propertyMatchDict); + } + } + + // IOServiceGetMatchingServices retains the returned iterator, so release the iterator when we're done with it. + // IOServiceGetMatchingServices also consumes a reference on the matching dictionary so we don't need to release + // the dictionary explicitly. + kernResult = IOServiceGetMatchingServices(masterPort, matchingDict, matchingServices); + if (KERN_SUCCESS != kernResult) + { + printf("IOServiceGetMatchingServices returned %d\n", kernResult); + } + + return kernResult; +} + +// Given an iterator across a set of Ethernet interfaces, return the MAC address of the last one. +// If no interfaces are found the MAC address is set to an empty string. +// In this sample the iterator should contain just the primary interface. +static kern_return_t GetMACAddress_MAC(io_iterator_t intfIterator, UInt8 *MACAddress) +{ + io_object_t intfService; + io_object_t controllerService; + kern_return_t kernResult = KERN_FAILURE; + + // Initialize the returned address + bzero(MACAddress, kIOEthernetAddressSize); + + // IOIteratorNext retains the returned object, so release it when we're done with it. + while ( (intfService = IOIteratorNext(intfIterator))) + { + CFTypeRef MACAddressAsCFData; + + // IONetworkControllers can't be found directly by the IOServiceGetMatchingServices call, + // since they are hardware nubs and do not participate in driver matching. In other words, + // registerService() is never called on them. So we've found the IONetworkInterface and will + // get its parent controller by asking for it specifically. + + // IORegistryEntryGetParentEntry retains the returned object, so release it when we're done with it. + kernResult = IORegistryEntryGetParentEntry( intfService, + kIOServicePlane, + &controllerService ); + + if (KERN_SUCCESS != kernResult) + { + printf("IORegistryEntryGetParentEntry returned 0x%08x\n", kernResult); + } + else { + // Retrieve the MAC address property from the I/O Registry in the form of a CFData + MACAddressAsCFData = IORegistryEntryCreateCFProperty( controllerService, + CFSTR(kIOMACAddress), + kCFAllocatorDefault, + 0); + if (MACAddressAsCFData) + { + CFShow(MACAddressAsCFData); // for display purposes only; output goes to stderr + + // Get the raw bytes of the MAC address from the CFData + CFDataGetBytes(MACAddressAsCFData, CFRangeMake(0, kIOEthernetAddressSize), MACAddress); + CFRelease(MACAddressAsCFData); + } + + // Done with the parent Ethernet controller object so we release it. + (void) IOObjectRelease(controllerService); + } + + // Done with the Ethernet interface object so we release it. + (void) IOObjectRelease(intfService); + } + + return kernResult; +} #endif long GetMacAddrSys ( u_char *addr) @@ -402,7 +567,6 @@ long GetMacAddrSys ( u_char *addr) int dtmp; int i = 0, j = 0; BOOL found = FALSE; - char TempEthernet[13]; m_Init = NULL; m_InitEx = NULL; m_Query = NULL; @@ -510,14 +674,15 @@ long GetMacAddrSys ( u_char *addr) printf("Interface #%i is a NULL address\n", j); continue; } - sprintf((char*)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); + //sprintf((char*)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]); + memcpy( addr, varBind[1].value.asnValue.address.stream, 6); + //printf("MAC Address of interface #%i: %s\n", j, addr); } } } @@ -534,46 +699,85 @@ long GetMacAddrSys ( u_char *addr) /* 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; - } + 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; + } - ifc.ifc_len = sizeof(buf); - ifc.ifc_buf = buf; - ioctl(s, SIOCGIFCONF, &ifc); + 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; - } - } - } - } + 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; + } + } + } + } - close(s); - if (ok) { - bcopy( ifr.ifr_hwaddr.sa_data, addr, 6); - } - else { - return -1; - } - return 0; + close(s); + if (ok) { + bcopy( ifr.ifr_hwaddr.sa_data, addr, 6); + } + else { + return -1; + } + return 0; #endif +/* implementation for FreeBSD */ +#ifdef __FreeBSD__ + struct ifaddrs *ifap, *ifaphead; + int rtnerr; + const struct sockaddr_dl *sdl; + caddr_t ap; + int alen; + + rtnerr = getifaddrs(&ifaphead); + if (rtnerr) { + //perror(NULL); + return -1; + } + + for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) { + + if (ifap->ifa_addr->sa_family == AF_LINK) { + sdl = (const struct sockaddr_dl *) ifap->ifa_addr; + ap = ((caddr_t)((sdl)->sdl_data + (sdl)->sdl_nlen)); + alen = sdl->sdl_alen; + if (ap && alen > 0) { + int i; + + //printf ("%s:", ifap->ifa_name); + //for (i = 0; i < alen; i++, ap++) + { + //printf("%c%02x", i > 0 ? ':' : ' ', 0xff&*ap); + } + bcopy( ap, addr, 6); + //putchar('\n'); + } + } + } + //putchar('\n'); + + freeifaddrs(ifaphead); + return 0; +#endif //FreeBSD + /* implementation for HP-UX */ #ifdef __HP_aCC @@ -635,7 +839,41 @@ long GetMacAddrSys ( u_char *addr) return 0; #endif //_AIX +#ifdef __APPLE__ + kern_return_t kernResult = KERN_SUCCESS; // on PowerPC this is an int (4 bytes) +/* + * error number layout as follows (see mach/error.h and IOKit/IOReturn.h): + * + * hi lo + * | system(6) | subsystem(12) | code(14) | + */ + + io_iterator_t intfIterator; + UInt8 MACAddress[ kIOEthernetAddressSize ]; + + kernResult = FindEthernetInterfaces(&intfIterator); + + if (KERN_SUCCESS != kernResult) + { + printf("FindEthernetInterfaces returned 0x%08x\n", kernResult); + } + else { + kernResult = GetMACAddress_MAC(intfIterator, MACAddress); + + if (KERN_SUCCESS != kernResult) + { + printf("GetMACAddress returned 0x%08x\n", kernResult); + } + } + + (void) IOObjectRelease(intfIterator); // Release the iterator. + + memcpy(addr, MACAddress, kIOEthernetAddressSize); + return kernResult; +#endif //APPLE + /* Not implemented platforms */ + memset(addr,0,6); return -1; } @@ -643,6 +881,8 @@ 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 + // and http://groups-beta.google.com/group/sol.lists.freebsd.hackers/msg/0d0f862e05fce6c0 for the FreeBSD version + // and http://developer.apple.com/samplecode/GetPrimaryMACAddress/GetPrimaryMACAddress.html for MacOSX version long stat; u_char addr[6]; std::string macaddr; @@ -702,7 +942,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++ ) { @@ -732,7 +972,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 @@ -758,12 +998,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; @@ -774,7 +1014,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; @@ -786,12 +1026,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()); }