diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-17 17:45:01 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-17 17:45:01 +0000 |
| commit | 75e0fdb0108fbaeccf5a41defb574968e00525b3 (patch) | |
| tree | 99c7a4b21843b12d2ce2a08b9c479fab96532b59 /channels | |
| parent | e1c07ca6032d8ca26d9249fdc1ebc37a97d1db04 (diff) | |
Merged revisions 79902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10485)
........
r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines
Re-add the setting of callerid name and number.
Issue 10485, reported by and fix explained by paradise.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79903 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 46015a14e..17d6b7f4b 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -453,6 +453,12 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) ast_mutex_lock(&p->lock); + /* + * 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_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; |