kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 31520 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r31520 | kpfleming | 2006-06-01 15:27:50 -0500 (Thu, 01 Jun 2006) | 2 lines

handle Zap transfers behind chan_agent properly so the agent doesn't get stuck waiting for the call to hang up

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-01 20:53:17 +00:00
parent 0760b8244d
commit dfd5fc5605
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channel.c
View File

@@ -2829,6 +2829,14 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
{ {
int res = -1; 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) { if (original == clone) {
ast_log(LOG_WARNING, "Can't masquerade channel '%s' into itself!\n", original->name); ast_log(LOG_WARNING, "Can't masquerade channel '%s' into itself!\n", original->name);
return -1; return -1;

5
include/asterisk/channel.h
View File

@@ -311,8 +311,9 @@ struct ast_channel {
/*! Current active data generator */ /*! Current active data generator */
struct ast_generator *generator; struct ast_generator *generator;
/*! Who are we bridged to, if we're bridged Do not access directly, /*! Who are we bridged to, if we're bridged. Who is proxying for us,
use ast_bridged_channel(chan) */ if we are proxied (i.e. chan_agent).
Do not access directly, use ast_bridged_channel(chan) */
struct ast_channel *_bridge; struct ast_channel *_bridge;
/*! Channel that will masquerade as us */ /*! Channel that will masquerade as us */
struct ast_channel *masq; struct ast_channel *masq;