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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107017 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index dfd6f83..ecc437b 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -836,23 +836,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                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) {

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index e8727ab..02d2eb3 100644 (file)
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -106,7 +106,6 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
 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);
 

diff --git a/main/cdr.c b/main/cdr.c
index 929ebce..1832524 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -102,11 +102,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 
        \return 0 on success, -1 on failure 
 */
@@ -985,6 +980,12 @@ static void post_cdr(struct ast_cdr *cdr)
        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))