[asterisk-commits] oej: branch oej/pinefrog-rtcp-1.8 r382588 - in /team/oej/pinefrog-rtcp-1.8: c...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Mar  7 09:41:51 2013
New Revision: 382588

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382588
Log:
Small fixes of stuff. Ordinary stuff.

Modified:
    team/oej/pinefrog-rtcp-1.8/channels/sip/rtcp.c
    team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c

Modified: team/oej/pinefrog-rtcp-1.8/channels/sip/rtcp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/channels/sip/rtcp.c?view=diff&rev=382588&r1=382587&r2=382588
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/channels/sip/rtcp.c (original)
+++ team/oej/pinefrog-rtcp-1.8/channels/sip/rtcp.c Thu Mar  7 09:41:51 2013
@@ -96,6 +96,10 @@
 	//qual = ast_rtp_get_qualdata(instance);
 	//if (!qual) {
 		/* Houston, we got a problem */
+		return;
+	}
+	if (!qual) {
+		ast_log(LOG_ERROR, "--- Got not CQR data from RTP. \n");
 		return;
 	}
 	
@@ -201,6 +205,11 @@
 	char buf_inpacketloss[25], buf_outpacketloss[25];
 	char buf_outpackets[25], buf_inpackets[25];
 
+	if (!qual) {
+		ast_log(LOG_ERROR, "No CQR data provided \n");
+		return;
+	}
+
 	/* Since the CDR is already gone, we need to calculate our own duration.
 	   The CDR duration is the definitive resource for billing, this is
 	   the RTP stream duration which may include early media (ringing and

Modified: team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c?view=diff&rev=382588&r1=382587&r2=382588
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c (original)
+++ team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c Thu Mar  7 09:41:51 2013
@@ -108,7 +108,7 @@
 static int rtpend = DEFAULT_RTP_END;			/*!< Last port for RTP sessions (set in rtp.conf) */
 static int rtpdebug;			/*!< Are we debugging? */
 static int rtcpdebug;			/*!< Are we debugging RTCP? */
-static int rtcpstats;			/*!< Are we debugging RTCP? */
+static int rtcpstats;			/*!< Are we gathering stats? */
 static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */
 static struct ast_sockaddr rtpdebugaddr;	/*!< Debug packets to/from this host */
 static struct ast_sockaddr rtcpdebugaddr;	/*!< Debug RTCP packets to/from this host */