kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_session.c: Fix unbound srv failover tests.

Browse Source 
Commit 1b666549f3 broke the srv failover
functionality if a TCP connection gets disconnected.  Under these
conditions, session_inv_on_state_changed() gets a
PJSIP_EVENT_TRANSPORT_ERROR and restarts the INVITE transaction on a new
transport.  Unfortunately, session_inv_on_tsx_state_changed() also gets
the same PJSIP_EVENT_TRANSPORT_ERROR event and unconditionally terminates
the session.

* Made session_inv_on_tsx_state_changed() complete terminating the session
on PJSIP_EVENT_TRANSPORT_ERROR only if the session state is still
PJSIP_INV_STATE_DISCONNECTED.

ASTERISK-26305 #close
Reported by: Richard Mudgett

Change-Id: If736e766b5c55b970fa38ca6c8a885caf27b897d
This commit is contained in:
Richard Mudgett
2016-08-17 14:13:56 -05:00
parent 57f4e4428a
commit 0b4fa65532
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/res_pjsip_session.c
View File

@@ -2773,22 +2773,21 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
} }
break; break;
case PJSIP_EVENT_TRANSPORT_ERROR: case PJSIP_EVENT_TRANSPORT_ERROR:
/* if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
* Clear the module data now to block session_inv_on_state_changed() /*
* from calling session_end() if it hasn't already done so. * Clear the module data now to block session_inv_on_state_changed()
*/ * from calling session_end() if it hasn't already done so.
inv->mod_data[id] = NULL; */
inv->mod_data[id] = NULL;
if (inv->state != PJSIP_INV_STATE_DISCONNECTED) { /*
session_end(session); * Pass the session ref held by session->inv_session to
* session_end_completion().
*/
session_end_completion(session);
return;
} }
break;
/*
* Pass the session ref held by session->inv_session to
* session_end_completion().
*/
session_end_completion(session);
return;
case PJSIP_EVENT_TIMER: case PJSIP_EVENT_TIMER:
/* /*
* The timer event is run by the pjsip monitor thread and not * The timer event is run by the pjsip monitor thread and not
@@ -2808,7 +2807,8 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
* Pass the session ref held by session->inv_session to * Pass the session ref held by session->inv_session to
* session_end_completion(). * session_end_completion().
*/ */
if (ast_sip_push_task(session->serializer, session_end_completion, session)) { if (session
&& ast_sip_push_task(session->serializer, session_end_completion, session)) {
/* Do it anyway even though this is not the right thread. */ /* Do it anyway even though this is not the right thread. */
session_end_completion(session); session_end_completion(session);
} }