pbx.c: Post AMI VarSet event if delete a non-empty dialplan variable.

ASTERISK-25256 #close
Reported by: Richard Mudgett

Change-Id: I0b6be720b66fa956f6a798cd22ef8934eb0c0ff3
This commit is contained in:
Richard Mudgett
2015-07-14 16:55:46 -05:00
parent 9d7f689b4b
commit 875aee4c09

View File

@@ -11591,6 +11591,8 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
struct ast_var_t *newvariable; struct ast_var_t *newvariable;
struct varshead *headp; struct varshead *headp;
const char *nametail = name; const char *nametail = name;
/*! True if the old value was not an empty string. */
int old_value_existed = 0;
if (name[strlen(name) - 1] == ')') { if (name[strlen(name) - 1] == ')') {
char *function = ast_strdupa(name); 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) { if (strcmp(ast_var_name(newvariable), nametail) == 0) {
/* there is already such a variable, delete it */ /* there is already such a variable, delete it */
AST_LIST_REMOVE_CURRENT(entries); AST_LIST_REMOVE_CURRENT(entries);
old_value_existed = !ast_strlen_zero(ast_var_value(newvariable));
ast_var_delete(newvariable); ast_var_delete(newvariable);
break; 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_LIST_INSERT_HEAD(headp, newvariable, entries);
ast_channel_publish_varset(chan, name, value); 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) if (chan)