automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-05 06:04:09 +00:00
parent 06352345c1
commit ee2918d783
11 changed files with 95 additions and 31 deletions

View File

@@ -2279,7 +2279,14 @@ static struct ast_channel *skinny_new(struct skinny_subchannel *sub, int state)
strncpy(tmp->call_forward, l->call_forward, sizeof(tmp->call_forward) - 1);
strncpy(tmp->context, l->context, sizeof(tmp->context)-1);
strncpy(tmp->exten,l->exten, sizeof(tmp->exten)-1);
ast_set_callerid(tmp, l->cid_num, l->cid_name, l->cid_num);
if (!ast_strlen_zero(l->cid_num)) {
tmp->cid.cid_num = strdup(l->cid_num);
tmp->cid.cid_ani = strdup(l->cid_num);
}
if (!ast_strlen_zero(l->cid_name))
tmp->cid.cid_name = strdup(l->cid_name);
tmp->priority = 1;
tmp->adsicpe = AST_ADSI_UNAVAILABLE;