[asterisk-commits] trunk r14235 - in /trunk: ./ cdr.c include/asterisk/cdr.h

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Mar 22 15:43:38 2006
New Revision: 14235

URL: http://svn.digium.com/view/asterisk?rev=14235&view=rev
Log:
Merged revisions 14234 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r14234 | file | 2006-03-22 17:38:32 -0400 (Wed, 22 Mar 2006) | 2 lines

Issue #5918 - Disposition showing FAILED even though call is answered successfully (Reported by tracinet)

........

Modified:
    trunk/   (props changed)
    trunk/cdr.c
    trunk/include/asterisk/cdr.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr.c?rev=14235&r1=14234&r2=14235&view=diff
==============================================================================
--- trunk/cdr.c (original)
+++ trunk/cdr.c Wed Mar 22 15:43:38 2006
@@ -515,8 +515,10 @@
 		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 (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
-			cdr->disposition = AST_CDR_FAILED;
+		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
+			if (cdr->disposition < AST_CDR_FAILED)
+				cdr->disposition = AST_CDR_FAILED;
+		}
 		cdr = cdr->next;
 	}
 }

Modified: trunk/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/cdr.h?rev=14235&r1=14234&r2=14235&view=diff
==============================================================================
--- trunk/include/asterisk/cdr.h (original)
+++ trunk/include/asterisk/cdr.h Wed Mar 22 15:43:38 2006
@@ -32,8 +32,8 @@
 
 #define AST_CDR_NOANSWER			(1 << 0)
 #define AST_CDR_BUSY				(1 << 1)
-#define AST_CDR_ANSWERED			(1 << 2)
-#define AST_CDR_FAILED				(1 << 3)
+#define AST_CDR_FAILED				(1 << 2)
+#define AST_CDR_ANSWERED			(1 << 3)
 
 /*! AMA Flags */
 #define AST_CDR_OMIT				(1)