kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-30 19:03:07 +00:00
parent 008cf36d00
commit aada1f902b
9 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_features.c
View File

@@ -328,14 +328,14 @@ static int features_call(struct ast_channel *ast, char *dest, int timeout)
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
if (!x && p->subchan) {
ast_set_callerid(p->subchan,
p->owner->cid.cid_num, p->owner->cid.cid_name,
p->owner->cid.cid_ani ? p->owner->cid.cid_ani : p->owner->cid.cid_num);
if (p->owner->cid.cid_rdnis)
p->subchan->cid.cid_rdnis = strdup(p->owner->cid.cid_rdnis);
else
p->subchan->cid.cid_rdnis = NULL;
p->subchan->cid.cid_name = p->owner->cid.cid_name ?
strdup(p->owner->cid.cid_name) : NULL;
p->subchan->cid.cid_num = p->owner->cid.cid_num ?
strdup(p->owner->cid.cid_num) : NULL;
p->subchan->cid.cid_ani = p->owner->cid.cid_ani ?
strdup(p->owner->cid.cid_ani) : NULL;
p->subchan->cid.cid_rdnis = p->owner->cid.cid_rdnis ?
strdup(p->owner->cid.cid_rdnis) : NULL;
p->subchan->cid.cid_pres = p->owner->cid.cid_pres;
strncpy(p->subchan->language, p->owner->language, sizeof(p->subchan->language) - 1);