diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 21:05:20 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 21:05:20 +0000 |
commit | 753d04597224cca1e69bd4224012c92af62e1504 (patch) | |
tree | e7951e6f2edb34d1feecdb81d1966519bd2af8a0 /channel.c | |
parent | 5ca5decbf3b74d3a7d21cfd3b32f119de3cc8387 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31551 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -2736,6 +2736,14 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo struct ast_frame null = { AST_FRAME_NULL, }; int res = -1; + /* 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))) + original = original->_bridge; + + if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone))) + clone = clone->_bridge; + if (original == clone) { ast_log(LOG_WARNING, "Can't masquerade channel '%s' into itself!\n", original->name); return -1; |