[Sumover-dev] [svn commit] r3745 - in rat/trunk: man/man1

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

Author: socrates
Date: Mon May 22 21:27:58 2006
New Revision: 3745

Modified:
   rat/trunk/man/man1/rat.1
   rat/trunk/mbus_engine.c
   rat/trunk/ui_send_audio.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: rat/trunk/man/man1/rat.1
==============================================================================
--- rat/trunk/man/man1/rat.1	(original)
+++ rat/trunk/man/man1/rat.1	Mon May 22 21:27:58 2006
@@ -200,8 +200,8 @@
 Saleem Bhatti <S.Bhatti at cs.ucl.ac.uk> and integrated by Darren Harris.
 
 RAT has been supported by the following projects:
-.RS 4
-.TS
+
+.IP
 MICE	 Multimedia Conferencing in Europe (ESPRIT)
 
 MERCI	 Multimedia European Research Conferencing Integration
@@ -209,7 +209,6 @@
 ReLaTe	 Remote Language Teaching for Super Janet (BT/JISC)
 
 RAT	 Robust Audio Tool (EPSRC/BT)
-.TE
 .RE
 
 This software has benefited from hardware donations by Sun

Modified: rat/trunk/mbus_engine.c
==============================================================================
--- rat/trunk/mbus_engine.c	(original)
+++ rat/trunk/mbus_engine.c	Mon May 22 21:27:58 2006
@@ -604,11 +604,11 @@
 #endif
 			gettimeofday(&t, NULL);
 			gethostname(hname, 64);
-			sprintf(fname, "rat-%p-%ld.%06ld-%s-%s.log", sp, t.tv_sec, (long)t.tv_usec, hname, uname);
+			sprintf(fname, "rat-%p-%jd.%06ld-%s-%s.log", sp, (intmax_t)t.tv_sec, (long)t.tv_usec, hname, uname); //SV-XXX: FreeBSD
 			cname = rtp_get_sdes(sp->rtp_session[0], rtp_my_ssrc(sp->rtp_session[0]), RTCP_SDES_CNAME);
 
 			sp->logger = fopen(fname, "w");
-			fprintf(sp->logger, "tool_start %lu.%06lu ", t.tv_sec + SECS_BETWEEN_1900_1970, (long)t.tv_usec);
+			fprintf(sp->logger, "tool_start %ju.%06lu ", (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, (long)t.tv_usec); //SV-XXX: FreeBSD
 			fprintf(sp->logger, "0x%08lx\n", (unsigned long) rtp_my_ssrc(sp->rtp_session[0]));
 		} else {
 			fclose(sp->logger);

Modified: rat/trunk/ui_send_audio.c
==============================================================================
--- rat/trunk/ui_send_audio.c	(original)
+++ rat/trunk/ui_send_audio.c	Mon May 22 21:27:58 2006
@@ -279,7 +279,7 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
-		fprintf(sp->logger, "silence    %lu.%06lu 0x%08lx %s\n", t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec,
+		fprintf(sp->logger, "silence    %ju.%06lu 0x%08lx %s\n", (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: FreeBSD
 		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), name);
 	}
 }
@@ -371,8 +371,8 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
-		fprintf(sp->logger, "channel    %lu.%06lu 0x%08lx redundancy %s\n",
-		        t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec,
+		fprintf(sp->logger, "channel    %ju.%06lu 0x%08lx redundancy %s\n",
+		        (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: FreeBSD
 		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), scf->long_name);
 	}
 
@@ -453,8 +453,8 @@
 		if (sp->logger != NULL) {
 			struct timeval	t;
 			gettimeofday(&t, NULL);
-			fprintf(sp->logger, "channel    %lu.%06lu 0x%08lx none\n",
-				t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]));
+			fprintf(sp->logger, "channel    %ju.%06lu 0x%08lx none\n",
+				(intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); //SV-XXX: FreeBSD
 		}
                 break;
         case 'r':
@@ -485,8 +485,8 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
-		fprintf(sp->logger, "codec      %lu.%06lu 0x%08lx %s\n",
-			t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]),
+		fprintf(sp->logger, "codec      %ju.%06lu 0x%08lx %s\n",
+			(intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), //SV-XXX: FreeBSD
 			pri_cf->long_name);
 	}
 }