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

Merge "res_pjsip_t38.c: Fix crash by ignoring 1xx messages."

Browse Source
This commit is contained in:
Jenkins2
2018-07-05 10:53:47 -05:00
committed by Gerrit Code Review
parent eb9c031120 1aa45ffdfa
commit 57231c1265
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip_t38.c
View File

@@ -251,8 +251,6 @@ static struct t38_state *t38_state_get_or_alloc(struct ast_sip_session *session)
/* This will get bumped up before scheduling */ /* This will get bumped up before scheduling */
pj_timer_entry_init(&state->timer, 0, session, t38_automatic_reject_timer_cb); pj_timer_entry_init(&state->timer, 0, session, t38_automatic_reject_timer_cb);
datastore->data = state;
return state; return state;
} }
@@ -297,18 +295,21 @@ static int t38_reinvite_response_cb(struct ast_sip_session *session, pjsip_rx_da
struct t38_state *state; struct t38_state *state;
struct ast_sip_session_media *session_media = NULL; struct ast_sip_session_media *session_media = NULL;
if (status.code == 100) { if (status.code / 100 <= 1) {
/* Ignore any non-final responses (1xx) */
return 0; return 0;
} }
state = t38_state_get_or_alloc(session); state = t38_state_get_or_alloc(session);
if (!session->channel || !state) { if (!session->channel || !state) {
ast_log(LOG_WARNING, "Received response to T.38 re-invite on '%s' but state unavailable\n", ast_log(LOG_WARNING, "Received %d response to T.38 re-invite on '%s' but state unavailable\n",
status.code,
session->channel ? ast_channel_name(session->channel) : "unknown channel"); session->channel ? ast_channel_name(session->channel) : "unknown channel");
return 0; return 0;
} }
if (status.code == 200) { if (status.code / 100 == 2) {
/* Accept any 2xx response as successfully negotiated */
int index; int index;
session_media = session->active_media_state->default_session[AST_MEDIA_TYPE_IMAGE]; session_media = session->active_media_state->default_session[AST_MEDIA_TYPE_IMAGE];