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

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Feb 23 11:15:20 2010
New Revision: 248402

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248402
Log:
Various cleanups after testing and reviewing and ...avoiding going to the kitchen to make dinner...

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=248402&r1=248401&r2=248402
==============================================================================
--- team/oej/pinefrog-1.4/channels/chan_sip.c (original)
+++ team/oej/pinefrog-1.4/channels/chan_sip.c Tue Feb 23 11:15:20 2010
@@ -13451,6 +13451,7 @@
 		if (bridgepeer) {
 			/* Store the bridged peer data while we have it */
 			ast_rtcp_set_bridged(rtp, bridgepeer->name, bridgepeer->uniqueid);
+			ast_log(log_debug, "---- Setting bridged peer name to %s\n", bridgepeer->name);
 		}
 	}
 

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=248402&r1=248401&r2=248402
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Tue Feb 23 11:15:20 2010
@@ -2537,10 +2537,12 @@
 			qual->rtt = rtp->rtcp->rtt;
 			qual->rttmax = rtp->rtcp->maxrtt;
 			qual->rttmin = rtp->rtcp->minrtt;
-		}
-		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 (!ast_strlen_zero(rtp->rtcp->bridgedchan)) {
+				ast_copy_string(qual->bridgedchan, rtp->rtcp->bridgedchan, sizeof(qual->bridgedchan));
+			}
+			if (!ast_strlen_zero(rtp->rtcp->bridgeduniqueid)) {
+				ast_copy_string(qual->bridgeduniqueid, rtp->rtcp->bridgeduniqueid, sizeof(qual->bridgeduniqueid));
+			}
 		}
 	}
 	if (rtp->rtcp) {