dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 122127 via svnmerge from 

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

........
r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line

Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@122128 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
murf 2008-06-12 14:56:26 +00:00
parent b3ef5ade57
commit 07c8bcdb66
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -98,8 +98,7 @@ Application Changes
from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
_busy(), failed(), etc, to all obey the LOCKED flag on cdr's in the chain, and
also the ast_cdr_setvar() func.
obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
SIP Changes
-----------

2
apps/app_forkcdr.c
View File

@ -83,7 +83,7 @@ static char *descrip =
"cdr record is set to the current time. Future hang-up or ending events\n"
"will not override this time stamp.\n"
"Next, If the 'A' option is specified, the original cdr record will have\n"
"it ANS_LOCKED flag set, which prevent future call dispostion events\n"
"it ANS_LOCKED flag set, which prevent future answer events\n"
"from updating the original cdr record's disposition. Normally, an\n"
"'ANSWERED' event would mark all cdr records in the chain as 'ANSWERED'.\n"
"Next, if the 'T' option is specified, the original cdr record will have\n"

12
main/cdr.c
View File

@ -707,10 +707,6 @@ void ast_cdr_busy(struct ast_cdr *cdr)
{
for (; cdr; cdr = cdr->next) {
if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED))
continue;
if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
continue;
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
check_post(cdr);
if (cdr->disposition < AST_CDR_BUSY)
@ -722,10 +718,6 @@ void ast_cdr_busy(struct ast_cdr *cdr)
void ast_cdr_failed(struct ast_cdr *cdr)
{
for (; cdr; cdr = cdr->next) {
if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED))
continue;
if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
continue;
check_post(cdr);
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
check_post(cdr);
@ -740,10 +732,6 @@ void ast_cdr_noanswer(struct ast_cdr *cdr)
char *chan;
while (cdr) {
if (ast_test_flag(cdr, AST_CDR_FLAG_ANSLOCKED))
continue;
if (ast_test_flag(cdr, AST_CDR_FLAG_DONT_TOUCH) && ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
continue;
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))