diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-05-22 15:52:30 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-05-22 15:52:30 +0000 |
| commit | d00882108fabd3798aa6566aa5697d82459e753e (patch) | |
| tree | 0cb38a4b41e85b73f89486b8492a0fc3078e3ba9 /main/bridge_basic.c | |
| parent | 912bbdd1ddf98b4e6d99b3cb258f103c09ee132f (diff) | |
res_pjsip_refer: Fix bugs involving Parking/PJSIP/transfers
PJSIP would never send the final 200 Notify for a blind transfer
when transferring to parking. This patch fixes that. In addition,
it fixes a reference leak when performing blind transfers to
non-bridging extensions.
Review: https://reviewboard.asterisk.org/r/3485/
........
Merged revisions 414400 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@414403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge_basic.c')
| -rw-r--r-- | main/bridge_basic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/bridge_basic.c b/main/bridge_basic.c index a5827f2ad..cee56b1b5 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -3145,10 +3145,10 @@ static int feature_attended_transfer(struct ast_bridge_channel *bridge_channel, return 0; } -static void blind_transfer_cb(struct ast_channel *new_channel, void *user_data, +static void blind_transfer_cb(struct ast_channel *new_channel, struct transfer_channel_data *user_data_wrapper, enum ast_transfer_type transfer_type) { - struct ast_channel *transferer_channel = user_data; + struct ast_channel *transferer_channel = user_data_wrapper->data; if (transfer_type == AST_BRIDGE_TRANSFER_MULTI_PARTY) { copy_caller_data(new_channel, transferer_channel); |