diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-07-03 04:25:21 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-07-03 04:25:21 +0000 |
| commit | 73e8e2ab1fae6c7a83fd98b7997440631b39c912 (patch) | |
| tree | 9e29310d1f0916eaa0b2301492a9ed5f1c5e093a /channels/chan_iax2.c | |
| parent | 03a277c5cc64577060d1e614a8e91dc1a30cd089 (diff) | |
Blocked revisions 36725 via svnmerge
........
r36725 | russell | 2006-07-03 00:19:09 -0400 (Mon, 03 Jul 2006) | 4 lines
use ast_set_callerid to be more consistent and to make sure that the
"callerid" option in the conf files is always handled the same way and sets ANI
(issue #7285, gkloepfer)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 7eb42457e..db8eb4aa1 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3287,12 +3287,7 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability) tmp->writeformat = ast_best_codec(capability); tmp->tech_pvt = CALLNO_TO_PTR(i->callno); - if (!ast_strlen_zero(i->cid_num)) - tmp->cid.cid_num = ast_strdup(i->cid_num); - if (!ast_strlen_zero(i->cid_name)) - tmp->cid.cid_name = ast_strdup(i->cid_name); - if (!ast_strlen_zero(i->ani)) - tmp->cid.cid_ani = ast_strdup(i->ani); + ast_set_callerid(tmp, i->cid_num, i->cid_name, S_OR(i->ani, i->cid_num)); if (!ast_strlen_zero(i->language)) ast_string_field_set(tmp, language, i->language); if (!ast_strlen_zero(i->dnid)) |