From aad782c474c4077cc15796022f2c2cea992b2c53 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Fri, 10 Jun 2011 19:20:41 +0000 Subject: [PATCH] Unlock the sip channel during fax detection like chan_dahdi does to prevent a deadlock with ast_autoservice_stop. (closes issue ASTERISK-17798) tested by mnicholson git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@323040 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b673fb091d..87500746fe 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7208,12 +7208,19 @@ static struct ast_frame *sip_read(struct ast_channel *ast) /* If we detect a CNG tone and fax detection is enabled then send us off to the fax extension */ if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) { - ast_channel_lock(ast); if (strcmp(ast->exten, "fax")) { const char *target_context = S_OR(ast->macrocontext, ast->context); + /* We need to unlock 'ast' here because + * ast_exists_extension has the potential to start and + * stop an autoservice on the channel. Such action is + * prone to deadlock if the channel is locked. + */ + sip_pvt_unlock(p); ast_channel_unlock(ast); if (ast_exists_extension(ast, target_context, "fax", 1, S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, NULL))) { + ast_channel_lock(ast); + sip_pvt_lock(p); ast_verbose(VERBOSE_PREFIX_2 "Redirecting '%s' to fax extension due to CNG detection\n", ast->name); pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten); if (ast_async_goto(ast, target_context, "fax", 1)) { @@ -7221,10 +7228,10 @@ static struct ast_frame *sip_read(struct ast_channel *ast) } fr = &ast_null_frame; } else { + ast_channel_lock(ast); + sip_pvt_lock(p); ast_log(LOG_NOTICE, "FAX CNG detected but no fax extension\n"); } - } else { - ast_channel_unlock(ast); } } -- 2.47.2