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

Merged revisions 139083 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r139083 | murf | 2008-08-20 11:25:07 -0600 (Wed, 20 Aug 2008) | 20 lines

Merged revisions 139074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines


(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.



........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@139104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2008-08-20 17:30:58 +00:00
parent e2a327e2cc
commit 76be7d91a9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/cdr.c
View File

@@ -1079,14 +1079,17 @@ void ast_cdr_specialized_reset(struct ast_cdr *cdr, struct ast_flags *_flags)
{ {
struct ast_flags flags = { 0 }; struct ast_flags flags = { 0 };
if (_flags)
ast_copy_flags(&flags, _flags, AST_FLAGS_ALL);
if (_flags) if (_flags)
ast_copy_flags(&flags, _flags, AST_FLAGS_ALL); ast_copy_flags(&flags, _flags, AST_FLAGS_ALL);
/* Reset to initial state */ /* Reset to initial state */
if (ast_test_flag(cdr, AST_CDR_FLAG_POST_DISABLED)) { /* But do NOT lose the NoCDR() setting */
ast_clear_flag(cdr, AST_FLAGS_ALL); ast_clear_flag(cdr, AST_FLAGS_ALL);
ast_set_flag(cdr, AST_CDR_FLAG_POST_DISABLED);
} else {
ast_clear_flag(cdr, AST_FLAGS_ALL);
}
memset(&cdr->start, 0, sizeof(cdr->start)); memset(&cdr->start, 0, sizeof(cdr->start));
memset(&cdr->end, 0, sizeof(cdr->end)); memset(&cdr->end, 0, sizeof(cdr->end));
memset(&cdr->answer, 0, sizeof(cdr->answer)); memset(&cdr->answer, 0, sizeof(cdr->answer));