diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-29 15:04:56 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-29 15:04:56 +0000 |
| commit | c540a3d50fe956dc81dfd1d9bfb434c501891680 (patch) | |
| tree | 2f56e3064963876f8761edbddd556c0e20a1fbba | |
| parent | 945ccbb69099c3b9a4cd5cfdb679f4eb18f0b3d8 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@289179 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 3 |
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); |