diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-06-10 12:54:39 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-06-10 12:54:39 +0000 |
| commit | 610faf11323a50e9b2bf134f1d89f490e25d3539 (patch) | |
| tree | 600257ad984a3b9bddcff41b886493f72220eacb /main/channel.c | |
| parent | a36833e3c23d200f1bc30e609b9c7557e10d2d11 (diff) | |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index cb1a56e79..3364a175d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4551,6 +4551,12 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha 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; |