diff options
| -rw-r--r-- | asterisk.c | 3 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/asterisk.c b/asterisk.c index 4a0e77885..42feb9f0f 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1909,7 +1909,8 @@ static void ast_readconfig(void) { snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); - snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb"); + snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); + snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astlogdir")) { ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); } else if (!strcasecmp(v->name, "astagidir")) { diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 48e287abd..ec2dec5da 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1958,7 +1958,7 @@ static int iax2_show_peer(int fd, int argc, char *argv[]) ast_cli(fd, " Status : "); peer_status(peer, status, sizeof(status)); ast_cli(fd, "%s\n",status); - ast_cli(fd, " Qualify : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off"); + ast_cli(fd, " Qualify : every %dms when OK, every %dms when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, peer->smoothing ? "On" : "Off"); ast_cli(fd,"\n"); if (ast_test_flag(peer, IAX_TEMPONLY)) destroy_peer(peer); |