Finished up a previous fix to overcome a compiler warning; the app NoCDR() has been updated to mark the channel CDR as POST_DISABLED instead of destroying the CDR; this way its flags are propagated thru a bridge and the CDR is actually dropped. The cases where only one channel in a bridge has a CDR was cleaned up.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@61136 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 22 insertions, 24 deletions

diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index e8f76a602..a70d9d2f5 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -51,8 +51,7 @@ static int nocdr_exec(struct ast_channel *chan, void *data)
 	u = ast_module_user_add(chan);
 
 	if (chan->cdr) {
-		ast_cdr_free(chan->cdr);
-		chan->cdr = NULL;
+		ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);
 	}
 
 	ast_module_user_remove(u);
diff --git a/main/cdr.c b/main/cdr.c
index f6a90c035..18f878d75 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -88,7 +88,7 @@ static pthread_t cdr_thread = AST_PTHREADT_NULL;
 #define BATCH_SCHEDULER_ONLY_DEFAULT 0
 #define BATCH_SAFE_SHUTDOWN_DEFAULT 1
 
-static int enabled;
+static int enabled;		/*! Is the CDR subsystem enabled ? */
 static int batchmode;
 static int batchsize;
 static int batchtime;
@@ -596,6 +596,17 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
 	}
 	/* flags, varsead, ? */
 	cdr_merge_vars(from, to);
+
+	if (ast_test_flag(from, AST_CDR_FLAG_KEEP_VARS))
+		ast_set_flag(to, AST_CDR_FLAG_KEEP_VARS);
+	if (ast_test_flag(from, AST_CDR_FLAG_POSTED))
+		ast_set_flag(to, AST_CDR_FLAG_POSTED);
+	if (ast_test_flag(from, AST_CDR_FLAG_LOCKED))
+		ast_set_flag(to, AST_CDR_FLAG_LOCKED);
+	if (ast_test_flag(from, AST_CDR_FLAG_CHILD))
+		ast_set_flag(to, AST_CDR_FLAG_CHILD);
+	if (ast_test_flag(from, AST_CDR_FLAG_POST_DISABLED))
+		ast_set_flag(to, AST_CDR_FLAG_POST_DISABLED);
 }
 
 void ast_cdr_start(struct ast_cdr *cdr)
diff --git a/res/res_features.c b/res/res_features.c
index 16139c43f..4adb9eab0 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1436,8 +1436,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 		}
 		if (res < 0) {
 			ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name);
-			chan->cdr = NULL;
-			peer->cdr = NULL;
 			return -1;
 		}
 		
@@ -1532,10 +1530,10 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 	/* arrange the cdrs */
 	bridge_cdr = ast_cdr_alloc();
 	if (bridge_cdr) {
-		ast_log(LOG_NOTICE,"merging the bridged CDRs\n");
-		ast_cdr_init(bridge_cdr,chan); /* seems more logicaller to use the  destination as a base, but, really, it's random */
 		if (chan->cdr && peer->cdr) { /* both of them? merge */
+			ast_cdr_init(bridge_cdr,chan); /* seems more logicaller to use the  destination as a base, but, really, it's random */
 			ast_cdr_start(bridge_cdr); /* now is the time to start */
+
 			/* absorb the channel cdr */
 			ast_cdr_merge(bridge_cdr, chan->cdr);
 			ast_cdr_discard(chan->cdr); /* no posting these guys */
@@ -1548,27 +1546,17 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 		} else if (chan->cdr) {
 			/* take the cdr from the channel - literally */
 			ast_cdr_init(bridge_cdr,chan);
-			if (chan->cdr->disposition==AST_CDR_ANSWERED) {
-				ast_cdr_end(chan->cdr);
-				ast_cdr_detach(chan->cdr); /* post the existing cdr, we will be starting a fresh new cdr presently */
-			} else {
-				/* absorb this data */
-				ast_cdr_merge(bridge_cdr, chan->cdr);
-				ast_cdr_discard(chan->cdr); /* no posting these guys */
-			}
+			/* absorb this data */
+			ast_cdr_merge(bridge_cdr, chan->cdr);
+			ast_cdr_discard(chan->cdr); /* no posting these guys */
 			chan->cdr = bridge_cdr; /* make this available to the rest of the world via the chan while the call is in progress */
 		} else if (peer->cdr) {
 			/* take the cdr from the peer - literally */
 			ast_cdr_init(bridge_cdr,peer);
-			if (peer->cdr->disposition == AST_CDR_ANSWERED) {
-				ast_cdr_end(peer->cdr);
-				ast_cdr_detach(peer->cdr); /* post the existing cdr, we will be starting a fresh new cdr presently */
-			} else {
-				/* absorb this data */
-				ast_cdr_merge(bridge_cdr, peer->cdr);
-				ast_cdr_discard(peer->cdr); /* no posting these guys */
-				peer->cdr = NULL;
-			}
+			/* absorb this data */
+			ast_cdr_merge(bridge_cdr, peer->cdr);
+			ast_cdr_discard(peer->cdr); /* no posting these guys */
+			peer->cdr = NULL;
 			peer->cdr = bridge_cdr; /* make this available to the rest of the world via the chan while the call is in progress */
 		} else {
 			/* make up a new cdr */