diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_session.c | 34 | ||||
| -rw-r--r-- | res/res_pjsip_session.exports.in | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 53cd8c823..46973ad29 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -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); diff --git a/res/res_pjsip_session.exports.in b/res/res_pjsip_session.exports.in index 07f26b7e9..5a21b1d2f 100644 --- a/res/res_pjsip_session.exports.in +++ b/res/res_pjsip_session.exports.in @@ -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; |