Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2005/01/21 16:06:21 $
- Version: $Revision: 1.114 $
+ Date: $Date: 2005/01/23 10:12:34 $
+ Version: $Revision: 1.122 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
#include <sys/timeb.h>
#else
#include <sys/time.h>
{
char tmp[40];
long milliseconds;
- time_t *timep;
+ time_t timep;
// We need implementation specific functions to obtain millisecond precision
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
struct timeb tb;
::ftime(&tb);
- timep = &tb.time;
+ timep = tb.time;
milliseconds = tb.millitm;
#else
struct timeval tv;
gettimeofday (&tv, NULL);
- timep = &tv.tv_sec;
+ 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);
+ 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);
+ strftime (tmp, sizeof (tmp), "%Y%m%d%H%M%S", ptm);
// Add milliseconds
std::string r = tmp;
/**
* \brief Create a /DICOM/ string:
- * It should a of even lenght (no odd length ever)
+ * It should a of even length (no odd length ever)
* It can contain as many (if you are reading this from your
* editor the following character is is backslash followed by zero
* that needed to be escaped with an extra backslash for doxygen) \\0
* as you want.
* This function is similar to DicomString(const char*),
- * except it doesn't take a lenght.
+ * except it doesn't take a length.
* It only pad with a null character if length is odd
*/
std::string Util::DicomString(const char *s)
/**
* \brief Safely compare two Dicom String:
- * - Both string should be of even lenght
- * - We allow padding of even lenght string by either a null
+ * - Both string should be of even length
+ * - We allow padding of even length string by either a null
* character of a space
*/
bool Util::DicomStringEqual(const std::string &s1, const char *s2)
return s1_even == s2_even;
}
-
-
/**
* \brief tells us if the processor we are working with is BigEndian or not
*/
AsnObjectIdentifier MIB_NULL = { 0, 0 };
int ret;
int dtmp;
- int i = 0, j = 0;
- BOOL found = FALSE;
+ int j = 0;
// 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;
}
pSnmpExtensionInit m_Init =
(pSnmpExtensionInit) GetProcAddress(m_hInst, "SnmpExtensionInit");
- 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);
/* Initialize the variable list to be retrieved by m_Query */
// Inteface table
varBindList.len = 1; // Only retrieving one item
SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryNum);
- ret = m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus,
+ m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus,
&errorIndex);
// printf("# of adapters in this system : %i\n",
// varBind[0].value.asnValue.number);
{
j++;
dtmp = varBind[0].value.asnValue.number;
- std::cerr << "Interface #" << j << " type : " << dtmp << std::endl;
// Type 6 describes ethernet interfaces
if (dtmp == 6)
}
close(sd);
#endif
- /* Not implemented platforms */
+ // Not implemented platforms
perror("There was a configuration problem on your plateform");
memset(addr,0,6);
return -1;
}
/**
- * \brief Gets the M.A.C. adress of the machine writting the DICOM image
+ * \brief Encode the mac address on a fixed lenght string of 15 characters.
+ * we save space this way.
*/
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;
+ uint64_t n = 0;
int stat = GetMacAddrSys(addr);
- if (0 == stat)
+ if (stat == 0)
{
- for (int i=0; i<6; ++i)
+ // Horner evaluation
+ for(int i=0; i<6; i++)
{
- //macaddr += Format("%2.2x", addr[i]);
- if(i) macaddr += ".";
- macaddr += Format("%i", (int)addr[i]);
+ n *= 256;
+ n += addr[i];
}
- return macaddr;
+
+ // we fit on 15 bytes maximum < 256^6.
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ return Format("%I64u", n);
+#else
+ return Format("%llu", n);
+#endif
}
else
{
append += ".";
append += Util::GetMACAddress();
append += ".";
- //append += Util::GetCurrentDate();
- //append += ".";
- //append += Util::GetCurrentTime();
append += Util::GetCurrentDateTime();
+ //Also add a mini random number just in case:
+ int r = (int) (100.0*rand()/RAND_MAX);
+ append += Format("%02d", r);
+
// If append is too long we need to rehash it
if( (prefix + append).size() > 64 )
{
#endif
#ifdef __sun
return (unsigned int)thr_self();
+#else
+ //default implementation
+ return 0;
#endif
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff