diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-04-03 02:12:33 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-04-03 02:12:33 +0000 |
| commit | a5a0a5f867a45eef2e7ccb6c64f3a4f2e8c3a7ba (patch) | |
| tree | d5314391644adec2c19d0dc0b36644a20a12c759 /channels/chan_h323.c | |
| parent | 5333a48b17e3f0f9cb12a7cb23da9bc509539dd7 (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: https://origsvn.digium.com/svn/asterisk/trunk@256104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 2746199f5..51d3cb1d2 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -615,8 +615,8 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout) if (c->connected.id.name) ast_copy_string(pvt->options.cid_name, c->connected.id.name, sizeof(pvt->options.cid_name)); - if (c->cid.cid_rdnis) { - ast_copy_string(pvt->options.cid_rdnis, c->cid.cid_rdnis, sizeof(pvt->options.cid_rdnis)); + if (c->redirecting.from.number) { + ast_copy_string(pvt->options.cid_rdnis, c->redirecting.from.number, sizeof(pvt->options.cid_rdnis)); } pvt->options.presentation = c->connected.id.number_presentation; @@ -1078,7 +1078,7 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c ch->cid.cid_ani = ast_strdup(cid_num); if (pvt->cd.redirect_reason >= 0) { - ch->cid.cid_rdnis = ast_strdup(pvt->cd.redirect_number); + ch->redirecting.from.number = ast_strdup(pvt->cd.redirect_number); pbx_builtin_setvar_helper(ch, "PRIREDIRECTREASON", redirectingreason2str(pvt->cd.redirect_reason)); } ch->cid.cid_pres = pvt->cd.presentation; |