From ef2f8a66dcaf53f69aafba6c5660c9ca16ec3656 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 5 Oct 2017 18:12:04 -0500 Subject: cdr.c: Defer misc checks. Try to defer some checks until needed in case there is an early exit. Change-Id: Ibc6b34c38a4f60ad4f9b67984b7d070a07257064 --- main/cdr.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/main/cdr.c b/main/cdr.c index ddbed5fd0..06cadcd8b 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1938,6 +1938,10 @@ static void handle_dial_message(void *data, struct stasis_subscription *sub, str if (!peer && !caller) { return; } + if (filter_channel_snapshot(peer) || (caller && filter_channel_snapshot(caller))) { + return; + } + dial_status_blob = ast_json_object_get(ast_multi_channel_blob_get_json(payload), "dialstatus"); if (dial_status_blob) { dial_status = ast_json_string_get(dial_status_blob); @@ -1950,10 +1954,6 @@ static void handle_dial_message(void *data, struct stasis_subscription *sub, str (unsigned int)stasis_message_timestamp(message)->tv_sec, (unsigned int)stasis_message_timestamp(message)->tv_usec); - if (filter_channel_snapshot(peer) || (caller && filter_channel_snapshot(caller))) { - return; - } - /* Figure out who is running this show */ if (caller) { cdr = ao2_find(active_cdrs_by_channel, caller->uniqueid, OBJ_SEARCH_KEY); @@ -2083,8 +2083,6 @@ static void handle_channel_cache_message(void *data, struct stasis_subscription struct stasis_cache_update *update = stasis_message_data(message); struct ast_channel_snapshot *old_snapshot; struct ast_channel_snapshot *new_snapshot; - const char *uniqueid; - const char *name; struct cdr_object *it_cdr; ast_assert(update != NULL); @@ -2092,8 +2090,6 @@ static void handle_channel_cache_message(void *data, struct stasis_subscription old_snapshot = stasis_message_data(update->old_snapshot); new_snapshot = stasis_message_data(update->new_snapshot); - uniqueid = new_snapshot ? new_snapshot->uniqueid : old_snapshot->uniqueid; - name = new_snapshot ? new_snapshot->name : old_snapshot->name; if (filter_channel_cache_message(old_snapshot, new_snapshot)) { return; @@ -2107,11 +2103,17 @@ static void handle_channel_cache_message(void *data, struct stasis_subscription cdr->is_root = 1; ao2_link(active_cdrs_by_channel, cdr); } else { + const char *uniqueid; + + uniqueid = new_snapshot ? new_snapshot->uniqueid : old_snapshot->uniqueid; cdr = ao2_find(active_cdrs_by_channel, uniqueid, OBJ_SEARCH_KEY); } /* Handle Party A */ if (!cdr) { + const char *name; + + name = new_snapshot ? new_snapshot->name : old_snapshot->name; ast_log(AST_LOG_WARNING, "No CDR for channel %s\n", name); ast_assert(0); } else { @@ -4321,7 +4323,7 @@ int ast_cdr_engine_reload(void) RAII_VAR(struct module_config *, old_mod_cfg, ao2_global_obj_ref(module_configs), ao2_cleanup); RAII_VAR(struct module_config *, mod_cfg, NULL, ao2_cleanup); - if (process_config(1)) { + if (!old_mod_cfg || process_config(1)) { return -1; } -- cgit v1.2.3