diff options
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 99da006a5..871cd979a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -643,7 +643,7 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c ast_cli(a->fd, " -------------\n"); ast_cli(a->fd, " Manager (AMI): %s\n", check_manager_enabled() ? "Enabled" : "Disabled"); ast_cli(a->fd, " Web Manager (AMI/HTTP): %s\n", check_webmanager_enabled() ? "Enabled" : "Disabled"); - ast_cli(a->fd, " Call data records: %s\n", check_cdr_enabled() ? "Enabled" : "Disabled"); + ast_cli(a->fd, " Call data records: %s\n", ast_cdr_is_enabled() ? "Enabled" : "Disabled"); ast_cli(a->fd, " Realtime Architecture (ARA): %s\n", ast_realtime_enabled() ? "Enabled" : "Disabled"); /*! \todo we could check musiconhold, voicemail, smdi, adsi, queues */ @@ -4318,50 +4318,50 @@ int main(int argc, char *argv[]) ast_http_init(); /* Start the HTTP server, if needed */ - if (ast_cdr_engine_init()) { + if (ast_indications_init()) { printf("%s", term_quit()); exit(1); } - if (ast_device_state_engine_init()) { + if (ast_features_init()) { printf("%s", term_quit()); exit(1); } - if (ast_presence_state_engine_init()) { + if (ast_bridging_init()) { printf("%s", term_quit()); exit(1); } - ast_dsp_init(); - ast_udptl_init(); - - if (ast_image_init()) { + if (ast_cdr_engine_init()) { printf("%s", term_quit()); exit(1); } - if (ast_file_init()) { + if (ast_device_state_engine_init()) { printf("%s", term_quit()); exit(1); } - if (load_pbx()) { + if (ast_presence_state_engine_init()) { printf("%s", term_quit()); exit(1); } - if (ast_indications_init()) { + ast_dsp_init(); + ast_udptl_init(); + + if (ast_image_init()) { printf("%s", term_quit()); exit(1); } - if (ast_features_init()) { + if (ast_file_init()) { printf("%s", term_quit()); exit(1); } - if (ast_bridging_init()) { + if (load_pbx()) { printf("%s", term_quit()); exit(1); } |