[svn-commits] jpeeler: branch 1.4 r235635 - in /branches/1.4: include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Dec 18 16:29:51 2009
New Revision: 235635

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235635
Log:
Correct CDR dispositions for BUSY/FAILED

This patch is simple in that it reorders the disposition defines so that the fix
for issue 12946 works properly (the default CDR disposition was changed to
AST_CDR_NOANSWER). Also, the AST_CDR_FLAG_ORIGINATED flag was set in ast_call to
ensure all CDR records are written.

The side effects of CDR changes are scary, so I'm documenting the test cases
performed to attempt to catch any regressions. The following tests were all
performed using 1.4 rev 195881 vs head (235571) + patch:

A calls B
C calls B (busy)
Hangup C
Hangup A

(Both SIP and features)
A calls B
A blind transfers to C
Hangup C

(Both SIP and features)
A calls B
A attended transfers to C
Hangup C

A calls B
A attended transfers to C (SIP)
C blind transfers to A (features)
Hangup A

All of the test scenario CDRs matched.

The following tests were performed just with the patch to ensure proper operation
(with unanswered=yes):

exten =>s,1,Answer
exten =>s,n,ResetCDR(w)
exten =>s,n,ResetCDR(w)

exten =>s,1,ResetCDR(w)
exten =>s,n,ResetCDR(w)

(closes issue #16180)
Reported by: aatef
Patches: 
      bug16180.patch uploaded by jpeeler (license 325)

Modified:
    branches/1.4/include/asterisk/cdr.h
    branches/1.4/main/channel.c

Modified: branches/1.4/include/asterisk/cdr.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/cdr.h?view=diff&rev=235635&r1=235634&r2=235635
==============================================================================
--- branches/1.4/include/asterisk/cdr.h (original)
+++ branches/1.4/include/asterisk/cdr.h Fri Dec 18 16:29:51 2009
@@ -40,10 +40,10 @@
 #define AST_CDR_FLAG_ORIGINATED		(1 << 11)
 
 /*! Disposition */
-#define AST_CDR_NULL                0
-#define AST_CDR_FAILED				(1 << 0)
-#define AST_CDR_BUSY				(1 << 1)
-#define AST_CDR_NOANSWER			(1 << 2)
+#define AST_CDR_NOANSWER			0
+#define AST_CDR_NULL                (1 << 0)
+#define AST_CDR_FAILED				(1 << 1)
+#define AST_CDR_BUSY				(1 << 2)
 #define AST_CDR_ANSWERED			(1 << 3)
 
 /*! AMA Flags */

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=235635&r1=235634&r2=235635
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Fri Dec 18 16:29:51 2009
@@ -3470,8 +3470,10 @@
 	/* Stop if we're a zombie or need a soft hangup */
 	ast_channel_lock(chan);
 	if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) {
-		if (chan->cdr)
+		if (chan->cdr) {
 			ast_set_flag(chan->cdr, AST_CDR_FLAG_DIALED);
+			ast_set_flag(chan->cdr, AST_CDR_FLAG_ORIGINATED);
+		}
 		if (chan->tech->call)
 			res = chan->tech->call(chan, addr, timeout);
 		ast_set_flag(chan, AST_FLAG_OUTGOING);