[Asterisk-code-review] main/cdr: Carry over the disable flag when 'disable all' is ... (asterisk[master])

[Mark Michelson]

Mark Michelson has submitted this change and it was merged.

Change subject: main/cdr: Carry over the disable flag when 'disable all' is specified
......................................................................


main/cdr: Carry over the disable flag when 'disable all' is specified

The CDR_PROP function (as well as the NoCDR application) set the
'disable all' flag (AST_CDR_FLAG_DISABLE_ALL) on the current CDR. This
flag is supposed to be applied to all CDRs that are currently in the
chain, as well as all CDRs that may be created in the future. Currently,
however, the flag is only applied to the existing CDRs in the chain; new
CDRs do not receive the 'disable all' flag. In particular, this affects
parallel dials, which generate new CDRs for each pair of channels in
the dial attempt.

This patch carries over the 'disable all' flag when it is specified on a
CDR and a new CDR is generated for the chain.

ASTERISK-24344 #close

Change-Id: I91a0f0031e4d147bdf8a68ecd08304d506fb6a0e
---
M main/cdr.c
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, approved; Verified



diff --git a/main/cdr.c b/main/cdr.c
index c1fea78..8d7f53f 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -915,6 +915,14 @@
 	ast_string_field_set(new_cdr, context, cdr_last->context);
 	ast_string_field_set(new_cdr, exten, cdr_last->exten);
 
+	/*
+	 * If the current CDR says to disable all future ones,
+	 * keep the disable chain going
+	 */
+	if (ast_test_flag(&cdr_last->flags, AST_CDR_FLAG_DISABLE_ALL)) {
+		ast_set_flag(&new_cdr->flags, AST_CDR_FLAG_DISABLE_ALL);
+	}
+
 	/* Copy over other Party A information */
 	cdr_object_snapshot_copy(&new_cdr->party_a, &cdr_last->party_a);
 

-- 
To view, visit https://gerrit.asterisk.org/656
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I91a0f0031e4d147bdf8a68ecd08304d506fb6a0e
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>