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
........

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

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index 9cd65713a7a9f094140842987f2d5d23f267881c..1f71039eb425238e551a5a4ef7a8ff6815cc607e 100644 (file)
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -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 */
 /*@{ */

diff --git a/main/cdr.c b/main/cdr.c
index 169625fca44b273a2d1132ebccb056f862c6fecc..3f7b9aee2f9effb1514653c83b9ada8e7ad1f27e 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -850,7 +850,7 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
                        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 */
@@ -1037,6 +1037,14 @@ static void post_cdr(struct ast_cdr *cdr)
                        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);
@@ -1088,7 +1096,7 @@ void ast_cdr_reset(struct ast_cdr *cdr, struct ast_flags *_flags)
                        cdr->billsec = 0;
                        cdr->duration = 0;
                        ast_cdr_start(cdr);
-                       cdr->disposition = AST_CDR_NULL;
+                       cdr->disposition = AST_CDR_NOANSWER;
                }
        }
 }

diff --git a/main/channel.c b/main/channel.c
index 969c0cfd61aad4c9a8db66d9a72958dc15baac92..a87e6dcd97bff15040fc97e3d9a0f87eb3379313 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3971,6 +3971,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
        }
 
        ast_set_callerid(chan, cid_num, cid_name, cid_num);
+       ast_set_flag(chan->cdr, AST_CDR_FLAG_ORIGINATED);
        ast_party_connected_line_set_init(&connected, &chan->connected);
        connected.id.number = (char *) cid_num;
        connected.id.name = (char *) cid_name;