kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 82444 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82444 | murf | 2007-09-14 15:19:27 -0600 (Fri, 14 Sep 2007) | 1 line

closes issue #10668; thanks to arkadia for his patch; had to leave out the bit about ending the previous cdr in the fork; it would destroy current implementations.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-09-14 21:30:44 +00:00
parent da5930c234
commit 6a98adc357
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
main/cdr.c
View File

@@ -308,20 +308,22 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
} }
for (; cdr; cdr = recur ? cdr->next : NULL) { for (; cdr; cdr = recur ? cdr->next : NULL) {
headp = &cdr->varshead; if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
AST_LIST_TRAVERSE_SAFE_BEGIN(headp, newvariable, entries) { headp = &cdr->varshead;
if (!strcasecmp(ast_var_name(newvariable), name)) { AST_LIST_TRAVERSE_SAFE_BEGIN(headp, newvariable, entries) {
/* there is already such a variable, delete it */ if (!strcasecmp(ast_var_name(newvariable), name)) {
AST_LIST_REMOVE_CURRENT(headp, entries); /* there is already such a variable, delete it */
ast_var_delete(newvariable); AST_LIST_REMOVE_CURRENT(headp, entries);
break; ast_var_delete(newvariable);
break;
}
} }
} AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_TRAVERSE_SAFE_END;
if (value) { if (value) {
newvariable = ast_var_assign(name, value); newvariable = ast_var_assign(name, value);
AST_LIST_INSERT_HEAD(headp, newvariable, entries); AST_LIST_INSERT_HEAD(headp, newvariable, entries);
}
} }
} }
@@ -691,11 +693,13 @@ void ast_cdr_answer(struct ast_cdr *cdr)
{ {
for (; cdr; cdr = cdr->next) { for (; cdr; cdr = cdr->next) {
check_post(cdr); if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
if (cdr->disposition < AST_CDR_ANSWERED) check_post(cdr);
cdr->disposition = AST_CDR_ANSWERED; if (cdr->disposition < AST_CDR_ANSWERED)
if (ast_tvzero(cdr->answer)) cdr->disposition = AST_CDR_ANSWERED;
cdr->answer = ast_tvnow(); if (ast_tvzero(cdr->answer))
cdr->answer = ast_tvnow();
}
} }
} }
@@ -841,15 +845,17 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
void ast_cdr_end(struct ast_cdr *cdr) void ast_cdr_end(struct ast_cdr *cdr)
{ {
for ( ; cdr ; cdr = cdr->next) { for ( ; cdr ; cdr = cdr->next) {
check_post(cdr); if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
if (ast_tvzero(cdr->end)) check_post(cdr);
cdr->end = ast_tvnow(); if (ast_tvzero(cdr->end))
if (ast_tvzero(cdr->start)) { cdr->end = ast_tvnow();
ast_log(LOG_WARNING, "CDR on channel '%s' has not started\n", S_OR(cdr->channel, "<unknown>")); if (ast_tvzero(cdr->start)) {
cdr->disposition = AST_CDR_FAILED; ast_log(LOG_WARNING, "CDR on channel '%s' has not started\n", S_OR(cdr->channel, "<unknown>"));
} else cdr->disposition = AST_CDR_FAILED;
cdr->duration = cdr->end.tv_sec - cdr->start.tv_sec; } else
cdr->billsec = ast_tvzero(cdr->answer) ? 0 : cdr->end.tv_sec - cdr->answer.tv_sec; cdr->duration = cdr->end.tv_sec - cdr->start.tv_sec;
cdr->billsec = ast_tvzero(cdr->answer) ? 0 : cdr->end.tv_sec - cdr->answer.tv_sec;
}
} }
} }