[asterisk-commits] file: branch 1.6.1 r170242 - in /branches/1.6.1: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jan 22 14:06:07 2009
New Revision: 170242

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170242
Log:
Merged revisions 170240 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170240 | file | 2009-01-22 16:04:39 -0400 (Thu, 22 Jan 2009) | 14 lines
  
  Merged revisions 170239 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170239 | file | 2009-01-22 16:02:35 -0400 (Thu, 22 Jan 2009) | 7 lines
    
    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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/rtp.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=170242&r1=170241&r2=170242
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Thu Jan 22 14:06:07 2009
@@ -2945,17 +2945,17 @@
 		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);
 	}
 
 	manager_event(EVENT_FLAG_REPORTING, "RTPReceiverStat", "SSRC: %u\r\n"
@@ -2966,10 +2966,10 @@
 					    "RRCount: %u\r\n",
 					    rtp->themssrc,
 					    rtp->rxcount,
-					    rtp->rtcp->expected_prior - rtp->rtcp->received_prior,
+					    rtp->rtcp ? (rtp->rtcp->expected_prior - rtp->rtcp->received_prior) : 0,
 					    rtp->rxjitter,
 					    rtp->rxtransit,
-					    rtp->rtcp->rr_count);
+					    rtp->rtcp ? rtp->rtcp->rr_count : 0);
 	manager_event(EVENT_FLAG_REPORTING, "RTPSenderStat", "SSRC: %u\r\n"
 					    "SentPackets: %u\r\n"
 					    "LostPackets: %u\r\n"
@@ -2978,10 +2978,10 @@
 					    "RTT: %f\r\n",
 					    rtp->ssrc,
 					    rtp->txcount,
-					    rtp->rtcp->reported_lost,
-					    rtp->rtcp->reported_jitter,
-					    rtp->rtcp->sr_count,
-					    rtp->rtcp->rtt);
+					    rtp->rtcp ? rtp->rtcp->reported_lost : 0,
+					    rtp->rtcp ? rtp->rtcp->reported_jitter : 0,
+					    rtp->rtcp ? rtp->rtcp->sr_count : 0,
+					    rtp->rtcp ? rtp->rtcp->rtt : 0);
 	if (rtp->smoother)
 		ast_smoother_free(rtp->smoother);
 	if (rtp->ioid)