X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=c69f317e563fb6967cc4078ccae776e9b2c470ae;hb=e30e614e7f63b52306d85040068e2205a9e6327a;hp=559b21ee0be8ab6ab5fc2f11f28799d73b1844c3;hpb=3ce11137742b13ff30a824dc253beb0761484133;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 559b21ee..c69f317e 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/15 22:19:10 $ - Version: $Revision: 1.95 $ + Date: $Date: 2005/01/21 19:51:12 $ + Version: $Revision: 1.115 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,10 +25,16 @@ #include #include +#ifdef _MSC_VER +#include +#else +#include +#endif + #include //only included in implementation file #include //only included in implementation file -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) #include // for gethostname & gethostbyname #undef GetCurrentTime #else @@ -40,60 +46,50 @@ // For GetMACAddress #ifdef _WIN32 -#include -#include + #include + #include #else -#include -#include -#include -#include + #include + #include + #include + #include #endif -#ifdef __sun -//#include -#include -#include -#include -#else -//#include -//#include -//#include -#include -#include -#endif //__sun - -// 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 + #include // For SIOCGIFCONF on Linux #endif #ifdef CMAKE_HAVE_SYS_SOCKET_H -#include + #include #endif #ifdef CMAKE_HAVE_SYS_SOCKIO_H -#include // For SIOCGIFCONF on SunOS + #include // For SIOCGIFCONF on SunOS #endif #ifdef CMAKE_HAVE_NET_IF_H -#include + #include #endif #ifdef CMAKE_HAVE_NETINET_IN_H -#include //For IPPROTO_IP + #include //For IPPROTO_IP #endif #ifdef CMAKE_HAVE_NET_IF_DL_H -#include + #include +#endif +#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) + // This is absolutely necessary on SunOS + #include #endif +// For GetCurrentThreadID() +#ifdef __linux__ +#include +#include +#endif +#ifdef __sun +#include +#endif namespace gdcm { /** - * \ingroup Globals * \brief Provide a better 'c++' approach for sprintf * For example c code is: * sprintf(trash, "%04x|%04x", group , elem); @@ -123,7 +119,6 @@ std::string Util::Format(const char *format, ...) /** - * \ingroup Globals * \brief Because not available in C++ (?) */ void Util::Tokenize (const std::string &str, @@ -141,7 +136,6 @@ void Util::Tokenize (const std::string &str, } /** - * \ingroup Globals * \brief Because not available in C++ (?) * Counts the number of occurences of a substring within a string */ @@ -167,7 +161,6 @@ int Util::CountSubstring (const std::string &str, } /** - * \ingroup Globals * \brief Weed out a string from the non-printable characters (in order * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from @@ -199,7 +192,6 @@ std::string Util::CreateCleanString(std::string const &s) } /** - * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary * @param pathname file/directory name to normalize */ @@ -219,7 +211,6 @@ std::string Util::NormalizePath(std::string const &pathname) } /** - * \ingroup Globals * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ @@ -241,7 +232,6 @@ std::string Util::GetPath(std::string const &fullName) } /** - * \ingroup Util * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ @@ -263,7 +253,6 @@ std::string Util::GetName(std::string const &fullName) } /** - * \ingroup Util * \brief Get the current date of the system in a dicom string */ std::string Util::GetCurrentDate() @@ -276,7 +265,6 @@ std::string Util::GetCurrentDate() } /** - * \ingroup Util * \brief Get the current time of the system in a dicom string */ std::string Util::GetCurrentTime() @@ -288,6 +276,41 @@ std::string Util::GetCurrentTime() return tmp; } +/** + * \brief Get both the date and time at the same time to avoid problem + * around midnight where two call could be before and after midnight + */ +std::string Util::GetCurrentDateTime() +{ + char tmp[40]; + long milliseconds; + time_t *timep; + + // We need implementation specific functions to obtain millisecond precision +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + struct timeb tb; + ::ftime(&tb); + timep = &tb.time; + milliseconds = tb.millitm; +#else + struct timeval tv; + gettimeofday (&tv, NULL); + timep = &tv.tv_sec; + // Compute milliseconds from microseconds. + milliseconds = tv.tv_usec / 1000; +#endif + // Obtain the time of day, and convert it to a tm struct. + struct tm *ptm = localtime (timep); + // Format the date and time, down to a single second. + strftime (tmp, sizeof (tmp), "%Y%m%d.%H%M%S", ptm); + + // Add milliseconds + std::string r = tmp; + r += Format("%03ld", milliseconds); + + return r; +} + /** * \brief Create a /DICOM/ string: * It should a of even length (no odd length ever) @@ -304,7 +327,6 @@ std::string Util::DicomString(const char *s, size_t l) } /** - * \ingroup Util * \brief Create a /DICOM/ string: * It should a of even lenght (no odd length ever) * It can contain as many (if you are reading this from your @@ -328,7 +350,6 @@ std::string Util::DicomString(const char *s) } /** - * \ingroup Util * \brief Safely compare two Dicom String: * - Both string should be of even lenght * - We allow padding of even lenght string by either a null @@ -349,7 +370,6 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) /** - * \ingroup Util * \brief tells us if the processor we are working with is BigEndian or not */ bool Util::IsCurrentProcessorBigEndian() @@ -387,7 +407,7 @@ typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( #endif //_WIN32 -long GetMacAddrSys ( unsigned char *addr) +int GetMacAddrSys ( unsigned char *addr ) { #ifdef _WIN32 WSADATA WinsockData; @@ -447,7 +467,8 @@ long GetMacAddrSys ( unsigned char *addr) 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; +// varBind[0].value.asnValue.number); + varBindList.len = 2; // Copy in the OID of ifType, the type of interface SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryType); @@ -476,7 +497,7 @@ long GetMacAddrSys ( unsigned char *addr) { j++; dtmp = varBind[0].value.asnValue.number; - printf("Interface #%i type : %i\n", j, dtmp); + std::cerr << "Interface #" << j << " type : " << dtmp << std::endl; // Type 6 describes ethernet interfaces if (dtmp == 6) @@ -493,7 +514,7 @@ long GetMacAddrSys ( unsigned char *addr) && (varBind[1].value.asnValue.address.stream[4] == 0x00) ) { // Ignore all dial-up networking adapters - printf("Interface #%i is a DUN adapter\n", j); + std::cerr << "Interface #" << j << " is a DUN adapter\n"; continue; } if ( (varBind[1].value.asnValue.address.stream[0] == 0x00) @@ -505,7 +526,7 @@ long GetMacAddrSys ( unsigned char *addr) { // Ignore NULL addresses returned by other network // interfaces - printf("Interface #%i is a NULL address\n", j); + std::cerr << "Interface #" << j << " is a NULL address\n"; continue; } memcpy( addr, varBind[1].value.asnValue.address.stream, 6); @@ -525,23 +546,22 @@ long GetMacAddrSys ( unsigned char *addr) #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 sockaddr_in *psa; struct hostent *phost; char hostname[MAXHOSTNAMELEN]; - unsigned char *ptr; char **paddrs; int sock, status=0; - gethostname(hostname, MAXHOSTNAMELEN); + if(gethostname(hostname, MAXHOSTNAMELEN) != 0) + { + perror("gethostname"); + return -1; + } 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"); @@ -549,29 +569,18 @@ long GetMacAddrSys ( unsigned char *addr) } 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)); status = ioctl(sock, SIOCGARP, &parpreq); - if(status == -1) { perror("SIOCGARP"); - //exit(-1); return -1; } - - 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]); + memcpy(addr, parpreq.arp_ha.sa_data, 6); return 0; #else @@ -582,7 +591,7 @@ long GetMacAddrSys ( unsigned char *addr) char buf[1024]; int n, i; unsigned char *a; -#ifdef AF_LINK +#if defined(AF_LINK) && (!defined(SIOCGIFHWADDR) && !defined(SIOCGENADDR)) struct sockaddr_dl *sdlp; #endif @@ -626,6 +635,11 @@ long GetMacAddrSys ( unsigned char *addr) 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; @@ -636,10 +650,7 @@ long GetMacAddrSys ( unsigned char *addr) continue; a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen]; #else - /* - * XXX we don't have a way of getting the hardware - * address - */ + perror("No way to access hardware"); close(sd); return -1; #endif // AF_LINK @@ -656,169 +667,231 @@ long GetMacAddrSys ( unsigned char *addr) } close(sd); #endif + /* Not implemented platforms */ + perror("There was a configuration problem on your plateform"); + memset(addr,0,6); return -1; #endif //__sun - } +/** + * \brief Gets the M.A.C. adress of the machine writting the DICOM image + */ std::string Util::GetMACAddress() { - // This is a rip from: http://cplus.kompf.de/macaddr.html for Linux/CYGWIN, 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 - u_char addr[6]; - std::string macaddr; + // 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 + union dual { uint64_t n; unsigned char addr[6]; }; - long stat = GetMacAddrSys(addr); - if (0 == stat) + // zero-initialize the whole thing first: + dual d = { 0 }; + int stat = GetMacAddrSys(d.addr); + if (stat == 0) { - //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; + // fill with zero to fit on 15 bytes. + return Format("%015llu", d.n); } else { - //printf( "No MAC address !\n" ); + gdcmVerboseMacro("Problem in finding the MAC Address"); return ""; } } /** - * \ingroup Util * \brief Return the IP adress of the machine writting the DICOM image */ 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 - // terminating NUL) are limited to HOST_NAME_MAX bytes'. + // SUSv2 guarantees that `Host names are limited to 255 bytes'. + // POSIX 1003.1-2001 guarantees that `Host names (not including the + // terminating NUL) are limited to HOST_NAME_MAX bytes'. # define HOST_NAME_MAX 255 - // In this case we should maybe check the string was not truncated. - // But I don't known how to check that... -#if defined(_MSC_VER) || defined(__BORLANDC__) - // with WinSock DLL we need to initialise the WinSock before using gethostname - WORD wVersionRequested = MAKEWORD(1,0); - WSADATA WSAData; - int err = WSAStartup(wVersionRequested,&WSAData); - if (err != 0) - { + // In this case we should maybe check the string was not truncated. + // But I don't known how to check that... +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // with WinSock DLL we need to initialize the WinSock before using gethostname + 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. WSACleanup(); return "127.0.0.1"; - } + } #endif #endif //HOST_NAME_MAX - std::string str; - char szHostName[HOST_NAME_MAX+1]; - int r = gethostname(szHostName, HOST_NAME_MAX); - - if( r == 0 ) - { - // Get host adresses - struct hostent *pHost = gethostbyname(szHostName); - - for( int i = 0; pHost!= NULL && pHost->h_addr_list[i]!= NULL; i++ ) - { - for( int j = 0; jh_length; j++ ) + std::string str; + char szHostName[HOST_NAME_MAX+1]; + int r = gethostname(szHostName, HOST_NAME_MAX); + + if( r == 0 ) + { + // Get host adresses + struct hostent *pHost = gethostbyname(szHostName); + + for( int i = 0; pHost!= NULL && pHost->h_addr_list[i]!= NULL; i++ ) { - if( j > 0 ) str += "."; + for( int j = 0; jh_length; j++ ) + { + if( j > 0 ) str += "."; + + str += Util::Format("%u", + (unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]); + } + // str now contains one local IP address + +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + WSACleanup(); +#endif - str += Util::Format("%u", - (unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]); } - // str now contains one local IP address - -#if defined(_MSC_VER) || defined(__BORLANDC__) - WSACleanup(); -#endif - - } - } - // If an error occur r == -1 - // Most of the time it will return 127.0.0.1... - return str; + } + // If an error occur r == -1 + // Most of the time it will return 127.0.0.1... + return str; } /** - * \ingroup Util * \brief Creates a new UID. As stipulate in the DICOM ref * each time a DICOM image is create it should have * a unique identifier (URI) + * @param root is the DICOM prefix assigned by IOS group + * @param is a string you want to append to the UID. */ std::string Util::CreateUniqueUID(const std::string &root) { - // The code works as follow: - // echo "gdcm" | od -b - // 0000000 147 144 143 155 012 - // Therefore we return - // radical + 147.144.143.155 + IP + time() - std::string radical = root; - if( !root.size() ) //anything better ? - { - radical = "0.0."; // Is this really usefull ? - } - // else - // A root was specified use it to forge our new UID: - radical += "147.144.143.155"; // gdcm - radical += "."; - radical += Util::GetIPAddress(); - radical += "."; - radical += Util::GetCurrentDate(); - radical += "."; - radical += Util::GetCurrentTime(); - - return radical; + std::string prefix = root; + std::string append; + if( root.empty() ) + { + // No root was specified use "GDCM" then + // echo "gdcm" | od -b + // 0000000 147 144 143 155 012 + prefix = "147.144.143.155"; // special easter egg + } + // else + // A root was specified use it to forge our new UID: + append += "."; + append += Util::GetMACAddress(); + append += "."; + //append += Util::GetCurrentDate(); + //append += "."; + //append += Util::GetCurrentTime(); + append += Util::GetCurrentDateTime(); + + // If append is too long we need to rehash it + if( (prefix + append).size() > 64 ) + { + gdcmErrorMacro( "Size of UID is too long." ); + // we need a hash function to truncate this number + // if only md5 was cross plateform + // MD5(append); + } + + return prefix + append; +} + +unsigned int Util::GetCurrentThreadID() +{ +// FIXME the implementation is far from complete +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + return (unsigned int)GetCurrentThreadId(); +#endif +#ifdef __linux__ + return 0; + // Doesn't work on fedora, but is in the man page... + //return (unsigned int)gettid(); +#endif +#ifdef __sun + return (unsigned int)thr_self(); +#endif } +unsigned int Util::GetCurrentProcessID() +{ +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // NOTE: There is also a _getpid()... + return (unsigned int)GetCurrentProcessId(); +#else + // get process identification, POSIX + return (unsigned int)getpid(); +#endif + +} + +/** + * \brief + * @param os ostream to write to + * @param val val + */ template std::ostream &binary_write(std::ostream &os, const T &val) { - return os.write(reinterpret_cast(&val), sizeof val); + return os.write(reinterpret_cast(&val), sizeof val); } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #ifdef GDCM_WORDS_BIGENDIAN - uint16_t swap; - swap = ((( val << 8 ) & 0x0ff00 ) | (( val >> 8 ) & 0x00ff ) ); - return os.write(reinterpret_cast(&swap), 2); + uint16_t swap; + swap = ((( val << 8 ) & 0x0ff00 ) | (( val >> 8 ) & 0x00ff ) ); + return os.write(reinterpret_cast(&swap), 2); #else - return os.write(reinterpret_cast(&val), 2); + return os.write(reinterpret_cast(&val), 2); #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const uint32_t &val) { #ifdef GDCM_WORDS_BIGENDIAN - uint32_t swap; - swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | - ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); - return os.write(reinterpret_cast(&swap), 4); + uint32_t swap; + swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | + ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); + return os.write(reinterpret_cast(&swap), 4); #else - return os.write(reinterpret_cast(&val), 4); + return os.write(reinterpret_cast(&val), 4); #endif //GDCM_WORDS_BIGENDIAN } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, const char *val) { - return os.write(val, strlen(val)); + return os.write(val, strlen(val)); } +/** + * \brief + * @param os ostream to write to + * @param val val + */ std::ostream &binary_write(std::ostream &os, std::string const &val) { - return os.write(val.c_str(), val.size()); + return os.write(val.c_str(), val.size()); } } // end namespace gdcm