diff options
author | Steve Murphy <murf@digium.com> | 2007-06-21 13:18:12 +0000 |
---|---|---|
committer | Steve Murphy <murf@digium.com> | 2007-06-21 13:18:12 +0000 |
commit | a1e9cb4acaae1cf53eb208bf03e30b4244b37d0e (patch) | |
tree | 20f0ef658b05627003b44e69ec0d4ce7ef9fb8de /main | |
parent | cf5666ca7a03a64b604ffa68d723770067a00ffa (diff) |
Merged revisions 70656 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r70656 | murf | 2007-06-21 07:00:39 -0600 (Thu, 21 Jun 2007) | 1 line
Via complaints aired in asterisk-users, I submit these changes, which allow cdr updates to see macro context/exten, whether hung up or not
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/cdr.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c index 5d447e0df..d19f6a8ad 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -775,8 +775,8 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c) cdr->amaflags = c->amaflags ? c->amaflags : ast_default_amaflags; ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode)); /* Destination information */ - ast_copy_string(cdr->dst, c->exten, sizeof(cdr->dst)); - ast_copy_string(cdr->dcontext, c->context, sizeof(cdr->dcontext)); + ast_copy_string(cdr->dst, S_OR(c->macroexten,c->exten), sizeof(cdr->dst)); + ast_copy_string(cdr->dcontext, S_OR(c->macrocontext,c->context), sizeof(cdr->dcontext)); /* Unique call identifier */ ast_copy_string(cdr->uniqueid, c->uniqueid, sizeof(cdr->uniqueid)); } @@ -891,11 +891,10 @@ int ast_cdr_update(struct ast_channel *c) /* Copy account code et-al */ ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode)); - if (!ast_check_hangup(c)) { - /* Destination information */ /* XXX privilege macro* ? */ - ast_copy_string(cdr->dst, S_OR(c->macroexten, c->exten), sizeof(cdr->dst)); - ast_copy_string(cdr->dcontext, S_OR(c->macrocontext, c->context), sizeof(cdr->dcontext)); - } + + /* Destination information */ /* XXX privilege macro* ? */ + ast_copy_string(cdr->dst, S_OR(c->macroexten, c->exten), sizeof(cdr->dst)); + ast_copy_string(cdr->dcontext, S_OR(c->macrocontext, c->context), sizeof(cdr->dcontext)); } } |