kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move where unanswered CDRs are dropped to the CDR core, not everything uses app_dial.

Browse Source 
(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/branches/1.4@107016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2008-03-10 14:33:02 +00:00
parent 57eaf9dd8f
commit 2bf8f9fca3
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_dial.c
View File

@@ -765,25 +765,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
}
}
if (peer && !ast_cdr_log_unanswered()) {
/* suppress the CDR's that didn't win */
struct dial_localuser *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 dial_localuser *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);
}
}
}
return peer;
}

1
include/asterisk/cdr.h
View File

@@ -100,7 +100,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, char *buf, size_t size, 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);

11
main/cdr.c
View File

@@ -103,11 +103,6 @@ AST_MUTEX_DEFINE_STATIC(cdr_pending_lock);
static ast_cond_t cdr_pending_cond;
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
*/
@@ -986,6 +981,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))