[Sumover-dev] [svn commit] r3744 - common/trunk/src

[sumover-dev at cs.ucl.ac.uk]

Author: socrates
Date: Mon May 22 21:26:53 2006
New Revision: 3744

Modified:
   common/trunk/src/mbus.c

Log:
Commited a number of fixes mainly by peeking into Debian, FreeBSD, 
and Gentoo ports.

The set of fixes can be identified by the marker "//SV-XXX: FreeBSD", 
or "//SV-XXX: Debian" (will be removed in the next major release).

The set of fixes is part of the "sumover-1Qb-release" and these fixes
are described in detail on the wiki:
	https://frostie.cs.ucl.ac.uk/nets/mmedia/milestone/sumover-1Qb-release
and related tickets:
	37, 41, 42, 43, 44, 45, 46

Summary of main fixes:
	- fixed rat man page problem for Debian
	- using intptr_t casts for 64-bit architectures in vic
	- added missing #includes, and removed redundant ones
	- added some missing function prototypes
	- better fix for GETTIMEOFDAY_TO_NTP_OFFSET
	- using delete[] for some objects allocated with "new"
	- using various casts, including (sig_t) for unix signals
	- now using intmax_t cast for time_t struct
	- use srandomdev() instead for srandom() in FreeBSD
	- use openssl's md5 instead of vic's own, link to -lcrypto



Modified: common/trunk/src/mbus.c
==============================================================================
--- common/trunk/src/mbus.c	(original)
+++ common/trunk/src/mbus.c	Mon May 22 21:26:53 2006
@@ -265,9 +265,9 @@
 	mb_bufpos = mb_buffer + MBUS_AUTH_LEN;
       /* monster kludge */
       if(*dst == '(')
-	    sprintf(mb_bufpos, "\nmbus/1.0 %6d %ld%03ld %c (%s) %s ", seqnum, ts.tv_sec,ts.tv_usec/1000, reliable, src, dst);
+	    sprintf(mb_bufpos, "\nmbus/1.0 %6d %jd%03ld %c (%s) %s ", seqnum, (intmax_t)ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); //SV-XXX: FreeBSD
       else
-	    sprintf(mb_bufpos, "\nmbus/1.0 %6d %ld%03ld %c (%s) (%s) ", seqnum, ts.tv_sec,ts.tv_usec/1000, reliable, src, dst);
+	    sprintf(mb_bufpos, "\nmbus/1.0 %6d %jd%03ld %c (%s) (%s) ", seqnum, (intmax_t)ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); //SV-XXX: FreeBSD
 
       mb_bufpos += strlen(mb_bufpos);
 	if (ackseq == -1) {