Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "res_pjsip_t38.c: Fix deadlock in T.38 framehook."

Browse Source
pull/7/head
Jenkins2 9 years ago committed by Gerrit Code Review
parent d1944c1892 52e4f02b1a
commit dc948163ca
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File

30
res/res_pjsip_t38.c
Unescape View File

@ -398,7 +398,8 @@ static int t38_interpret_parameters(void *obj)
} }
/*! \brief Frame hook callback for writing */ /*! \brief Frame hook callback for writing */
static struct ast_frame *t38_framehook_write(struct ast_sip_session *session, struct ast_frame *f) static struct ast_frame *t38_framehook_write(struct ast_channel *chan,
struct ast_sip_session *session, struct ast_frame *f)
{ {
if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_T38_PARAMETERS && if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_T38_PARAMETERS &&
session->endpoint->media.t38.enabled) { session->endpoint->media.t38.enabled) {
@ -412,27 +413,36 @@ static struct ast_frame *t38_framehook_write(struct ast_sip_session *session, st
ao2_ref(data, -1); ao2_ref(data, -1);
} }
} else if (f->frametype == AST_FRAME_MODEM) { } else if (f->frametype == AST_FRAME_MODEM) {
RAII_VAR(struct ast_sip_session_media *, session_media, NULL, ao2_cleanup); struct ast_sip_session_media *session_media;
if ((session_media = ao2_find(session->media, "image", OBJ_KEY)) && /* Avoid deadlock between chan and the session->media container lock */
session_media->udptl) { ast_channel_unlock(chan);
session_media = ao2_find(session->media, "image", OBJ_SEARCH_KEY);
ast_channel_lock(chan);
if (session_media && session_media->udptl) {
ast_udptl_write(session_media->udptl, f); ast_udptl_write(session_media->udptl, f);
} }
ao2_cleanup(session_media);
} }
return f; return f;
} }
/*! \brief Frame hook callback for reading */ /*! \brief Frame hook callback for reading */
static struct ast_frame *t38_framehook_read(struct ast_sip_session *session, struct ast_frame *f) static struct ast_frame *t38_framehook_read(struct ast_channel *chan,
struct ast_sip_session *session, struct ast_frame *f)
{ {
if (ast_channel_fdno(session->channel) == 5) { if (ast_channel_fdno(session->channel) == 5) {
RAII_VAR(struct ast_sip_session_media *, session_media, NULL, ao2_cleanup); struct ast_sip_session_media *session_media;
if ((session_media = ao2_find(session->media, "image", OBJ_KEY)) && /* Avoid deadlock between chan and the session->media container lock */
session_media->udptl) { ast_channel_unlock(chan);
session_media = ao2_find(session->media, "image", OBJ_SEARCH_KEY);
ast_channel_lock(chan);
if (session_media && session_media->udptl) {
f = ast_udptl_read(session_media->udptl); f = ast_udptl_read(session_media->udptl);
} }
ao2_cleanup(session_media);
} }
return f; return f;
@ -445,9 +455,9 @@ static struct ast_frame *t38_framehook(struct ast_channel *chan, struct ast_fram
struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan); struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan);
if (event == AST_FRAMEHOOK_EVENT_READ) { if (event == AST_FRAMEHOOK_EVENT_READ) {
f = t38_framehook_read(channel->session, f); f = t38_framehook_read(chan, channel->session, f);
} else if (event == AST_FRAMEHOOK_EVENT_WRITE) { } else if (event == AST_FRAMEHOOK_EVENT_WRITE) {
f = t38_framehook_write(channel->session, f); f = t38_framehook_write(chan, channel->session, f);
} }
return f; return f;

Write Preview
Loading…
Cancel
Save