Merged revisions 65863 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 24 May 2007 15:10:13 +0000 (15:10 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 24 May 2007 15:10:13 +0000 (15:10 +0000)
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...

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65869 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

index 660b42b..8dc4e03 100644 (file)
@@ -903,7 +903,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
        unsigned int length;
        int rc;
        double rttsec;
        unsigned int length;
        int rc;
        double rttsec;
-       uint64_t rtt;
+       uint64_t rtt = 0;
        unsigned int dlsr;
        unsigned int lsr;
        unsigned int msw;
        unsigned int dlsr;
        unsigned int lsr;
        unsigned int msw;
@@ -1034,7 +1034,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
                                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("  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:
                        }
                        break;
                case RTCP_PT_FUR: