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

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Dec 29 23:49:17 2006
New Revision: 49067

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

........
r49066 | file | 2006-12-30 00:46:57 -0500 (Sat, 30 Dec 2006) | 2 lines

If the Packet2Packet bridge is being broken because of a masquerade then attempt to read a frame in so the masquerade actually happens. Otherwise weirdness will occur. (issue #8696 reported by kjotte)

........

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=49067&r1=49066&r2=49067
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Fri Dec 29 23:49:17 2006
@@ -3070,6 +3070,10 @@
 		    (c0->masq || c0->masqr || c1->masq || c1->masqr)) {
 			if (option_debug > 2)
 				ast_log(LOG_DEBUG, "p2p-rtp-bridge: Oooh, something is weird, backing out\n");
+			if ((c0->masq || c0->masqr) && (fr = ast_read(c0)))
+				ast_frfree(fr);
+			if ((c1->masq || c1->masqr) && (fr = ast_read(c1)))
+				ast_frfree(fr);
 			res = AST_BRIDGE_RETRY;
 			break;
 		}