[asterisk-commits] file: branch 1.6.0 r121445 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jun 10 07:55:24 2008
New Revision: 121445

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121445
Log:
Merged revisions 121444 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r121444 | file | 2008-06-10 09:54:39 -0300 (Tue, 10 Jun 2008) | 12 lines

Merged revisions 121442 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r121442 | file | 2008-06-10 09:52:06 -0300 (Tue, 10 Jun 2008) | 4 lines

Update BRIDGEPEER variable before we do a generic bridge in case we just broke out of a native bridge and fell through to generic.
(closes issue #12815)
Reported by: ramonpeek

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=121445&r1=121444&r2=121445
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Tue Jun 10 07:55:24 2008
@@ -4514,6 +4514,12 @@
 			o0nativeformats = c0->nativeformats;
 			o1nativeformats = c1->nativeformats;
 		}
+
+		if (!ast_strlen_zero(pbx_builtin_getvar_helper(c0, "BRIDGEPEER")))
+			pbx_builtin_setvar_helper(c0, "BRIDGEPEER", c1->name);
+		if (!ast_strlen_zero(pbx_builtin_getvar_helper(c1, "BRIDGEPEER")))
+			pbx_builtin_setvar_helper(c1, "BRIDGEPEER", c0->name);
+
 		res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts);
 		if (res != AST_BRIDGE_RETRY)
 			break;