summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-07-08 15:21:35 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-07-08 15:21:35 -0500
commite0f27ecabb2ff766ea4ec7bdd77fccab2fe826c4 (patch)
treef454543a42b19d1a98d420224e173b47bc3979f3 /res
parent99cbecd2704a36e59ecf357b9500e02801dc50a3 (diff)
parent302be4809aefc850f9b2335e074e5c88c4655fb6 (diff)
Merge "chan_sip/res_pjsip_t38: Handle a request to negotiate T.38 after it is enabled."
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip_t38.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index c02517104..76720acee 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -361,7 +361,9 @@ static int t38_interpret_parameters(void *obj)
ast_udptl_set_local_max_ifp(session_media->udptl, state->our_parms.max_ifp);
t38_change_state(data->session, session_media, state, T38_ENABLED);
ast_sip_session_resume_reinvite(data->session);
- } else if (data->session->t38state != T38_ENABLED) {
+ } else if ((data->session->t38state != T38_ENABLED) ||
+ ((data->session->t38state == T38_ENABLED) &&
+ (parameters->request_response == AST_T38_REQUEST_NEGOTIATE))) {
if (t38_initialize_session(data->session, session_media)) {
break;
}