Merged revisions 79902 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 17 Aug 2007 17:45:01 +0000 (17:45 +0000)
committerJason Parker <jparker@digium.com>
Fri, 17 Aug 2007 17:45:01 +0000 (17:45 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@79903 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_local.c

index 46015a1..17d6b7f 100644 (file)
@@ -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;