diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-10 12:55:24 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-10 12:55:24 +0000 |
| commit | ef1f2aa956e0e3fa747aec3626d3d8e8695a9da5 (patch) | |
| tree | a49ba7d7cca936edcd795a1032b5d9b90484a515 /main | |
| parent | 49b9bec31dfc14a7db1fb4226ca9a7e382b54157 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@121445 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 21d6b6f6e..f0f11b3ca 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4514,6 +4514,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; |