diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 20:57:55 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 20:57:55 +0000 |
| commit | ebe1f5a8f276c6b58f677f8c904cc1fc32098bb8 (patch) | |
| tree | fc9648da169cf19b73a1e116638884af913282c6 /main | |
| parent | 04bb154abfe9ae7f3294db3eeea6fea07bd01bf0 (diff) | |
Merged revisions 62738 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r62738 | murf | 2007-05-02 14:46:07 -0600 (Wed, 02 May 2007) | 9 lines
Merged revisions 62737 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r62737 | murf | 2007-05-02 14:10:32 -0600 (Wed, 02 May 2007) | 1 line
Some tweaks to satisfy CDR bug 8796, where being in 'h' extension louses up the dst field
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@62741 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/cdr.c | 8 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/main/cdr.c b/main/cdr.c index fa68ae9fc..eaad66f05 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -884,9 +884,11 @@ int ast_cdr_update(struct ast_channel *c) /* Copy account code et-al */ ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode)); - /* 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)); + 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)); + } } } diff --git a/main/pbx.c b/main/pbx.c index edb3d1ba7..9b2d9cc31 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -515,7 +515,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */ const char *saved_c_appl; const char *saved_c_data; - if (c->cdr && !(c->exten[0] == 'h' && c->exten[1] == 0) ) + if (c->cdr && !ast_check_hangup(c)) ast_cdr_setapp(c->cdr, app->name, data); /* save channel values */ |