X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.cxx;h=9d121654eb6bc22c389de5b7d03bcd1c122574c6;hb=130558c1fc10cbc2d5d58484b310fa86bd20d81b;hp=dee613e57bf53ca2684c370ace1c49586e2944f7;hpb=7f798bb2e7e985e1630e4b859154a92eae0d2ee0;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index dee613e5..9d121654 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/17 13:55:26 $ - Version: $Revision: 1.100 $ + Date: $Date: 2005/01/18 16:19:57 $ + Version: $Revision: 1.112 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,7 +28,7 @@ #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,51 +40,41 @@ // For GetMACAddress #ifdef _WIN32 -#include -#include + #include + #include #else -#include -#include -#include -#include + #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 + #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 -#ifdef __sun -//#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) -// This is absolutely necesseray on SunOS -#include +#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 , elem); @@ -114,7 +104,6 @@ std::string Util::Format(const char *format, ...) /** - * \ingroup Globals * \brief Because not available in C++ (?) */ void Util::Tokenize (const std::string &str, @@ -132,7 +121,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 */ @@ -158,7 +146,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 @@ -190,7 +177,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 */ @@ -210,7 +196,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 */ @@ -232,7 +217,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 */ @@ -254,7 +238,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() @@ -267,7 +250,6 @@ std::string Util::GetCurrentDate() } /** - * \ingroup Util * \brief Get the current time of the system in a dicom string */ std::string Util::GetCurrentTime() @@ -295,7 +277,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 @@ -319,7 +300,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 @@ -340,7 +320,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() @@ -438,7 +417,8 @@ int 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); @@ -477,13 +457,6 @@ int GetMacAddrSys ( unsigned char *addr ) MIB_ifMACEntAddr.idLength); if ( !ret && varBind[1].value.asnValue.address.stream != NULL ) { - if ( varBind[1].value.asnType != ASN_RFC1155_IPADDRESS ) - { - // Ignore all dial-up networking adapters - std::cerr << "Interface #" << j << " is not an IP adress\n"; - continue; - } - 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) @@ -506,7 +479,6 @@ int GetMacAddrSys ( unsigned char *addr ) std::cerr << "Interface #" << j << " is a NULL address\n"; continue; } - memcpy( addr, varBind[1].value.asnValue.address.stream, 6); } } @@ -524,13 +496,10 @@ int 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; @@ -572,7 +541,7 @@ int 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 @@ -648,10 +617,16 @@ int 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 code is the result of a long internet search to find something @@ -660,17 +635,16 @@ std::string Util::GetMACAddress() // http://groups-beta.google.com/group/comp.unix.solaris/msg/ad36929d783d63be // http://bdn.borland.com/article/0,1410,26040,00.html unsigned char addr[6]; + std::string macaddr; + int stat = GetMacAddrSys(addr); - if (0 == stat) { - std::string macaddr = ""; for (int i=0; i<6; ++i) { - //macaddr += Format("%2.2x", addr[i]); - if(i) - macaddr += "."; - macaddr += Format("%i", (int)addr[i]); + macaddr += Format("%2.2x", addr[i]); + //if(i) macaddr += "."; + //macaddr += Format("%i", (int)addr[i]); } return macaddr; } @@ -682,7 +656,6 @@ std::string Util::GetMACAddress() } /** - * \ingroup Util * \brief Return the IP adress of the machine writting the DICOM image */ std::string Util::GetIPAddress() @@ -696,7 +669,7 @@ std::string Util::GetIPAddress() # 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__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) // with WinSock DLL we need to initialise the WinSock before using gethostname WORD wVersionRequested = MAKEWORD(1,0); WSADATA WSAData; @@ -732,7 +705,7 @@ std::string Util::GetIPAddress() } // str now contains one local IP address -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) WSACleanup(); #endif @@ -744,7 +717,6 @@ std::string Util::GetIPAddress() } /** - * \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) @@ -770,12 +742,22 @@ std::string Util::CreateUniqueUID(const std::string &root) return radical; } +/** + * \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); } +/** + * \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 @@ -787,6 +769,11 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) #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 @@ -799,11 +786,21 @@ std::ostream &binary_write(std::ostream &os, const uint32_t &val) #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)); } +/** + * \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());