kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_session: Delay sending BYE if a re-INVITE transaction is in progress.

Browse Source 
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
This commit is contained in:
Joshua Colp
2014-12-12 13:06:24 +00:00
parent 8d384f3825
commit 74d43977cf
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/res_pjsip_session.c
View File

@@ -528,6 +528,8 @@ static int send_delayed_request(struct ast_sip_session *session, struct ast_sip_
} else if (!strcmp(delay->method, "UPDATE")) {
ast_sip_session_refresh(session, delay->on_request_creation,
delay->on_sdp_creation, delay->on_response, AST_SIP_SESSION_REFRESH_METHOD_UPDATE, delay->generate_new_sdp);
} else if (!strcmp(delay->method, "BYE")) {
ast_sip_session_terminate(session, 0);
} else {
ast_log(LOG_WARNING, "Unexpected delayed %s request with no existing request structure\n", delay->method);
return -1;
@@ -1292,6 +1294,38 @@ struct ast_sip_session *ast_sip_session_create_outgoing(struct ast_sip_endpoint
return session;
}
void ast_sip_session_terminate(struct ast_sip_session *session, int response)
{
pj_status_t status;
pjsip_tx_data *packet = NULL;
if (session->defer_terminate) {
return;
}
if (!response) {
response = 603;
}
if ((session->inv_session->state == PJSIP_INV_STATE_CONFIRMED) && session->inv_session->invite_tsx) {
ast_debug(3, "Delaying sending BYE to %s because of outstanding transaction...\n",
ast_sorcery_object_get_id(session->endpoint));
/* If this is delayed the only thing that will happen is a BYE request so we don't
* actually need to store the response code for when it happens.
*/
delay_request(session, NULL, NULL, NULL, 0, "BYE");
} else if (session->inv_session->state == PJSIP_INV_STATE_NULL) {
pjsip_inv_terminate(session->inv_session, response, PJ_TRUE);
} else if (((status = pjsip_inv_end_session(session->inv_session, response, 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);
}
}
}
static int session_termination_task(void *data)
{
RAII_VAR(struct ast_sip_session *, session, data, ao2_cleanup);

1
res/res_pjsip_session.exports.in
View File

@@ -1,5 +1,6 @@
{
global:
LINKER_SYMBOL_PREFIXast_sip_session_terminate;
LINKER_SYMBOL_PREFIXast_sip_session_defer_termination;
LINKER_SYMBOL_PREFIXast_sip_session_register_sdp_handler;
LINKER_SYMBOL_PREFIXast_sip_session_unregister_sdp_handler;