diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-29 19:04:24 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-29 19:04:24 +0000 |
| commit | 84f28a2c1c4ad80db40d93543a36f487083a0c3e (patch) | |
| tree | d6520f1793fedd911db11519967e16f13a103afe /main/cdr.c | |
| parent | 8687031f4e682c8fc9880ed4f507aa32afb6db99 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@198072 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/cdr.c b/main/cdr.c index 169625fca..3f7b9aee2 100644 --- 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; } } } |