diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-13 17:00:09 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-13 17:00:10 -0500 |
commit | bf21ba9c2d1f2393c81cf66ae8f493db1c6f408b (patch) | |
tree | 7d1fff23fbdf1a9cf2b718c56bd51ddf7c4b6320 | |
parent | d0cd6cb1a7161d1c36922aad13873956ce253e95 (diff) | |
parent | 92c5cf3920267ec3c1b7016908d1c824d5c27744 (diff) |
Merge "cdr.c: Set stringfields only if they are different." into 13
-rw-r--r-- | main/cdr.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/main/cdr.c b/main/cdr.c index c2f981c1a..1481ae7c6 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1378,8 +1378,12 @@ static int base_process_party_a(struct cdr_object *cdr, struct ast_channel_snaps */ if (!ast_test_flag(&snapshot->flags, AST_FLAG_SUBROUTINE_EXEC) || ast_test_flag(&snapshot->softhangup_flags, AST_SOFTHANGUP_HANGUP_EXEC)) { - ast_string_field_set(cdr, context, snapshot->context); - ast_string_field_set(cdr, exten, snapshot->exten); + if (strcmp(cdr->context, snapshot->context)) { + ast_string_field_set(cdr, context, snapshot->context); + } + if (strcmp(cdr->exten, snapshot->exten)) { + ast_string_field_set(cdr, exten, snapshot->exten); + } } cdr_object_swap_snapshot(&cdr->party_a, snapshot); @@ -1389,11 +1393,15 @@ static int base_process_party_a(struct cdr_object *cdr, struct ast_channel_snaps * of "AppDialX". Prevent that, and any other application changes we might not want * here. */ - if (!ast_strlen_zero(snapshot->appl) - && (strncasecmp(snapshot->appl, "appdial", 7) || ast_strlen_zero(cdr->appl)) - && !ast_test_flag(&cdr->flags, AST_CDR_LOCK_APP)) { - ast_string_field_set(cdr, appl, snapshot->appl); - ast_string_field_set(cdr, data, snapshot->data); + if (!ast_test_flag(&cdr->flags, AST_CDR_LOCK_APP) + && !ast_strlen_zero(snapshot->appl) + && (strncasecmp(snapshot->appl, "appdial", 7) || ast_strlen_zero(cdr->appl))) { + if (strcmp(cdr->appl, snapshot->appl)) { + ast_string_field_set(cdr, appl, snapshot->appl); + } + if (strcmp(cdr->data, snapshot->data)) { + ast_string_field_set(cdr, data, snapshot->data); + } /* Dial (app_dial) is a special case. Because pre-dial handlers, which * execute before the dial begins, will alter the application/data to @@ -1405,7 +1413,9 @@ static int base_process_party_a(struct cdr_object *cdr, struct ast_channel_snaps } } - ast_string_field_set(cdr, linkedid, snapshot->linkedid); + if (strcmp(cdr->linkedid, snapshot->linkedid)) { + ast_string_field_set(cdr, linkedid, snapshot->linkedid); + } cdr_object_check_party_a_answer(cdr); cdr_object_check_party_a_hangup(cdr); |