[asterisk-commits] mnicholson: branch 1.6.0 r258711 - in /branches/1.6.0: ./ main/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Apr 22 17:25:55 CDT 2010


Author: mnicholson
Date: Thu Apr 22 17:25:44 2010
New Revision: 258711

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258711
Log:
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.
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/cdr.c
    branches/1.6.0/main/channel.c
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/cdr.c?view=diff&rev=258711&r1=258710&r2=258711
==============================================================================
--- branches/1.6.0/main/cdr.c (original)
+++ branches/1.6.0/main/cdr.c Thu Apr 22 17:25:44 2010
@@ -707,8 +707,7 @@
 	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 @@
 	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;
 	}

Modified: branches/1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=258711&r1=258710&r2=258711
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Thu Apr 22 17:25:44 2010
@@ -3899,8 +3899,19 @@
 					break;
 
 				case AST_CONTROL_BUSY:
+					ast_cdr_busy(chan->cdr);
+					*outstate = f->subclass;
+					timeout = 0;
+					break;
+
 				case AST_CONTROL_CONGESTION:
+					ast_cdr_failed(chan->cdr);
+					*outstate = f->subclass;
+					timeout = 0;
+					break;
+
 				case AST_CONTROL_ANSWER:
+					ast_cdr_answer(chan->cdr);
 					*outstate = f->subclass;
 					timeout = 0;		/* trick to force exit from the while() */
 					break;
@@ -4031,7 +4042,6 @@
 	if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) {
 		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);

Modified: branches/1.6.0/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/features.c?view=diff&rev=258711&r1=258710&r2=258711
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Apr 22 17:25:44 2010
@@ -2342,6 +2342,11 @@
 				ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED);
 			}
 		}
+		/* the DIALED flag may be set if a dialed channel is transfered
+		 * and then bridged to another channel.  In order for the
+		 * bridge CDR to be written, the DIALED flag must not be
+		 * present. */
+		ast_clear_flag(bridge_cdr, AST_CDR_FLAG_DIALED);
 	}
 	for (;;) {
 		struct ast_channel *other;	/* used later */




More information about the asterisk-commits mailing list