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

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jun  6 08:32:11 2007
New Revision: 67651

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

................
r67650 | file | 2007-06-06 09:30:25 -0400 (Wed, 06 Jun 2007) | 10 lines

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

........
r67649 | file | 2007-06-06 09:28:34 -0400 (Wed, 06 Jun 2007) | 2 lines

Reinvite the RTP back to the Asterisk machine when the timeout happens. (issue #9888 reported by gasparz)

........

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

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=67651&r1=67650&r2=67651
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Jun  6 08:32:11 2007
@@ -3020,8 +3020,13 @@
 
 		/* Wait for frame to come in on the channels */
 		if (!(who = ast_waitfor_n(cs, 2, &timeoutms))) {
-			if (!timeoutms)
+			if (!timeoutms) {
+				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_RETRY;
+			}
 			if (option_debug)
 				ast_log(LOG_DEBUG, "Ooh, empty read...\n");
 			if (ast_check_hangup(c0) || ast_check_hangup(c1))