diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 20:02:35 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-22 20:02:35 +0000 |
| commit | d15804cb11a243547364eb9bf22395025431470f (patch) | |
| tree | 64a9b92a575705dfd35cade84fd962ddb3a8551a /main/rtp.c | |
| parent | 998a907e04f48fd9c8d535178359583685b04d6c (diff) | |
Don't crash if RTCP is not enabled on an RTP structure but statistics are output.
(closes issue #14234)
Reported by: jcovert
Patches:
rtp.c.patch-1.6.0.3 uploaded by jcovert (license 551)
rtp.c.patch-svn-165599 uploaded by jcovert (license 551)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@170239 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/rtp.c b/main/rtp.c index 28fcad75f..5165ade83 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2134,17 +2134,17 @@ void ast_rtp_destroy(struct ast_rtp *rtp) ast_verbose("* Our Receiver:\n"); ast_verbose(" SSRC: %u\n", rtp->themssrc); ast_verbose(" Received packets: %u\n", rtp->rxcount); - ast_verbose(" Lost packets: %u\n", rtp->rtcp->expected_prior - rtp->rtcp->received_prior); + ast_verbose(" Lost packets: %u\n", rtp->rtcp ? (rtp->rtcp->expected_prior - rtp->rtcp->received_prior) : 0); ast_verbose(" Jitter: %.4f\n", rtp->rxjitter); ast_verbose(" Transit: %.4f\n", rtp->rxtransit); - ast_verbose(" RR-count: %u\n", rtp->rtcp->rr_count); + ast_verbose(" RR-count: %u\n", rtp->rtcp ? rtp->rtcp->rr_count : 0); ast_verbose("* Our Sender:\n"); ast_verbose(" SSRC: %u\n", rtp->ssrc); ast_verbose(" Sent packets: %u\n", rtp->txcount); - ast_verbose(" Lost packets: %u\n", rtp->rtcp->reported_lost); - ast_verbose(" Jitter: %u\n", rtp->rtcp->reported_jitter / (unsigned int)65536.0); - ast_verbose(" SR-count: %u\n", rtp->rtcp->sr_count); - ast_verbose(" RTT: %f\n", rtp->rtcp->rtt); + ast_verbose(" Lost packets: %u\n", rtp->rtcp ? rtp->rtcp->reported_lost : 0); + ast_verbose(" Jitter: %u\n", rtp->rtcp ? (rtp->rtcp->reported_jitter / (unsigned int)65536.0) : 0); + ast_verbose(" SR-count: %u\n", rtp->rtcp ? rtp->rtcp->sr_count : 0); + ast_verbose(" RTT: %f\n", rtp->rtcp ? rtp->rtcp->rtt : 0); } if (rtp->smoother) |