diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-13 20:43:19 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-13 20:43:19 +0000 |
| commit | cb94c35a8524323b52a3c66eff4d15f72778a7d7 (patch) | |
| tree | c2723eda7cc6e8e0c77672c58e0a46889a590c7f /main | |
| parent | 699d2bd705ed98fa6917fe4e966ad9c7394a2076 (diff) | |
Fix setting CDR variables in the hangup extension
A previous CDR fix for setting CDR variables during a bridge via
custom dialplan features broke setting CDR variables in the
hangup extension. This patch fixes the issue.
Review: https://reviewboard.asterisk.org/r/1794/
........
Merged revisions 358978 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358989 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 7e8a978a0..44c937692 100644 --- a/main/features.c +++ b/main/features.c @@ -4408,8 +4408,10 @@ before_you_go: /* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */ new_chan_cdr = pick_unlocked_cdr(ast_channel_cdr(chan)); /* the proper chan cdr, if there are forked cdrs */ - /* If the channel CDR has been modified during the call, record the changes in the bridge cdr */ - if (new_chan_cdr && bridge_cdr) { + /* If the channel CDR has been modified during the call, record the changes in the bridge cdr, + * BUT, if we've gone through the h extension block above, the CDR got swapped so don't overwrite + * what was done in the h extension. What a mess. This is why you never touch CDR code. */ + if (new_chan_cdr && bridge_cdr && !h_context) { ast_cdr_copy_vars(bridge_cdr, new_chan_cdr); ast_copy_string(bridge_cdr->userfield, new_chan_cdr->userfield, sizeof(bridge_cdr->userfield)); bridge_cdr->amaflags = new_chan_cdr->amaflags; |