handle going to 'fax' extension when inside a macro properly (bug #4368)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5856 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 5 deletions

diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 18fdb19f9..ea663228b 100755
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -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