diff options
author | Joshua Colp <jcolp@digium.com> | 2014-12-12 13:06:24 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2014-12-12 13:06:24 +0000 |
commit | 74d43977cf1ec43b9d5d8f84cc64592fdbd11115 (patch) | |
tree | e49497e449926fdbb08abb648437bd40419c94da /channels | |
parent | 8d384f38254142b6b41d335deebaf03fb8a8038b (diff) |
res_pjsip_session: Delay sending BYE if a re-INVITE transaction is in progress.
Given the scenario where a PJSIP channel is in a native RTP bridge with direct
media and the channel is then hung up the code will currently re-INVITE the channel
back to Asterisk and send a BYE at the same time. Many SIP implementations dislike
this greatly.
This change makes it so that if a re-INVITE transaction is in progress the BYE
is queued to occur after the completion of the transaction (be it through normal
means or a timeout).
Review: https://reviewboard.asterisk.org/r/4248/
........
Merged revisions 429409 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_pjsip.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 77e610ac3..b6bfeb5b4 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -1736,22 +1736,7 @@ static int hangup(void *data) struct ast_sip_session *session = channel->session; int cause = h_data->cause; - if (!session->defer_terminate) { - pj_status_t status; - pjsip_tx_data *packet = NULL; - - if (session->inv_session->state == PJSIP_INV_STATE_NULL) { - pjsip_inv_terminate(session->inv_session, cause ? cause : 603, PJ_TRUE); - } else if (((status = pjsip_inv_end_session(session->inv_session, cause ? cause : 603, NULL, &packet)) == PJ_SUCCESS) - && packet) { - if (packet->msg->type == PJSIP_RESPONSE_MSG) { - ast_sip_session_send_response(session, packet); - } else { - ast_sip_session_send_request(session, packet); - } - } - } - + ast_sip_session_terminate(session, cause); clear_session_and_channel(session, ast, pvt); ao2_cleanup(channel); ao2_cleanup(h_data); |