handle going to 'fax' extension when inside a macro properly (bug #4368)
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 6 Jun 2005 03:18:51 +0000 (03:18 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 6 Jun 2005 03:18:51 +0000 (03:18 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5856 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_modem_i4l.c
channels/chan_vpb.c
channels/chan_zap.c

index 130ecdb..65a2822 100755 (executable)
@@ -458,13 +458,15 @@ static struct ast_frame *i4l_read(struct ast_modem_pvt *p)
                                        if (!p->faxhandled) {
                                                p->faxhandled++;
                                                if (strcmp(ast->exten, "fax")) {
-                                                       if (ast_exists_extension(ast, ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext, "fax", 1, ast->cid.cid_num)) {
+                                                       const char *target_context = ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext;
+                                                       
+                                                       if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
                                                                if (option_verbose > 2)
                                                                        ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->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, ast->context, "fax", 1))
-                                                                       ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, ast->context);
+                                                               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);
                                                        } else
                                                                ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
                                                } else
index 18fdb19..ea66322 100755 (executable)
@@ -881,13 +881,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")) {
-                                               if (ast_exists_extension(p->owner, ast_strlen_zero(p->owner->macrocontext) ? p->owner->context : p->owner->macrocontext, "fax", 1, p->owner->cid.cid_num)) {
+                                               const char *target_context = ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext;
+                                               
+                                               if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
                                                        if (option_verbose > 2)
-                                                               ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", p->owner->name);
+                                                               ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name);
                                                        /* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
-                                                       pbx_builtin_setvar_helper(p->owner,"FAXEXTEN",p->owner->exten);
-                                                       if (ast_async_goto(p->owner, p->owner->context, "fax", 1))
-                                                               ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", p->owner->name, p->owner->context);
+                                                       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);
                                                } else
                                                        ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
                                        } else
index db6310d..14b257c 100755 (executable)
@@ -4360,13 +4360,15 @@ struct ast_frame  *zt_read(struct ast_channel *ast)
                        if (!p->faxhandled) {
                                p->faxhandled++;
                                if (strcmp(ast->exten, "fax")) {
-                                       if (ast_exists_extension(ast, ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext, "fax", 1, ast->cid.cid_num)) {
+                                       const char *target_context = ast_strlen_zero(ast->macrocontext) ? ast->context : ast->macrocontext;
+
+                                       if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
                                                if (option_verbose > 2)
                                                        ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->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, ast->context, "fax", 1))
-                                                       ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, ast->context);
+                                               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);
                                        } else
                                                ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
                                } else