[svn-commits] oej: branch oej/pinefrog-1.4 r248391 - in /team/oej/pinefrog-1.4: channels/ m...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Feb 22 15:38:41 2010
New Revision: 248391

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248391
Log:
Making sure that uniqueid is there when I need it :-)

Modified:
    team/oej/pinefrog-1.4/channels/chan_sip.c
    team/oej/pinefrog-1.4/main/rtp.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=248391&r1=248390&r2=248391
==============================================================================
--- team/oej/pinefrog-1.4/channels/chan_sip.c (original)
+++ team/oej/pinefrog-1.4/channels/chan_sip.c Mon Feb 22 15:38:41 2010
@@ -13444,6 +13444,8 @@
 	int qosrealtime = ast_check_realtime("rtpqos");
 	long int duration;	/* Duration in secs */
 
+	memset(&qual, sizeof(qual), 0);
+
 	if (p && p->owner) {
 		struct ast_channel *bridgepeer = ast_bridged_channel(p->owner);
 		if (bridgepeer) {
@@ -13532,8 +13534,8 @@
 		ast_store_realtime("rtpqos", 
 			"channel", p->owner ? p->owner->name : "", 
 			"uniqueid", p->owner ? p->owner->uniqueid : "", 
-			"bridgedchan", qual.bridgedchan,
-			"bridgeduniqueid", qual.bridgeduniqueid,
+			"bridgedchan", qual.bridgedchan[0] ? qual.bridgedchan : "" ,
+			"bridgeduniqueid", qual.bridgeduniqueid[0] ? qual.bridgeduniqueid : "",
 			"pvtcallid", p->callid, 
 			"rtpmedia", mediatype, 
 			"localssrc", buf_lssrc, "remotessrc", buf_rssrc,

Modified: team/oej/pinefrog-1.4/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/main/rtp.c?view=diff&rev=248391&r1=248390&r2=248391
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Mon Feb 22 15:38:41 2010
@@ -2540,6 +2540,7 @@
 		}
 		if (!ast_strlen_zero(rtp->rtcp->bridgedchan)) {
 			ast_copy_string(qual->bridgedchan, rtp->rtcp->bridgedchan, sizeof(rtp->rtcp->bridgedchan));
+			ast_copy_string(qual->bridgeduniqueid, rtp->rtcp->bridgeduniqueid, sizeof(rtp->rtcp->bridgeduniqueid));
 		}
 	}
 	if (rtp->rtcp) {