dect
/
asterisk
Archived
13
0
Fork 0

/ fixed bugs introduced by the fix for bug #4368 by kpfleming

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5881 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
bkramer 2005-06-08 00:10:09 +00:00
parent ea0c7ad984
commit ec67bfa81e
1 changed files with 6 additions and 6 deletions

View File

@ -885,15 +885,15 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
else if (e->data == VPB_FAX){
if (!p->faxhandled){
if (strcmp(p->owner->exten, "fax")) {
const char *target_context = ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext;
const char *target_context = ast_strlen_zero(p->owner->macrocontext) ? p->owner->context : p->owner->macrocontext;
if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
if (ast_exists_extension(p->owner, target_context, "fax", 1, p->owner->cid.cid_num)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name);
ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", p->owner->name);
/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
if (ast_async_goto(ast, target_context, "fax", 1))
ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context);
pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", p->owner->exten);
if (ast_async_goto(p->owner, target_context, "fax", 1))
ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", p->owner->name, target_context);
} else
ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
} else