summaryrefslogtreecommitdiff
path: root/funcs/func_redirecting.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2010-04-03 02:12:33 +0000
committerRichard Mudgett <rmudgett@digium.com>2010-04-03 02:12:33 +0000
commita5a0a5f867a45eef2e7ccb6c64f3a4f2e8c3a7ba (patch)
treed5314391644adec2c19d0dc0b36644a20a12c759 /funcs/func_redirecting.c
parent5333a48b17e3f0f9cb12a7cb23da9bc509539dd7 (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 'funcs/func_redirecting.c')
-rw-r--r--funcs/func_redirecting.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/funcs/func_redirecting.c b/funcs/func_redirecting.c
index 62c6d7bc9..87fc41abe 100644
--- a/funcs/func_redirecting.c
+++ b/funcs/func_redirecting.c
@@ -183,11 +183,7 @@ static int redirecting_read(struct ast_channel *chan, const char *cmd, char *dat
ast_channel_lock(chan);
if (!strncasecmp("from-", data, 5)) {
- struct ast_party_id from_id;
-
- from_id = chan->redirecting.from;
- from_id.number = chan->cid.cid_rdnis;
- switch (redirecting_id_read(buf, len, data + 5, &from_id)) {
+ switch (redirecting_id_read(buf, len, data + 5, &chan->redirecting.from)) {
case ID_FIELD_VALID:
case ID_FIELD_INVALID:
break;