diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-05-28 14:45:31 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-05-28 14:45:31 +0000 |
| commit | fac3839e6837241c10bee6f2563a27f1d367ddc6 (patch) | |
| tree | 76e37ff2fddc7d30ee75f8d6d498aabca58f21e8 /channels/chan_mgcp.c | |
| parent | 2d2a47fae380a78ef9a2f14cb8dcb84d58ef58c5 (diff) | |
Adds support for a core attended transfer function plus adds some hiding of masquerades.
The attended transfer API call can complete the attended transfer in a number of ways
depending on the current bridged states of the channels involved.
The hiding of masquerades is done in some bridging-related functions, such as the manager
Bridge action and the Bridge dialplan application. In addition, call pickup was edited
to "move" a channel rather than masquerade it.
Review: https://reviewboard.asterisk.org/r/2511
(closes issue ASTERISK-21334)
Reported by Matt Jordan
(closes issue Asterisk-21336)
Reported by Matt Jordan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index a6c161d39..df82061b8 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -3236,7 +3236,7 @@ static int attempt_transfer(struct mgcp_endpoint *p, struct mgcp_subchannel *sub ast_mutex_unlock(&p->sub->next->lock); ast_mutex_unlock(&p->sub->lock); - res = ast_bridge_transfer_attended(sub->owner, sub->next->owner, NULL); + res = ast_bridge_transfer_attended(sub->owner, sub->next->owner); /* Subs are only freed when the endpoint itself is destroyed, so they will continue to exist * after ast_bridge_transfer_attended returns making this safe without reference counting |