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

Merge "res_pjsip_t38: Don't crash on authenticated reinvite after originated T.38 FAX." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-04-24 09:24:47 -05:00
committed by Gerrit Code Review
parent b3cd5bc77f eabf3b5a3c
commit bf3d9db4a6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_pjsip_t38.c
View File

@@ -470,6 +470,11 @@ static void t38_attach_framehook(struct ast_sip_session *session)
.chan_breakdown_cb = t38_masq, .chan_breakdown_cb = t38_masq,
}; };
/* If the channel's already gone, bail */
if (!session->channel) {
return;
}
/* Only attach the framehook if t38 is enabled for the endpoint */ /* Only attach the framehook if t38 is enabled for the endpoint */
if (!session->endpoint->media.t38.enabled) { if (!session->endpoint->media.t38.enabled) {
return; return;
@@ -504,14 +509,14 @@ static void t38_attach_framehook(struct ast_sip_session *session)
ast_channel_unlock(session->channel); ast_channel_unlock(session->channel);
} }
/*! \brief Function called when an INVITE goes out */ /*! \brief Function called when an INVITE arrives */
static int t38_incoming_invite_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata) static int t38_incoming_invite_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
{ {
t38_attach_framehook(session); t38_attach_framehook(session);
return 0; return 0;
} }
/*! \brief Function called when an INVITE comes in */ /*! \brief Function called when an INVITE is sent */
static void t38_outgoing_invite_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata) static void t38_outgoing_invite_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
{ {
t38_attach_framehook(session); t38_attach_framehook(session);