summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-07-14 16:55:46 -0500
committerRichard Mudgett <rmudgett@digium.com>2015-07-17 10:40:17 -0500
commit875aee4c09a1780ac57b38fbb74a7bec2503fba0 (patch)
tree0e09d9a49777314e7766679acbc04ddf37414d16
parent9d7f689b4bad0a144c6638046d1af06d95ea5b65 (diff)
pbx.c: Post AMI VarSet event if delete a non-empty dialplan variable.
ASTERISK-25256 #close Reported by: Richard Mudgett Change-Id: I0b6be720b66fa956f6a798cd22ef8934eb0c0ff3
-rw-r--r--main/pbx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 8f5ee646c..f23dff7d2 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -11591,6 +11591,8 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
struct ast_var_t *newvariable;
struct varshead *headp;
const char *nametail = name;
+ /*! True if the old value was not an empty string. */
+ int old_value_existed = 0;
if (name[strlen(name) - 1] == ')') {
char *function = ast_strdupa(name);
@@ -11617,6 +11619,7 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
if (strcmp(ast_var_name(newvariable), nametail) == 0) {
/* there is already such a variable, delete it */
AST_LIST_REMOVE_CURRENT(entries);
+ old_value_existed = !ast_strlen_zero(ast_var_value(newvariable));
ast_var_delete(newvariable);
break;
}
@@ -11629,6 +11632,9 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
}
AST_LIST_INSERT_HEAD(headp, newvariable, entries);
ast_channel_publish_varset(chan, name, value);
+ } else if (old_value_existed) {
+ /* We just deleted a non-empty dialplan variable. */
+ ast_channel_publish_varset(chan, name, "");
}
if (chan)