kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-27 16:07:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use AST_CDR_NOANSWER instead of AST_CDR_NULL as the default CDR disposition.

Browse Source 
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/branches/1.4@198068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-05-29 18:53:01 +00:00
parent be8d983874
commit aa2fd9a4c2
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/cdr.c
+10 -2
View File
@@ -862,7 +862,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 */
@@ -1040,6 +1040,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);
if (option_verbose > 1 && ast_tvzero(cdr->end))
@@ -1089,7 +1097,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;
}
}
}
main/channel.c
+1
View File
@@ -3063,6 +3063,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
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);