From 56de48107fd68d234821d996c1893eba21ac2996 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 7 Jan 2015 16:56:59 +0000 Subject: config: Add option to NOT preserve effective context when changing a template Let's say you have a template T with variable VAR1 = ON and you have a context C(T) that doesn't specify VAR1. If you read C, the effective value of VAR1 is ON. Now you change T VAR1 to OFF and call ast_config_text_file_save. The current behavior is that the file gets re-written with T/VAR1=OFF but C/VAR1=ON is added. Personally, I think this is a bug. It's preserving the effective state of C even though I didn't specify C/VAR1 in th first place. I believe the behavior should be that if I didn't specify C/VAR1 originally, then the effective value of C/VAR1 should continue to follow the inherited state. Now, if I DID explicitly specify C/VAR1, the it should be preserved even if the template changes. Even though I think the existing behavior is a bug, it's been that way forever so I'm not changing it. Instead, I've created ast_config_text_file_save2() that takes a bitmask of flags, one of which is to preserve the effective context (the current behavior). The original ast_config_text_file_save calls *2 with the preserve flag. If you want the new behavior, call *2 directly without a flag. I've also updated Manager UpdateConfig with a new parameter 'PreserveEffectiveContext' whose default is 'yes'. If you want the new behavior with UpdateConfig, set 'PreserveEffectiveContext: no'. Tested-by: George Joseph Review: https://reviewboard.asterisk.org/r/4297/ ........ Merged revisions 430295 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430296 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'main/manager.c') diff --git a/main/manager.c b/main/manager.c index 05ef9a4d2..d599a4bde 100644 --- a/main/manager.c +++ b/main/manager.c @@ -420,6 +420,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") Whether or not a reload should take place (or name of specific module). + + Whether the effective category contents should be preserved on template change. Default is true (pre 13.2 behavior). + Action to take. 0's represent 6 digit number beginning with 000000. @@ -3775,6 +3778,8 @@ static int action_updateconfig(struct mansession *s, const struct message *m) const char *dfn = astman_get_header(m, "DstFilename"); int res; const char *rld = astman_get_header(m, "Reload"); + int preserve_effective_context = CONFIG_SAVE_FLAG_PRESERVE_EFFECTIVE_CONTEXT; + const char *preserve_effective_context_string = astman_get_header(m, "PreserveEffectiveContext"); struct ast_flags config_flags = { CONFIG_FLAG_WITHCOMMENTS | CONFIG_FLAG_NOCACHE }; enum error_type result; @@ -3792,7 +3797,10 @@ static int action_updateconfig(struct mansession *s, const struct message *m) result = handle_updates(s, m, cfg, dfn); if (!result) { ast_include_rename(cfg, sfn, dfn); /* change the include references from dfn to sfn, so things match up */ - res = ast_config_text_file_save(dfn, cfg, "Manager"); + if (!ast_strlen_zero(preserve_effective_context_string) && !ast_true(preserve_effective_context_string)) { + preserve_effective_context = CONFIG_SAVE_FLAG_NONE; + } + res = ast_config_text_file_save2(dfn, cfg, "Manager", preserve_effective_context); ast_config_destroy(cfg); if (res) { astman_send_error(s, m, "Save of config failed"); -- cgit v1.2.3