[svn-commits] qwell: branch 1.4 r79902 - /branches/1.4/channels/chan_local.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Aug 17 12:44:22 2007
New Revision: 79902

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79902
Log:
Re-add the setting of callerid name and number.

Issue 10485, reported by and fix explained by paradise.

Modified:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=79902&r1=79901&r2=79902
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Fri Aug 17 12:44:22 2007
@@ -443,6 +443,12 @@
 	
 	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;