Author: rmudgett Date: Thu Feb 19 11:30:05 2015 New Revision: 431956 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431956 Log: res_pjsip_refer: Handle INVITE with Replaces failure after answer.
* Fixed hangup handling of the session->channel after answer if the ast_channel_move() or ast_bridge_impart() fails. We are still the thread controlling the session->channel so we need to call ast_hangup() to kill the channel. * Fixed debug messages in refer_incoming_invite_request() referencing incorrect channnels on success. Code comments now say why the session->channel cannot be used. Review: https://reviewboard.asterisk.org/r/4422/ Modified: branches/13/res/res_pjsip_refer.c Modified: branches/13/res/res_pjsip_refer.c URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_pjsip_refer.c?view=diff&rev=431956&r1=431955&r2=431956 ============================================================================== --- branches/13/res/res_pjsip_refer.c (original) +++ branches/13/res/res_pjsip_refer.c Thu Feb 19 11:30:05 2015 @@ -37,6 +37,7 @@ #include "asterisk/framehook.h" #include "asterisk/stasis_bridges.h" #include "asterisk/stasis_channels.h" +#include "asterisk/causes.h" /*! \brief REFER Progress structure */ struct refer_progress { @@ -707,8 +708,6 @@ return 503; } - - return 0; } static int refer_incoming_blind_request(struct ast_sip_session *session, pjsip_rx_data *rdata, pjsip_sip_uri *target, @@ -792,8 +791,9 @@ /* If a Replaces header is present make sure it is valid */ if (pjsip_replaces_verify_request(rdata, &other_dlg, PJ_TRUE, &packet) != PJ_SUCCESS) { response = packet->msg->line.status.code; + ast_assert(response != 0); pjsip_tx_data_dec_ref(packet); - goto end; + goto inv_replace_failed; } /* If no other dialog exists then this INVITE request does not have a Replaces header */ @@ -807,21 +807,21 @@ /* Don't accept an in-dialog INVITE with Replaces as it does not make much sense */ if (session->inv_session->dlg->state == PJSIP_DIALOG_STATE_ESTABLISHED) { response = 488; - goto end; + goto inv_replace_failed; } if (!other_session) { - response = 481; ast_debug(3, "INVITE with Replaces received on channel '%s' from endpoint '%s', but requested session does not exist\n", ast_channel_name(session->channel), ast_sorcery_object_get_id(session->endpoint)); - goto end; + response = 481; + goto inv_replace_failed; } invite.session = other_session; if (ast_sip_push_task_synchronous(other_session->serializer, invite_replaces, &invite)) { response = 481; - goto end; + goto inv_replace_failed; } ast_channel_lock(session->channel); @@ -829,48 +829,69 @@ ast_channel_unlock(session->channel); ast_raw_answer(session->channel); + ast_debug(3, "INVITE with Replaces being attempted. '%s' --> '%s'\n", + ast_channel_name(session->channel), ast_channel_name(invite.channel)); + if (!invite.bridge) { struct ast_channel *chan = session->channel; - /* This will use a synchronous task but we aren't operating in the serializer at this point in time, so it - * won't deadlock */ - if (!ast_channel_move(invite.channel, session->channel)) { + /* + * This will use a synchronous task but we aren't operating in + * the serializer at this point in time, so it won't deadlock. + */ + if (!ast_channel_move(invite.channel, chan)) { + /* + * We can't directly use session->channel because ast_channel_move() + * does a masquerade which changes session->channel to a different + * channel. To ensure we work on the right channel we store a + * pointer locally before we begin so it remains valid. + */ ast_hangup(chan); } else { - response = 500; + response = AST_CAUSE_FAILURE; } } else { if (ast_bridge_impart(invite.bridge, session->channel, invite.channel, NULL, AST_BRIDGE_IMPART_CHAN_INDEPENDENT)) { - response = 500; - } - } - - if (!response) { - ast_debug(3, "INVITE with Replaces successfully completed on channels '%s' and '%s'\n", - ast_channel_name(session->channel), ast_channel_name(invite.channel)); + response = AST_CAUSE_FAILURE; + } } ast_channel_unref(invite.channel); ao2_cleanup(invite.bridge); -end: - if (response) { - if (session->inv_session->dlg->state != PJSIP_DIALOG_STATE_ESTABLISHED) { - ast_debug(3, "INVITE with Replaces failed on channel '%s', sending response of '%d'\n", - ast_channel_name(session->channel), response); - session->defer_terminate = 1; - ast_hangup(session->channel); - session->channel = NULL; - - if (pjsip_inv_end_session(session->inv_session, response, NULL, &packet) == PJ_SUCCESS) { - ast_sip_session_send_response(session, packet); - } - } else { - ast_debug(3, "INVITE with Replaces in-dialog on channel '%s', hanging up\n", - ast_channel_name(session->channel)); - ast_queue_hangup(session->channel); - } + if (!response) { + /* + * On success we cannot use session->channel in the debug message. + * This thread either no longer has a ref to session->channel or + * session->channel is no longer the original channel. + */ + ast_debug(3, "INVITE with Replaces successfully completed.\n"); + } else { + ast_debug(3, "INVITE with Replaces failed on channel '%s', hanging up with cause '%d'\n", + ast_channel_name(session->channel), response); + ast_channel_lock(session->channel); + ast_channel_hangupcause_set(session->channel, response); + ast_channel_unlock(session->channel); + ast_hangup(session->channel); + } + + return 1; + +inv_replace_failed: + if (session->inv_session->dlg->state != PJSIP_DIALOG_STATE_ESTABLISHED) { + ast_debug(3, "INVITE with Replaces failed on channel '%s', sending response of '%d'\n", + ast_channel_name(session->channel), response); + session->defer_terminate = 1; + ast_hangup(session->channel); + + if (pjsip_inv_end_session(session->inv_session, response, NULL, &packet) == PJ_SUCCESS) { + ast_sip_session_send_response(session, packet); + } + } else { + ast_debug(3, "INVITE with Replaces in-dialog on channel '%s', hanging up\n", + ast_channel_name(session->channel)); + ast_queue_hangup(session->channel); } return 1; -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
