diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 19:21:50 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 19:21:50 +0000 |
commit | 6d1ffed858e71420e650842d12aa78b7c5aa9a29 (patch) | |
tree | 622e8772c0678d57e79740fa91e6b77781678b34 /channel.c | |
parent | b9b89d3935816b469a3bc15a9a0e35311af19d7b (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@56275 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2807,10 +2807,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)) { |