diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 18:53:22 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 18:53:22 +0000 |
| commit | 34a5d7b0212beb3f6bd643e3bd1cff08ee281a1b (patch) | |
| tree | 918c2dabd8d1f52dbb7b78a1e03c6990b38c3859 /main | |
| parent | 8a8708c9464bfe85e43459cca200425a3d4bdff5 (diff) | |
Merged revisions 56231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r56231 | file | 2007-02-22 13:49:39 -0500 (Thu, 22 Feb 2007) | 10 lines
Merged revisions 56230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r56230 | file | 2007-02-22 13:44:24 -0500 (Thu, 22 Feb 2007) | 2 lines
Only change the original or clone channel if it's the channel behind the proxy channel, not if it's just a regular bridged channel.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@56232 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 0405a7ab5..2ab07b7e5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3114,10 +3114,10 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo /* each of these channels may be sitting behind a channel proxy (i.e. chan_agent) and if so, we don't really want to masquerade it, but its proxy */ - if (original->_bridge && (original->_bridge != ast_bridged_channel(original))) + if (original->_bridge && (original->_bridge != ast_bridged_channel(original)) && (original->_bridge->_bridge != original)) final_orig = original->_bridge; - if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone))) + if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)) && (clone->_bridge->_bridge != clone)) final_clone = clone->_bridge; if ((final_orig != original) || (final_clone != clone)) { |