[asterisk-commits] file: trunk r65869 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu May 24 10:10:13 2007
New Revision: 65869

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65869
Log:
Merged revisions 65863 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65863 | file | 2007-05-24 11:08:17 -0400 (Thu, 24 May 2007) | 2 lines

I like it when the RTP stack compiles myself...

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=65869&r1=65868&r2=65869
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Thu May 24 10:10:13 2007
@@ -903,7 +903,7 @@
 	unsigned int length;
 	int rc;
 	double rttsec;
-	uint64_t rtt;
+	uint64_t rtt = 0;
 	unsigned int dlsr;
 	unsigned int lsr;
 	unsigned int msw;
@@ -1034,7 +1034,7 @@
 				ast_verbose("  Last SR(our NTP): %lu.%010lu\n",(unsigned long) ntohl(rtcpheader[i + 4]) >> 16,((unsigned long) ntohl(rtcpheader[i + 4]) << 16) * 4096);
 				ast_verbose("  DLSR: %4.4f (sec)\n",ntohl(rtcpheader[i + 5])/65536.0);
 				if (rtt)
-					ast_verbose("  RTT: %lu(sec)\n", rtt);
+					ast_verbose("  RTT: %llu(sec)\n", rtt);
 			}
 			break;
 		case RTCP_PT_FUR: