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 /channels/chan_sip.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 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a9a13790c..6c49236ce 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -26081,10 +26081,10 @@ struct blind_transfer_cb_data { * \param user_data A blind_transfer_cb_data struct * \param transfer_type Unused */ -static void blind_transfer_cb(struct ast_channel *chan, void *user_data, +static void blind_transfer_cb(struct ast_channel *chan, struct transfer_channel_data *user_data_wrapper, enum ast_transfer_type transfer_type) { - struct blind_transfer_cb_data *cb_data = user_data; + struct blind_transfer_cb_data *cb_data = user_data_wrapper->data; pbx_builtin_setvar_helper(chan, "SIPTRANSFER", "yes"); pbx_builtin_setvar_helper(chan, "SIPTRANSFER_REFERER", cb_data->referred_by); |