kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 06:00:36 +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

6
main/cdr.c
View File

@@ -308,6 +308,7 @@ 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) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
headp = &cdr->varshead; headp = &cdr->varshead;
AST_LIST_TRAVERSE_SAFE_BEGIN(headp, newvariable, entries) { AST_LIST_TRAVERSE_SAFE_BEGIN(headp, newvariable, entries) {
if (!strcasecmp(ast_var_name(newvariable), name)) { if (!strcasecmp(ast_var_name(newvariable), name)) {
@@ -324,6 +325,7 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
AST_LIST_INSERT_HEAD(headp, newvariable, entries); AST_LIST_INSERT_HEAD(headp, newvariable, entries);
} }
} }
}
return 0; return 0;
} }
@@ -691,6 +693,7 @@ void ast_cdr_answer(struct ast_cdr *cdr)
{ {
for (; cdr; cdr = cdr->next) { for (; cdr; cdr = cdr->next) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
check_post(cdr); check_post(cdr);
if (cdr->disposition < AST_CDR_ANSWERED) if (cdr->disposition < AST_CDR_ANSWERED)
cdr->disposition = AST_CDR_ANSWERED; cdr->disposition = AST_CDR_ANSWERED;
@@ -698,6 +701,7 @@ void ast_cdr_answer(struct ast_cdr *cdr)
cdr->answer = ast_tvnow(); cdr->answer = ast_tvnow();
} }
} }
}
void ast_cdr_busy(struct ast_cdr *cdr) void ast_cdr_busy(struct ast_cdr *cdr)
{ {
@@ -841,6 +845,7 @@ 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) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
check_post(cdr); check_post(cdr);
if (ast_tvzero(cdr->end)) if (ast_tvzero(cdr->end))
cdr->end = ast_tvnow(); cdr->end = ast_tvnow();
@@ -852,6 +857,7 @@ void ast_cdr_end(struct ast_cdr *cdr)
cdr->billsec = ast_tvzero(cdr->answer) ? 0 : cdr->end.tv_sec - cdr->answer.tv_sec; cdr->billsec = ast_tvzero(cdr->answer) ? 0 : cdr->end.tv_sec - cdr->answer.tv_sec;
} }
} }
}
char *ast_cdr_disp2str(int disposition) char *ast_cdr_disp2str(int disposition)
{ {