kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

func_evalexten: Extension evaluation function.

Browse Source 
This adds the EVAL_EXTEN function, which may be used to retrieve
the variable-substituted data at any extension.

ASTERISK-29486

Change-Id: Iad81019689674c9f4ac77d235f5d7234adbb1432
This commit is contained in:
Naveen Albert
2021-06-21 08:49:16 -04:00
committed by Friendly Automation
parent ce7846e658
commit 6ddb0ec939
5 changed files with 219 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
main/pbx.c
View File

@@ -8826,6 +8826,47 @@ int ast_async_goto_if_exists(struct ast_channel *chan, const char * context, con
return __ast_goto_if_exists(chan, context, exten, priority, 1);
}
int pbx_parse_location(struct ast_channel *chan, char **contextp, char **extenp, char **prip, int *ipri, int *mode, char *rest)
{
char *context, *exten, *pri;
/* do the strsep before here, so we don't have to alloc and free */
if (!*extenp) {
/* Only a priority in this one */
*prip = *contextp;
*extenp = NULL;
*contextp = NULL;
} else if (!*prip) {
/* Only an extension and priority in this one */
*prip = *extenp;
*extenp = *contextp;
*contextp = NULL;
}
context = *contextp;
exten = *extenp;
pri = *prip;
if (mode) {
if (*pri == '+') {
*mode = 1;
pri++;
} else if (*pri == '-') {
*mode = -1;
pri++;
}
}
if ((rest && sscanf(pri, "%30d%1s", ipri, rest) != 1) || sscanf(pri, "%30d", ipri) != 1) {
*ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
exten ? exten : ast_channel_exten(chan), pri,
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));
if (*ipri < 1) {
ast_log(LOG_WARNING, "Priority '%s' must be a number > 0, or valid label\n", pri);
return -1;
} else if (mode) {
*mode = 0;
}
}
return 0;
}
static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string, int async)
{
char *exten, *pri, *context;
@@ -8842,31 +8883,9 @@ static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string,
context = strsep(&stringp, ","); /* guaranteed non-null */
exten = strsep(&stringp, ",");
pri = strsep(&stringp, ",");
if (!exten) { /* Only a priority in this one */
pri = context;
exten = NULL;
context = NULL;
} else if (!pri) { /* Only an extension and priority in this one */
pri = exten;
exten = context;
context = NULL;
}
if (*pri == '+') {
mode = 1;
pri++;
} else if (*pri == '-') {
mode = -1;
pri++;
}
if (sscanf(pri, "%30d%1s", &ipri, rest) != 1) {
ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
exten ? exten : ast_channel_exten(chan), pri,
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));
if (ipri < 1) {
ast_log(LOG_WARNING, "Priority '%s' must be a number > 0, or valid label\n", pri);
return -1;
} else
mode = 0;
if (pbx_parse_location(chan, &context, &exten, &pri, &ipri, &mode, rest)) {
return -1;
}
/* At this point we have a priority and maybe an extension and a context */

7
main/pbx_variables.c
View File

@@ -736,7 +736,7 @@ void pbx_substitute_variables_helper_full_location(struct ast_channel *c, struct
/* Substitute if necessary */
if (needsub) {
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL);
pbx_substitute_variables_helper_full_location(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL, context, exten, pri);
vars = ltmp;
} else {
vars = var;
@@ -770,10 +770,13 @@ void pbx_substitute_variables_helper_full_location(struct ast_channel *c, struct
/* For dialplan location, if we were told what to substitute explicitly, use that instead */
if (exten && !strcmp(vars, "EXTEN")) {
ast_copy_string(workspace, exten, VAR_BUF_SIZE);
cp4 = workspace;
} else if (context && !strcmp(vars, "CONTEXT")) {
ast_copy_string(workspace, context, VAR_BUF_SIZE);
cp4 = workspace;
} else if (pri && !strcmp(vars, "PRIORITY")) {
snprintf(workspace, VAR_BUF_SIZE, "%d", pri);
cp4 = workspace;
} else {
pbx_retrieve_variable(c, vars, &cp4, workspace, VAR_BUF_SIZE, headp);
}
@@ -829,7 +832,7 @@ void pbx_substitute_variables_helper_full_location(struct ast_channel *c, struct
/* Substitute if necessary */
if (needsub) {
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL);
pbx_substitute_variables_helper_full_location(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL, context, exten, pri);
vars = ltmp;
} else {
vars = var;