kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_session: Handle race condition at shutdown with timer."

Browse Source
This commit is contained in:
Joshua Colp
2016-06-21 18:53:33 -05:00
committed by Gerrit Code Review
parent 9e0df5a1a7 e94aae00a7
commit eaaab8f55f
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/res_pjsip_session.c
View File

@@ -2315,7 +2315,8 @@ static void reschedule_reinvite(struct ast_sip_session *session, ast_sip_session
static void __print_debug_details(const char *function, pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e) static void __print_debug_details(const char *function, pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e)
{ {
struct ast_sip_session *session; int id = session_module.id;
struct ast_sip_session *session = NULL;
if (!DEBUG_ATLEAST(5)) { if (!DEBUG_ATLEAST(5)) {
/* Debug not spamy enough */ /* Debug not spamy enough */
@@ -2330,7 +2331,9 @@ static void __print_debug_details(const char *function, pjsip_inv_session *inv,
pjsip_tsx_state_str(tsx->state)); pjsip_tsx_state_str(tsx->state));
return; return;
} }
if (id > -1) {
session = inv->mod_data[session_module.id]; session = inv->mod_data[session_module.id];
}
if (!session) { if (!session) {
ast_log(LOG_DEBUG, "inv_session %p has no ast session\n", inv); ast_log(LOG_DEBUG, "inv_session %p has no ast session\n", inv);
} else { } else {
@@ -2584,9 +2587,22 @@ static void session_inv_on_new_session(pjsip_inv_session *inv, pjsip_event *e)
static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e) static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e)
{ {
ast_sip_session_response_cb cb; ast_sip_session_response_cb cb;
struct ast_sip_session *session = inv->mod_data[session_module.id]; int id = session_module.id;
struct ast_sip_session *session;
pjsip_tx_data *tdata; pjsip_tx_data *tdata;
/*
* 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;
}
session = inv->mod_data[id];
print_debug_details(inv, tsx, e); print_debug_details(inv, tsx, e);
if (!session) { if (!session) {
/* The session has ended. Ignore the transaction change. */ /* The session has ended. Ignore the transaction change. */
@@ -2600,10 +2616,10 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
* we transfer the data into the transaction. This way, when we receive a response, we * we transfer the data into the transaction. This way, when we receive a response, we
* can dig this data out again * can dig this data out again
*/ */
tsx->mod_data[session_module.id] = e->body.tsx_state.src.tdata->mod_data[session_module.id]; tsx->mod_data[id] = e->body.tsx_state.src.tdata->mod_data[id];
break; break;
case PJSIP_EVENT_RX_MSG: case PJSIP_EVENT_RX_MSG:
cb = ast_sip_mod_data_get(tsx->mod_data, session_module.id, MOD_DATA_ON_RESPONSE); cb = ast_sip_mod_data_get(tsx->mod_data, id, MOD_DATA_ON_RESPONSE);
/* As the PJSIP invite session implementation responds with a 200 OK before we have a /* As the PJSIP invite session implementation responds with a 200 OK before we have a
* chance to be invoked session supplements for BYE requests actually end up executing * chance to be invoked session supplements for BYE requests actually end up executing
* in the invite session state callback as well. To prevent session supplements from * in the invite session state callback as well. To prevent session supplements from
@@ -2682,7 +2698,7 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
* Clear the module data now to block session_inv_on_state_changed() * Clear the module data now to block session_inv_on_state_changed()
* from calling session_end() if it hasn't already done so. * from calling session_end() if it hasn't already done so.
*/ */
inv->mod_data[session_module.id] = NULL; inv->mod_data[id] = NULL;
if (inv->state != PJSIP_INV_STATE_DISCONNECTED) { if (inv->state != PJSIP_INV_STATE_DISCONNECTED) {
session_end(session); session_end(session);
@@ -2705,8 +2721,8 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
* the dialog locked to get the session by other threads. * the dialog locked to get the session by other threads.
*/ */
pjsip_dlg_inc_lock(inv->dlg); pjsip_dlg_inc_lock(inv->dlg);
session = inv->mod_data[session_module.id]; session = inv->mod_data[id];
inv->mod_data[session_module.id] = NULL; inv->mod_data[id] = NULL;
pjsip_dlg_dec_lock(inv->dlg); pjsip_dlg_dec_lock(inv->dlg);
/* /*