kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 12:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins2
2017-11-14 10:19:21 -06:00
committed by Gerrit Code Review
parent d7303f6337 9c6d4ec022
commit d74b50ecf7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/asterisk.c
View File

@@ -3773,7 +3773,6 @@ static void ast_readconfig(void)
ast_copy_string(cfg_paths.agi_dir, v->value, sizeof(cfg_paths.agi_dir)); ast_copy_string(cfg_paths.agi_dir, v->value, sizeof(cfg_paths.agi_dir));
} else if (!strcasecmp(v->name, "astrundir")) { } 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.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)); ast_copy_string(cfg_paths.run_dir, v->value, sizeof(cfg_paths.run_dir));
} else if (!strcasecmp(v->name, "astmoddir")) { } else if (!strcasecmp(v->name, "astmoddir")) {
ast_copy_string(cfg_paths.module_dir, v->value, sizeof(cfg_paths.module_dir)); ast_copy_string(cfg_paths.module_dir, v->value, sizeof(cfg_paths.module_dir));
@@ -3782,6 +3781,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) { for (v = ast_variable_browse(cfg, "options"); v; v = v->next) {
/* verbose level (-v at startup) */ /* verbose level (-v at startup) */
if (!strcasecmp(v->name, "verbose")) { if (!strcasecmp(v->name, "verbose")) {