diff options
| author | Damien Wedhorn <voip@facts.com.au> | 2013-02-06 06:55:02 +0000 |
|---|---|---|
| committer | Damien Wedhorn <voip@facts.com.au> | 2013-02-06 06:55:02 +0000 |
| commit | 44872e797c1208876ba527136c144a3ce686a1b9 (patch) | |
| tree | 51c85ff72b6d76696c8d4afab5f40f90cb8edfb8 /channels | |
| parent | fe6fc6e3b0395819fe905851324823c1b52c1b6a (diff) | |
Reset skinny vmexten and immeddial char on reload.
Make skinny reset vmexten and immeddial to '\0' on reload to ensure that
it is set to '\0' if the appropriate item is removed/commented in
skinny.conf. Also small fix re immeddial char in skinny.conf and add
immedial setting to skinny show settings.
(closes issue ASTERISK-21037)
Reported by: snuffy
Tested by: snuffy, myself
Patches:
immed_dial_fix.diff uploaded by snuffy (license 5024)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_skinny.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6b7486e35..5e18859e9 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -202,7 +202,7 @@ static int keep_alive = 120; static int auth_timeout = DEFAULT_AUTH_TIMEOUT; static int auth_limit = DEFAULT_AUTH_LIMIT; static int unauth_sessions = 0; -static char immed_dialchar = '\0'; +static char immed_dialchar; static char vmexten[AST_MAX_EXTENSION]; /* Voicemail pilot number */ static char used_context[AST_MAX_EXTENSION]; /* placeholder to check if context are already used in regcontext */ static char regcontext[AST_MAX_CONTEXT]; /* Context for auto-extension */ @@ -4361,6 +4361,8 @@ static char *handle_skinny_show_line(struct ast_cli_entry *e, int cmd, struct as /*! \brief List global settings for the Skinny subsystem. */ static char *handle_skinny_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { + char immed_str[2] = {immed_dialchar, '\0'}; + switch (cmd) { case CLI_INIT: e->command = "skinny show settings"; @@ -4382,6 +4384,7 @@ static char *handle_skinny_show_settings(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, " Date Format: %s\n", date_format); ast_cli(a->fd, " Voice Mail Extension: %s\n", S_OR(vmexten, "(not set)")); ast_cli(a->fd, " Reg. context: %s\n", S_OR(regcontext, "(not set)")); + ast_cli(a->fd, " Immed. Dial Key: %s\n", S_OR(immed_str, "(not set)")); ast_cli(a->fd, " Jitterbuffer enabled: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_ENABLED))); if (ast_test_flag(&global_jbconf, AST_JB_ENABLED)) { ast_cli(a->fd, " Jitterbuffer forced: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_FORCED))); @@ -7999,8 +8002,12 @@ static int config_load(void) ast_log(LOG_NOTICE, "Unable to load config %s, Skinny disabled.\n", config); return -1; } + memset(&bindaddr, 0, sizeof(bindaddr)); memset(&default_prefs, 0, sizeof(default_prefs)); + immed_dialchar = '\0'; + memset(&vmexten, '\0', sizeof(vmexten)); + /* Copy the default jb config over global_jbconf */ memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); |