[asterisk-commits] file: trunk r57319 - in /trunk: ./ channels/chan_local.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Mar  1 16:23:26 2007
New Revision: 57319

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

................
r57318 | file | 2007-03-01 17:21:44 -0500 (Thu, 01 Mar 2007) | 10 lines

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

........
r57317 | file | 2007-03-01 17:19:32 -0500 (Thu, 01 Mar 2007) | 2 lines

Don't even attempt to optimize things when a proxy channel is involved. It will just explode in weird and unexplaineable ways. (issue #9175 reported by clegall_proformatique)

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

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

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=57319&r1=57318&r2=57319
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Thu Mar  1 16:23:26 2007
@@ -220,7 +220,7 @@
 
 static void check_bridge(struct local_pvt *p, int isoutbound)
 {
-	if (ast_test_flag(p, LOCAL_ALREADY_MASQED) || ast_test_flag(p, LOCAL_NO_OPTIMIZATION) || !p->chan || !p->owner)
+	if (ast_test_flag(p, LOCAL_ALREADY_MASQED) || ast_test_flag(p, LOCAL_NO_OPTIMIZATION) || !p->chan || !p->owner || (p->chan->_bridge != ast_bridged_channel(p->chan)))
 		return;
 
 	/* only do the masquerade if we are being called on the outbound channel,