kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_session: Prevent crash during shutdown.

Browse Source 
pjproject does not have a function to reverse pjsip_inv_usage_init.
This means we need to ignore any calls to the functions once shutdown is
final.

ASTERISK-27571 #close

Change-Id: Ia550fcba563e2328f03162d79fb185f16b7c9b9d
This commit is contained in:
Corey Farrell
2018-01-31 00:05:15 -05:00
parent da4ddb1faa
commit 60701b3252
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
res/res_pjsip_session.c
View File

@@ -3425,9 +3425,13 @@ static void handle_incoming_before_media(pjsip_inv_session *inv,
static void session_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e) static void session_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e)
{ {
struct ast_sip_session *session = inv->mod_data[session_module.id]; struct ast_sip_session *session;
pjsip_event_id_e type; pjsip_event_id_e type;
if (ast_shutdown_final()) {
return;
}
if (e) { if (e) {
print_debug_details(inv, NULL, e); print_debug_details(inv, NULL, e);
type = e->type; type = e->type;
@@ -3435,6 +3439,7 @@ static void session_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e)
type = PJSIP_EVENT_UNKNOWN; type = PJSIP_EVENT_UNKNOWN;
} }
session = inv->mod_data[session_module.id];
if (!session) { if (!session) {
return; return;
} }
@@ -3536,13 +3541,7 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
struct ast_sip_session *session; struct ast_sip_session *session;
pjsip_tx_data *tdata; pjsip_tx_data *tdata;
/* if (ast_shutdown_final()) {
* A race condition exists at shutdown where the res_pjsip_session can be
* unloaded but this callback may still get called afterwards. In this case
* the id may end up being -1 which is useless to us. To work around this
* we store the current value and check/use it.
*/
if (id < 0) {
return; return;
} }
@@ -3991,9 +3990,14 @@ static struct pjmedia_sdp_session *create_local_sdp(pjsip_inv_session *inv, stru
static void session_inv_on_rx_offer(pjsip_inv_session *inv, const pjmedia_sdp_session *offer) static void session_inv_on_rx_offer(pjsip_inv_session *inv, const pjmedia_sdp_session *offer)
{ {
struct ast_sip_session *session = inv->mod_data[session_module.id]; struct ast_sip_session *session;
pjmedia_sdp_session *answer; pjmedia_sdp_session *answer;
if (ast_shutdown_final()) {
return;
}
session = inv->mod_data[session_module.id];
if (handle_incoming_sdp(session, offer)) { if (handle_incoming_sdp(session, offer)) {
return; return;
} }
@@ -4012,9 +4016,14 @@ static void session_inv_on_create_offer(pjsip_inv_session *inv, pjmedia_sdp_sess
static void session_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status) static void session_inv_on_media_update(pjsip_inv_session *inv, pj_status_t status)
{ {
struct ast_sip_session *session = inv->mod_data[session_module.id]; struct ast_sip_session *session;
const pjmedia_sdp_session *local, *remote; const pjmedia_sdp_session *local, *remote;
if (ast_shutdown_final()) {
return;
}
session = inv->mod_data[session_module.id];
if (!session || !session->channel) { if (!session || !session->channel) {
/* /*
* If we don't have a session or channel then we really * If we don't have a session or channel then we really
@@ -4037,10 +4046,15 @@ static void session_inv_on_media_update(pjsip_inv_session *inv, pj_status_t stat
static pjsip_redirect_op session_inv_on_redirected(pjsip_inv_session *inv, const pjsip_uri *target, const pjsip_event *e) static pjsip_redirect_op session_inv_on_redirected(pjsip_inv_session *inv, const pjsip_uri *target, const pjsip_event *e)
{ {
struct ast_sip_session *session = inv->mod_data[session_module.id]; struct ast_sip_session *session;
const pjsip_sip_uri *uri; const pjsip_sip_uri *uri;
if (!session->channel) { if (ast_shutdown_final()) {
return PJSIP_REDIRECT_STOP;
}
session = inv->mod_data[session_module.id];
if (!session || !session->channel) {
return PJSIP_REDIRECT_STOP; return PJSIP_REDIRECT_STOP;
} }