[svn-commits] file: branch 1.6.0 r107018 - in /branches/1.6.0: ./ apps/ include/asterisk/ m...

[SVN commits to the Digium repositories]

Author: file
Date: Mon Mar 10 09:38:01 2008
New Revision: 107018

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107018
Log:
Merged revisions 107017 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107017 | file | 2008-03-10 11:36:16 -0300 (Mon, 10 Mar 2008) | 15 lines

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

........
r107016 | file | 2008-03-10 11:33:02 -0300 (Mon, 10 Mar 2008) | 7 lines

Move where unanswered CDRs are dropped to the CDR core, not everything uses app_dial.
(closes issue #11516)
Reported by: ys
Patches:
      branch_1.4_cdr.diff uploaded by ys (license 281)
Tested by: anest, jcapp, dartvader

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_dial.c
    branches/1.6.0/include/asterisk/cdr.h
    branches/1.6.0/main/cdr.c

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

Modified: branches/1.6.0/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=107018&r1=107017&r2=107018
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Mon Mar 10 09:38:01 2008
@@ -835,23 +835,6 @@
 		if (!*to || ast_check_hangup(in))
 			ast_cdr_noanswer(in->cdr);
 	}
-	if (peer && !ast_cdr_log_unanswered()) {
-		/* suppress the CDR's that didn't win */
-		struct chanlist *o;
-		for (o = outgoing; o; o = o->next) {
-			struct ast_channel *c = o->chan;
-			if (c && c != peer && c->cdr)
-				ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);
-		}
-	} else if (!peer && !ast_cdr_log_unanswered()) {
-			/* suppress the CDR's that didn't win */
-		struct chanlist *o;
-		for (o = outgoing; o; o = o->next) {
-			struct ast_channel *c = o->chan;
-			if (c && c->cdr)
-				ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);
-		}
-	}
 
 #ifdef HAVE_EPOLL
 	for (epollo = outgoing; epollo; epollo = epollo->next) {

Modified: branches/1.6.0/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/cdr.h?view=diff&rev=107018&r1=107017&r2=107018
==============================================================================
--- branches/1.6.0/include/asterisk/cdr.h (original)
+++ branches/1.6.0/include/asterisk/cdr.h Mon Mar 10 09:38:01 2008
@@ -106,7 +106,6 @@
 int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char delim, char sep, int recur);
 void ast_cdr_free_vars(struct ast_cdr *cdr, int recur);
 int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr);
-int ast_cdr_log_unanswered(void);
 
 typedef int (*ast_cdrbe)(struct ast_cdr *cdr);
 

Modified: branches/1.6.0/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/cdr.c?view=diff&rev=107018&r1=107017&r2=107018
==============================================================================
--- branches/1.6.0/main/cdr.c (original)
+++ branches/1.6.0/main/cdr.c Mon Mar 10 09:38:01 2008
@@ -100,11 +100,6 @@
 int check_cdr_enabled()
 {
 	return enabled;
-}
-
-int ast_cdr_log_unanswered(void)
-{
-	return unanswered;
 }
 
 /*! Register a CDR driver. Each registered CDR driver generates a CDR 
@@ -985,6 +980,12 @@
 	struct ast_cdr_beitem *i;
 
 	for ( ; cdr ; cdr = cdr->next) {
+		if (!unanswered && cdr->disposition < AST_CDR_ANSWERED && (ast_strlen_zero(cdr->channel) || ast_strlen_zero(cdr->dstchannel))) {
+			/* For people, who don't want to see unanswered single-channel events */
+			ast_set_flag(cdr, AST_CDR_FLAG_POST_DISABLED);
+			continue;
+		}
+
 		chan = S_OR(cdr->channel, "<unknown>");
 		check_post(cdr);
 		if (ast_tvzero(cdr->end))