diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-27 21:53:04 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-27 21:53:04 +0000 |
| commit | e9303d4cae8bfe8d3e2344ef2b95da858fc029bb (patch) | |
| tree | 278960af551120df5408adc020ae62e15a238d57 /channels | |
| parent | cd1e66d61f764a9600ed9871e220afbb6fe6d985 (diff) | |
Merged revisions 152215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
Inherit ALL elements of CallerID across a local channel.
(closes issue #13368)
Reported by: Peter Schlaile
Patches:
20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152217 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index cc48b303d..5318796da 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -505,11 +505,15 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) * Note that cid_num and cid_name aren't passed in the ast_channel_alloc * call, so it's done here instead. */ + p->chan->cid.cid_dnid = ast_strdup(p->owner->cid.cid_dnid); p->chan->cid.cid_num = ast_strdup(p->owner->cid.cid_num); p->chan->cid.cid_name = ast_strdup(p->owner->cid.cid_name); p->chan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis); p->chan->cid.cid_ani = ast_strdup(p->owner->cid.cid_ani); p->chan->cid.cid_pres = p->owner->cid.cid_pres; + p->chan->cid.cid_ani2 = p->owner->cid.cid_ani2; + p->chan->cid.cid_ton = p->owner->cid.cid_ton; + p->chan->cid.cid_tns = p->owner->cid.cid_tns; ast_string_field_set(p->chan, language, p->owner->language); ast_string_field_set(p->chan, accountcode, p->owner->accountcode); ast_cdr_update(p->chan); |