[asterisk-commits] mnicholson: branch 1.6.1 r198074 - in /branches/1.6.1: ./ include/asterisk/ m...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri May 29 14:13:44 2009
New Revision: 198074

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198074
Log:
Merged revisions 198072 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r198072 | mnicholson | 2009-05-29 14:04:24 -0500 (Fri, 29 May 2009) | 21 lines
  
  Merged revisions 198068 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r198068 | mnicholson | 2009-05-29 13:53:01 -0500 (Fri, 29 May 2009) | 15 lines
    
    Use AST_CDR_NOANSWER instead of AST_CDR_NULL as the default CDR disposition.
    
    This change also involves the addition of an AST_CDR_FLAG_ORIGINATED flag that is used on originated channels to distinguish: them from dialed channels.
    
    (closes issue #12946)
    Reported by: meral
    Patches:
          null-cdr2.diff uploaded by mnicholson (license 96)
    Tested by: mnicholson, dbrooks
    
    (closes issue #15122)
    Reported by: sum
    Tested by: sum
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/cdr.h
    branches/1.6.1/main/cdr.c
    branches/1.6.1/main/channel.c

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

Modified: branches/1.6.1/include/asterisk/cdr.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/cdr.h?view=diff&rev=198074&r1=198073&r2=198074
==============================================================================
--- branches/1.6.1/include/asterisk/cdr.h (original)
+++ branches/1.6.1/include/asterisk/cdr.h Fri May 29 14:13:44 2009
@@ -40,6 +40,7 @@
 #define AST_CDR_FLAG_POST_ENABLE    (1 << 10)
 #define AST_CDR_FLAG_DIALED         (1 << 11)
 /*@} */
+#define AST_CDR_FLAG_ORIGINATED		(1 << 11)
 
 /*! \name CDR Flags - Disposition */
 /*@{ */

Modified: branches/1.6.1/main/cdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/cdr.c?view=diff&rev=198074&r1=198073&r2=198074
==============================================================================
--- branches/1.6.1/main/cdr.c (original)
+++ branches/1.6.1/main/cdr.c Fri May 29 14:13:44 2009
@@ -851,7 +851,7 @@
 			ast_copy_string(cdr->channel, c->name, sizeof(cdr->channel));
 			set_one_cid(cdr, c);
 
-			cdr->disposition = (c->_state == AST_STATE_UP) ?  AST_CDR_ANSWERED : AST_CDR_NULL;
+			cdr->disposition = (c->_state == AST_STATE_UP) ?  AST_CDR_ANSWERED : AST_CDR_NOANSWER;
 			cdr->amaflags = c->amaflags ? c->amaflags :  ast_default_amaflags;
 			ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode));
 			/* Destination information */
@@ -1035,6 +1035,14 @@
 			continue;
 		}
 
+		/* don't post CDRs that are for dialed channels unless those
+		 * channels were originated from asterisk (pbx_spool, manager,
+		 * cli) */
+		if (ast_test_flag(cdr, AST_CDR_FLAG_DIALED) && !ast_test_flag(cdr, AST_CDR_FLAG_ORIGINATED)) {
+			ast_set_flag(cdr, AST_CDR_FLAG_POST_DISABLED);
+			continue;
+		}
+
 		chan = S_OR(cdr->channel, "<unknown>");
 		check_post(cdr);
 		ast_set_flag(cdr, AST_CDR_FLAG_POSTED);
@@ -1086,7 +1094,7 @@
 			cdr->billsec = 0;
 			cdr->duration = 0;
 			ast_cdr_start(cdr);
-			cdr->disposition = AST_CDR_NULL;
+			cdr->disposition = AST_CDR_NOANSWER;
 		}
 	}
 }

Modified: branches/1.6.1/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=198074&r1=198073&r2=198074
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Fri May 29 14:13:44 2009
@@ -3573,6 +3573,7 @@
 			ast_cdr_setaccount(chan, oh->account);	
 	}
 	ast_set_callerid(chan, cid_num, cid_name, cid_num);
+	ast_set_flag(chan->cdr, AST_CDR_FLAG_ORIGINATED);
 
 	if (ast_call(chan, data, 0)) {	/* ast_call failed... */
 		ast_log(LOG_NOTICE, "Unable to call channel %s/%s\n", type, (char *)data);