diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-04-11 15:10:34 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-04-11 15:10:34 +0000 |
| commit | 4cf7d0bf011069fce2e304d76d59771d89e1401e (patch) | |
| tree | 94fa09723b492b0e1bb75f4f056dd49b5ec0d9cc /res/res_pjsip_t38.c | |
| parent | 13cd99682d5eb8511f72cad9a4995faa2ac77048 (diff) | |
res/res_pjsip_t38: Add missing initialization of t38faxmaxdatagram
Prior to this patch, the far_max_datagram value on the UDPTL structure would
remain -1 if the remote endpoint fails to provide the SDP media attribute
T38FaxMaxDatagram. This can result in the INVITE request being rejected. With
this patch, we will now properly initialize the value with either the default
value or with the value provided by pjsip.conf's t38_udptl_maxdatagram
parameter.
Review: https://reviewboard.asterisk.org/r/4589
ASTERISK-24928 #close
Reported by: Juergen Spies
Tested by: Juergen Spies
patches:
pjsipT38patch20150331.txt submitted by Juergen Spies (License 6698)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_t38.c')
| -rw-r--r-- | res/res_pjsip_t38.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c index c5cebc6c4..ac31086a6 100644 --- a/res/res_pjsip_t38.c +++ b/res/res_pjsip_t38.c @@ -259,6 +259,7 @@ static int t38_initialize_session(struct ast_sip_session *session, struct ast_si ast_channel_set_fd(session->channel, 5, ast_udptl_fd(session_media->udptl)); ast_udptl_set_error_correction_scheme(session_media->udptl, session->endpoint->media.t38.error_correction); ast_udptl_setnat(session_media->udptl, session->endpoint->media.t38.nat); + ast_udptl_set_far_max_datagram(session_media->udptl, session->endpoint->media.t38.maxdatagram); return 0; } @@ -580,9 +581,7 @@ static void t38_interpret_sdp(struct t38_state *state, struct ast_sip_session *s } else if (!pj_stricmp2(&attr->name, "t38faxversion")) { state->their_parms.version = pj_strtoul(&attr->value); } else if (!pj_stricmp2(&attr->name, "t38faxmaxdatagram") || !pj_stricmp2(&attr->name, "t38maxdatagram")) { - if (session->endpoint->media.t38.maxdatagram) { - ast_udptl_set_far_max_datagram(session_media->udptl, session->endpoint->media.t38.maxdatagram); - } else { + if (!session->endpoint->media.t38.maxdatagram) { ast_udptl_set_far_max_datagram(session_media->udptl, pj_strtoul(&attr->value)); } } else if (!pj_stricmp2(&attr->name, "t38faxfillbitremoval")) { |