[svn-commits] file: branch 1.4 r68922 - in /branches/1.4: ./ main/rtp.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Jun 12 09:23:11 2007
New Revision: 68922

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68922
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/main/rtp.c

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

Modified: branches/1.4/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/rtp.c?view=diff&rev=68922&r1=68921&r2=68922
==============================================================================
--- branches/1.4/main/rtp.c (original)
+++ branches/1.4/main/rtp.c Tue Jun 12 09:23:11 2007
@@ -2958,6 +2958,11 @@
 		cs[0] = cs[1];
 		cs[1] = cs[2];
 	}
+
+	if (pr0->set_rtp_peer(c0, 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, 0, 0))
+		ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c1->name);
 
 	return AST_BRIDGE_FAILED;
 }