[asterisk-commits] oej: branch oej/pinefrog-1.4 r248395 - /team/oej/pinefrog-1.4/channels/

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Feb 23 08:04:05 2010
New Revision: 248395

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248395
Log:
Make sure we have proper duration

Modified:
    team/oej/pinefrog-1.4/channels/chan_sip.c

Modified: team/oej/pinefrog-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/channels/chan_sip.c?view=diff&rev=248395&r1=248394&r2=248395
==============================================================================
--- team/oej/pinefrog-1.4/channels/chan_sip.c (original)
+++ team/oej/pinefrog-1.4/channels/chan_sip.c Tue Feb 23 08:04:05 2010
@@ -13442,7 +13442,7 @@
 	char *rtpqstring = NULL;
 	char localjitter[10], remotejitter[10];
 	int qosrealtime = ast_check_realtime("rtpqos");
-	long int duration;	/* Duration in secs */
+	unsigned int duration;	/* Duration in secs */
 
 	memset(&qual, sizeof(qual), 0);
 
@@ -13460,7 +13460,7 @@
 		   If numberofreports == 0 we have no incoming RTCP active, thus we can't
 		   get any reliable data to handle packet loss or any RTT timing.
 		*/
-		duration = (long int)(ast_tvdiff_ms(ast_tvnow(), qual.start) / 1000);
+		duration = (unsigned int)(ast_tvdiff_ms(ast_tvnow(), qual.start) / 1000);
 		manager_event(EVENT_FLAG_CALL, "RTPQuality", 
 			"Channel: %s\r\n"			/* AST_CHANNEL for this call */
 			"Uniqueid: %s\r\n"			/* AST_CHANNEL for this call */
@@ -13488,8 +13488,8 @@
 			"\r\n", 
 			p->owner ? p->owner->name : "",
 			p->owner ? p->owner->uniqueid : "",
-			qual.bridgedchan,
-			qual.bridgeduniqueid,
+			qual.bridgedchan[0] ? qual.bridgedchan : "" ,
+			qual.bridgeduniqueid[0] ? qual.bridgeduniqueid : "",
 			endreport ? "Final" : "Update",
 			qual.numberofreports == 0 ? "Inactive" : "Active",
 			duration,
@@ -13520,7 +13520,7 @@
 	   report in realtime when we have it */
 	if (endreport && qosrealtime) {
 		char buf_duration[10], buf_lssrc[30], buf_rssrc[30], buf_rtt[30];
-		duration = (long int)(ast_tvdiff_ms(ast_tvnow(), qual.start) / 1000);
+		duration = (unsigned int)(ast_tvdiff_ms(ast_tvnow(), qual.start) / 1000);
 
 		if (rtpqstring == NULL) {
 			rtpqstring =  ast_rtp_get_quality(rtp, &qual);