[asterisk-commits] file: trunk r68923 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jun 12 09:26:12 2007
New Revision: 68923

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68923
Log:
Merged revisions 68922 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r68922 | file | 2007-06-12 10:23:11 -0400 (Tue, 12 Jun 2007) | 10 lines

Merged revisions 68921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68921 | file | 2007-06-12 10:18:57 -0400 (Tue, 12 Jun 2007) | 2 lines

Bring RTP back to Asterisk at the end of a native bridge no matter what.

........

................

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=68923&r1=68922&r2=68923
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Jun 12 09:26:12 2007
@@ -3095,6 +3095,11 @@
 		cs[0] = cs[1];
 		cs[1] = cs[2];
 	}
+
+	if (pr0->set_rtp_peer(c0, NULL, NULL, NULL, 0, 0))
+		ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c0->name);
+	if (pr1->set_rtp_peer(c1, NULL, NULL, NULL, 0, 0))
+		ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c1->name);
 
 	return AST_BRIDGE_FAILED;
 }