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

Merged revisions 323040 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323040 | mnicholson | 2011-06-10 14:20:41 -0500 (Fri, 10 Jun 2011) | 5 lines
  
  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/trunk@323041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-06-10 19:22:48 +00:00
parent 58ca560291
commit 4c459c2c85
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_sip.c
View File

@@ -7275,12 +7275,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 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)) { if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) {
ast_channel_lock(ast);
if (strcmp(ast->exten, "fax")) { if (strcmp(ast->exten, "fax")) {
const char *target_context = S_OR(ast->macrocontext, ast->context); 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); ast_channel_unlock(ast);
if (ast_exists_extension(ast, target_context, "fax", 1, if (ast_exists_extension(ast, target_context, "fax", 1,
S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, NULL))) { 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); 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); pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
if (ast_async_goto(ast, target_context, "fax", 1)) { if (ast_async_goto(ast, target_context, "fax", 1)) {
@@ -7288,10 +7295,10 @@ static struct ast_frame *sip_read(struct ast_channel *ast)
} }
fr = &ast_null_frame; fr = &ast_null_frame;
} else { } else {
ast_channel_lock(ast);
sip_pvt_lock(p);
ast_log(LOG_NOTICE, "FAX CNG detected but no fax extension\n"); ast_log(LOG_NOTICE, "FAX CNG detected but no fax extension\n");
} }
} else {
ast_channel_unlock(ast);
} }
} }