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

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jan 11 13:53:01 2008
New Revision: 98334

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

........
r98325 | file | 2008-01-11 15:51:10 -0400 (Fri, 11 Jan 2008) | 6 lines

If the incoming RTP stream changes codec force the bridge to break if the other side does not support it.
(closes issue #11729)
Reported by: tsearle
Patches:
      new_codec_patch_udiff.patch uploaded by tsearle (license 373)

........

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=98334&r1=98333&r2=98334
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Fri Jan 11 13:53:01 2008
@@ -1322,6 +1322,10 @@
 	/* Check what the payload value should be */
 	rtpPT = ast_rtp_lookup_pt(rtp, payload);
 
+	/* If the payload coming in is not one of the negotiated ones then send it to the core, this will cause formats to change and the bridge to break */
+	if (!bridged->current_RTP_PT[payload].code)
+		return -1;
+
 	/* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */
 	if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF)
 		return -1;
@@ -3534,6 +3538,12 @@
 	cs[1] = c1;
 	cs[2] = NULL;
 	for (;;) {
+		/* If the underlying formats have changed force this bridge to break */
+		if ((c0->rawreadformat != c1->rawwriteformat) || (c1->rawreadformat != c0->rawwriteformat)) {
+			ast_debug(3, "p2p-rtp-bridge: Oooh, formats changed, backing out\n");
+			res = AST_BRIDGE_FAILED_NOWARN;
+			break;
+		}
 		/* Check if anything changed */
 		if ((c0->tech_pvt != pvt0) ||
 		    (c1->tech_pvt != pvt1) ||