diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 19:03:07 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 19:03:07 +0000 |
| commit | 57e9d9a550c49a0870bb93ea4bf8d0bdaf8fc2c9 (patch) | |
| tree | f8411ff9ace1201c509e692768e4870fb0358590 /channels/chan_skinny.c | |
| parent | 22cb86722b88e807b176e2f7800b21841e115bd9 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41432 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index e4ffe8165..1dc6c8c2a 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1746,7 +1746,7 @@ static void *skinny_ss(void *data) ast_set_callerid(chan, l->hidecallerid ? "" : l->cid_num, l->hidecallerid ? "" : l->cid_name, - chan->cid.cid_ani ? NULL : l->cid_num); + NULL); ast_setstate(chan, AST_STATE_RING); res = ast_pbx_run(chan); if (res) { @@ -2280,10 +2280,8 @@ static struct ast_channel *skinny_new(struct skinny_subchannel *sub, int state) strncpy(tmp->context, l->context, sizeof(tmp->context)-1); strncpy(tmp->exten,l->exten, sizeof(tmp->exten)-1); - if (!ast_strlen_zero(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); |