From: Sungtae Kim <pchero21@gmail.com>
Date: Wed, 5 Dec 2018 22:09:49 +0000 (+0100)
Subject: main/cdr: Fixed cdr start overwriting
X-Git-Tag: 16.3.0-rc1~66^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e3027092a6d69d9a5f21713842449e76e31637;p=thirdparty%2Fasterisk.git

main/cdr: Fixed cdr start overwriting

The CDR was overwriting the start time when the call continued the
dialplan from the ARI stasis or a Local channel was originated.

This change fixes this by no longer reinitializing the CDR when
transitioning out of the dialed pending state to the single state.

ASTERISK-28181

Change-Id: I921bc04064b6cff1deb2eea56a94d86489561cdc
---

diff --git a/main/cdr.c b/main/cdr.c
index 1c47e24173..88bfb9e61f 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -804,21 +804,32 @@ static void cdr_object_snapshot_copy(struct cdr_object_snapshot *dst, struct cdr
 }
 
 /*!
- * \brief Transition a \ref cdr_object to a new state
+ * \brief Transition a \ref cdr_object to a new state with initiation flag
  * \param cdr The \ref cdr_object to transition
  * \param fn_table The \ref cdr_object_fn_table state to go to
  */
-static void cdr_object_transition_state(struct cdr_object *cdr, struct cdr_object_fn_table *fn_table)
+static void cdr_object_transition_state_init(struct cdr_object *cdr, struct cdr_object_fn_table *fn_table, int do_init)
 {
 	CDR_DEBUG("%p - Transitioning CDR for %s from state %s to %s\n",
 		cdr, cdr->party_a.snapshot->name,
 		cdr->fn_table ? cdr->fn_table->name : "NONE", fn_table->name);
 	cdr->fn_table = fn_table;
-	if (cdr->fn_table->init_function) {
+
+	if (cdr->fn_table->init_function && do_init) {
 		cdr->fn_table->init_function(cdr);
 	}
 }
 
+/*!
+ * \brief Transition a \ref cdr_object to a new state
+ * \param cdr The \ref cdr_object to transition
+ * \param fn_table The \ref cdr_object_fn_table state to go to
+ */
+static void cdr_object_transition_state(struct cdr_object *cdr, struct cdr_object_fn_table *fn_table)
+{
+	cdr_object_transition_state_init(cdr, fn_table, 1);
+}
+
 /*!
  * \internal
  * \brief Hash function for master CDR container indexed by Party A uniqueid.
@@ -1952,7 +1963,12 @@ static int dialed_pending_state_process_party_a(struct cdr_object *cdr, struct a
 			cdr->fn_table->process_party_a(cdr, snapshot);
 			return 1;
 		} else {
-			cdr_object_transition_state(cdr, &single_state_fn_table);
+			/* The CDR does not need to be reinitialized when transitioning
+			 * to its single state as this would overwrite the start time,
+			 * causing potentially both the answer and the start time to be
+			 * the same which is incorrect.
+			 */
+			cdr_object_transition_state_init(cdr, &single_state_fn_table, 0);
 			cdr->fn_table->process_party_a(cdr, snapshot);
 			return 0;
 		}