[asterisk-commits] branch oej/test-this-branch r11979 - /team/oej/test-this-branch/rtp.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar  6 03:09:35 2006
New Revision: 11979

URL: http://svn.digium.com/view/asterisk?rev=11979&view=rev
Log:
RTP fixes from Luigi Rizzo (also committed to the rtcp branch)

Modified:
    team/oej/test-this-branch/rtp.c

Modified: team/oej/test-this-branch/rtp.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/rtp.c?rev=11979&r1=11978&r2=11979&view=diff
==============================================================================
--- team/oej/test-this-branch/rtp.c (original)
+++ team/oej/test-this-branch/rtp.c Mon Mar  6 03:09:35 2006
@@ -536,9 +536,9 @@
 	  		rtp->rtcp->themrxlsr = ((ntohl(rtcpheader[i]) & 0x0000ffff) << 16) | ((ntohl(rtcpheader[i+1]) & 0xffff) >> 16); /* Going to LSR in RR*/
     
 	  		if(rtcp_debug_test_addr(&sin)){
-	  			ast_verbose("NTP timestamp: %u.%010u\n",ntohl(rtcpheader[i]), ntohl(rtcpheader[i+1])*4096);
-	  			ast_verbose("RTP timestamp: %u\n",ntohl(rtcpheader[i+2]));
-	  			ast_verbose("SPC: %u\tSOC: %u\n",ntohl(rtcpheader[i+3]),ntohl(rtcpheader[i+4]));
+	  			ast_verbose("NTP timestamp: %lu.%010lu\n",ntohl(rtcpheader[i]), ntohl(rtcpheader[i+1])*4096);
+	  			ast_verbose("RTP timestamp: %lu\n",ntohl(rtcpheader[i+2]));
+	  			ast_verbose("SPC: %lu\tSOC: %lu\n",ntohl(rtcpheader[i+3]),ntohl(rtcpheader[i+4]));
 	  		}
 				i += 5;
 				if (rc < 1)
@@ -566,12 +566,12 @@
 	  		rtp->rtcp->reported_jitter = ntohl(rtcpheader[i+3]);
 	  		rtp->rtcp->reported_lost = ntohl(rtcpheader[i+1]) & 0xffffff;
 	  		if(rtcp_debug_test_addr(&sin)){
-	  			ast_verbose("Fraction lost: %d\n", ((ntohl(rtcpheader[i+1]) & 0xff000000) >> 24));
+	  			ast_verbose("Fraction lost: %ld\n", ((ntohl(rtcpheader[i+1]) & 0xff000000) >> 24));
 	  			ast_verbose("Packets lost so far: %d\n", rtp->rtcp->reported_lost);
-	  			ast_verbose("Highest sequence number: %d\n", (ntohl(rtcpheader[i+2]) & 0xffff));
-	  			ast_verbose("Sequence number cycles: %d\n", (ntohl(rtcpheader[i+2]) & 0xffff) >> 16);
+	  			ast_verbose("Highest sequence number: %ld\n", (ntohl(rtcpheader[i+2]) & 0xffff));
+	  			ast_verbose("Sequence number cycles: %ld\n", (ntohl(rtcpheader[i+2]) & 0xffff) >> 16);
 	  			ast_verbose("Interarrival jitter: %u\n", rtp->rtcp->reported_jitter);
-	  			ast_verbose("Last SR(our NTP): %u.%010u\n",ntohl(rtcpheader[i+4])>>16,(ntohl(rtcpheader[i+4])<<16)*4096);
+	  			ast_verbose("Last SR(our NTP): %lu.%010lu\n",ntohl(rtcpheader[i+4])>>16,(ntohl(rtcpheader[i+4])<<16)*4096);
 	  			ast_verbose("DLSR: %4.4f (sec)\n",ntohl(rtcpheader[i+5])/65536.0);
 	  			if(rtt)
 	  				ast_verbose("RTT: %f(sec)\n", rtt);