kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_macro: Consider '~~s~~' as a macro start extension.

Browse Source 
As described in issue ASTERISK-26282 the AEL parser creates macros with
extension '~~s~~'.  app_macro searches only for extension 's' so the
created extension cannot be found.  with this patch app_macro searches for
both extensions and performs the right extension.

ASTERISK-26282 #close

Change-Id: I939aa2a694148cc1054dd75ec0c47c47f47c90fb
This commit is contained in:
chrisderock
2016-08-17 09:51:17 +02:00
committed by Richard Mudgett
parent d2e03c252d
commit 93b7533d74
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/app_macro.c
View File

@@ -245,7 +245,7 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive
int setmacrocontext=0; int setmacrocontext=0;
int autoloopflag, inhangup = 0; int autoloopflag, inhangup = 0;
struct ast_str *tmp_subst = NULL; struct ast_str *tmp_subst = NULL;
const char *my_macro_exten = NULL;
char *save_macro_exten; char *save_macro_exten;
char *save_macro_context; char *save_macro_context;
char *save_macro_priority; char *save_macro_priority;
@@ -306,12 +306,32 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive
} }
snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro); snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro);
if (!ast_exists_extension(chan, fullmacro, "s", 1,
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { /* first search for the macro */
if (!ast_context_find(fullmacro)) if (!ast_context_find(fullmacro)) {
ast_log(LOG_WARNING, "No such context '%s' for macro '%s'. Was called by %s@%s\n", fullmacro, macro, ast_channel_exten(chan), ast_channel_context(chan)); ast_log(LOG_WARNING, "No such context '%s' for macro '%s'. Was called by %s@%s\n",
else fullmacro, macro, ast_channel_exten(chan), ast_channel_context(chan));
ast_log(LOG_WARNING, "Context '%s' for macro '%s' lacks 's' extension, priority 1\n", fullmacro, macro); return 0;
}
/* now search for the right extension */
if (ast_exists_extension(chan, fullmacro, "s", 1,
S_COR(ast_channel_caller(chan)->id.number.valid,
ast_channel_caller(chan)->id.number.str, NULL))) {
/* We have a normal macro */
my_macro_exten = "s";
} else if (ast_exists_extension(chan, fullmacro, "~~s~~", 1,
S_COR(ast_channel_caller(chan)->id.number.valid,
ast_channel_caller(chan)->id.number.str, NULL))) {
/* We have an AEL generated macro */
my_macro_exten = "~~s~~";
}
/* do we have a valid exten? */
if (!my_macro_exten) {
ast_log(LOG_WARNING,
"Context '%s' for macro '%s' lacks 's' extension, priority 1\n",
fullmacro, macro);
return 0; return 0;
} }
@@ -363,7 +383,7 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive
ast_set_flag(ast_channel_flags(chan), AST_FLAG_SUBROUTINE_EXEC); ast_set_flag(ast_channel_flags(chan), AST_FLAG_SUBROUTINE_EXEC);
/* Setup environment for new run */ /* Setup environment for new run */
ast_channel_exten_set(chan, "s"); ast_channel_exten_set(chan, my_macro_exten);
ast_channel_context_set(chan, fullmacro); ast_channel_context_set(chan, fullmacro);
ast_channel_priority_set(chan, 1); ast_channel_priority_set(chan, 1);