kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-07 22:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "cdr.c: Set stringfields only if they are different." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-10-13 17:00:09 -05:00
committed by Gerrit Code Review
parent d0cd6cb1a7 92c5cf3920
commit bf21ba9c2d
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/cdr.c
View File

@@ -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) if (!ast_test_flag(&snapshot->flags, AST_FLAG_SUBROUTINE_EXEC)
|| ast_test_flag(&snapshot->softhangup_flags, AST_SOFTHANGUP_HANGUP_EXEC)) { || ast_test_flag(&snapshot->softhangup_flags, AST_SOFTHANGUP_HANGUP_EXEC)) {
ast_string_field_set(cdr, context, snapshot->context); if (strcmp(cdr->context, snapshot->context)) {
ast_string_field_set(cdr, exten, snapshot->exten); 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); 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 * of "AppDialX". Prevent that, and any other application changes we might not want
* here. * here.
*/ */
if (!ast_strlen_zero(snapshot->appl) if (!ast_test_flag(&cdr->flags, AST_CDR_LOCK_APP)
&& (strncasecmp(snapshot->appl, "appdial", 7) || ast_strlen_zero(cdr->appl)) && !ast_strlen_zero(snapshot->appl)
&& !ast_test_flag(&cdr->flags, AST_CDR_LOCK_APP)) { && (strncasecmp(snapshot->appl, "appdial", 7) || ast_strlen_zero(cdr->appl))) {
ast_string_field_set(cdr, appl, snapshot->appl); if (strcmp(cdr->appl, snapshot->appl)) {
ast_string_field_set(cdr, data, snapshot->data); 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 /* Dial (app_dial) is a special case. Because pre-dial handlers, which
* execute before the dial begins, will alter the application/data to * 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_answer(cdr);
cdr_object_check_party_a_hangup(cdr); cdr_object_check_party_a_hangup(cdr);