sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "core: Fix configuration of remote console socket path."

This commit is contained in:
Joshua Colp 2017-11-14 10:31:40 -06:00 committed by Gerrit Code Review
parent 69d12bcf3e cdaaa14a5f
commit a6d2926e5d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/asterisk.c
View File

@ -3650,7 +3650,6 @@ static void ast_readconfig(void)
ast_copy_string(cfg_paths.agi_dir, v->value, sizeof(cfg_paths.agi_dir));
} else if (!strcasecmp(v->name, "astrundir")) {
snprintf(cfg_paths.pid_path, sizeof(cfg_paths.pid_path), "%s/%s", v->value, "asterisk.pid");
snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s", v->value, ast_config_AST_CTL);
ast_copy_string(cfg_paths.run_dir, v->value, sizeof(cfg_paths.run_dir));
} else if (!strcasecmp(v->name, "astmoddir")) {
ast_copy_string(cfg_paths.module_dir, v->value, sizeof(cfg_paths.module_dir));
@ -3659,6 +3658,10 @@ static void ast_readconfig(void)
}
}
/* Combine astrundir and astctl settings. */
snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s",
ast_config_AST_RUN_DIR, ast_config_AST_CTL);
for (v = ast_variable_browse(cfg, "options"); v; v = v->next) {
/* verbose level (-v at startup) */
if (!strcasecmp(v->name, "verbose")) {