diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-03 02:12:33 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-03 02:12:33 +0000 |
| commit | f42e29b281d0cd12ab8ec57afc89061c613e4d62 (patch) | |
| tree | d5314391644adec2c19d0dc0b36644a20a12c759 /channels/chan_iax2.c | |
| parent | fa32b379746e68f554e1b59db0911a2181bfcb75 (diff) | |
Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.
SWP-1229
ABE-2161
* Ensure chan_local.c:local_call() will not leak cid.cid_dnid when
copying.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@256104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1d89eab3c..6cf3f652c 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4952,8 +4952,8 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout) iax_ie_append_str(&ied, IAX_IE_LANGUAGE, c->language); if (!ast_strlen_zero(c->cid.cid_dnid)) iax_ie_append_str(&ied, IAX_IE_DNID, c->cid.cid_dnid); - if (!ast_strlen_zero(c->cid.cid_rdnis)) - iax_ie_append_str(&ied, IAX_IE_RDNIS, c->cid.cid_rdnis); + if (!ast_strlen_zero(c->redirecting.from.number)) + iax_ie_append_str(&ied, IAX_IE_RDNIS, c->redirecting.from.number); if (pds.context) iax_ie_append_str(&ied, IAX_IE_CALLED_CONTEXT, pds.context); @@ -5549,7 +5549,7 @@ static struct ast_channel *ast_iax2_new(int callno, int state, format_t capabili else tmp->cid.cid_ani = ast_strdup(i->cid_num); tmp->cid.cid_dnid = ast_strdup(i->dnid); - tmp->cid.cid_rdnis = ast_strdup(i->rdnis); + tmp->redirecting.from.number = ast_strdup(i->rdnis); tmp->cid.cid_pres = i->calling_pres; tmp->cid.cid_ton = i->calling_ton; tmp->cid.cid_tns = i->calling_tns; |