From 329d45482e75abe7a22d45c366796d2dbc981bd7 Mon Sep 17 00:00:00 2001
From: mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 22 Apr 2010 22:25:44 +0000
Subject: Merged revisions 258671,258675 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r258671 | mnicholson | 2010-04-22 16:57:59 -0500 (Thu, 22 Apr 2010) | 32 lines

  Merged revisions 193391,258670 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r193391 | mnicholson | 2009-05-08 16:01:25 -0500 (Fri, 08 May 2009) | 8 lines

    Set the proper disposition on originated calls.

    (closes issue #14167)
    Reported by: jpt
    Patches:
          call-file-missing-cdr2.diff uploaded by mnicholson (license 96)
    Tested by: dlotina, rmartinez, mnicholson
  ........
    r258670 | mnicholson | 2010-04-22 16:49:07 -0500 (Thu, 22 Apr 2010) | 11 lines

    Fix broken CDR behavior.

    This change allows a CDR record previously marked with disposition ANSWERED to be set as BUSY or NO ANSWER.

    Additionally this change partially reverts r235635 and does not set the AST_CDR_FLAG_ORIGINATED flag on CDRs generated from ast_call().  To preserve proper CDR behavior, the AST_CDR_FLAG_DIALED flag is now cleared from all brige CDRs in ast_bridge_call().

    (closes issue #16797)
    Reported by: VarnishedOtter
    Tested by: mnicholson
  ........

  (closes issue #16222)
  Reported by: telles
  Tested by: mnicholson
................
  r258675 | mnicholson | 2010-04-22 17:11:23 -0500 (Thu, 22 Apr 2010) | 2 lines

  Fix previous commit.
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@258711 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/cdr.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'main/cdr.c')

diff --git a/main/cdr.c b/main/cdr.c
index 2e55f2f06..1278026dd 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -707,8 +707,7 @@ void ast_cdr_busy(struct ast_cdr *cdr)
 	for (; cdr; cdr = cdr->next) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			check_post(cdr);
-			if (cdr->disposition < AST_CDR_BUSY)
-				cdr->disposition = AST_CDR_BUSY;
+			cdr->disposition = AST_CDR_BUSY;
 		}
 	}
 }
@@ -732,10 +731,8 @@ void ast_cdr_noanswer(struct ast_cdr *cdr)
 	while (cdr) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
-			if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
-				ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
-			if (cdr->disposition < AST_CDR_NOANSWER)
-				cdr->disposition = AST_CDR_NOANSWER;
+			check_post(cdr);
+			cdr->disposition = AST_CDR_NOANSWER;
 		}
 		cdr = cdr->next;
 	}
-- 
cgit v1.2.3