summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2010-09-29 15:07:57 +0000
committerMatthew Nicholson <mnicholson@digium.com>2010-09-29 15:07:57 +0000
commite5296076175ba19a6b27f78be41e39f014aac37e (patch)
tree9442800b84cd955f838bb7cf943740668dda00a7 /main
parent8e22acde1bae5fa5a1c9c7d4514c707cacf8420b (diff)
Merged revisions 289179 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r289179 | mnicholson | 2010-09-29 10:04:56 -0500 (Wed, 29 Sep 2010) | 22 lines Merged revisions 289178 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289178 | mnicholson | 2010-09-29 10:04:11 -0500 (Wed, 29 Sep 2010) | 15 lines Merged revisions 289177 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep 2010) | 8 lines Set the caller id on CDRs when it is set on the parent channel. (closes issue #17569) Reported by: tbelder Patches: 17569.diff uploaded by tbelder (license 618) Tested by: tbelder ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/channel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 551e66d6a..2223172a6 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -6304,6 +6304,9 @@ void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char
ast_free(chan->caller.ani.number.str);
chan->caller.ani.number.str = ast_strdup(cid_ani);
}
+ if (chan->cdr) {
+ ast_cdr_setcid(chan->cdr, chan);
+ }
report_new_callerid(chan);