diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 18:59:44 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 18:59:44 +0000 |
| commit | 08c0676027867a231168802e1ce5c98c03562d1c (patch) | |
| tree | f2ea497332b2cecd53cfb343c9724aa4dd6074ac /channels/chan_mgcp.c | |
| parent | 239eceb889bc4f7c157ec21138e027219234543e (diff) | |
Restore original functionality of 1.2 in places where ANI was not set, but was
changed to be set. The original change was done to ensure that the behavior of
the "callerid" option in each channel driver was consistent, but it caused an
unexpected behavior change of CDR records for users, so this change is being
reverted in 1.2. (issue #7695)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@41411 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index cb3c3d7ce..14b187426 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1429,10 +1429,8 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) strncpy(tmp->context, i->context, sizeof(tmp->context)-1); strncpy(tmp->exten, i->exten, sizeof(tmp->exten)-1); - if (!ast_strlen_zero(i->cid_num)) { + if (!ast_strlen_zero(i->cid_num)) tmp->cid.cid_num = strdup(i->cid_num); - tmp->cid.cid_ani = strdup(i->cid_num); - } if (!ast_strlen_zero(i->cid_name)) tmp->cid.cid_name = strdup(i->cid_name); @@ -2630,7 +2628,7 @@ static void *mgcp_ss(void *data) ast_set_callerid(chan, p->hidecallerid ? "" : p->cid_num, p->hidecallerid ? "" : p->cid_name, - chan->cid.cid_ani ? NULL : p->cid_num); + p->cid_num); ast_setstate(chan, AST_STATE_RING); /*zt_enable_ec(p);*/ if (p->dtmfmode & MGCP_DTMF_HYBRID) { |