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 /main/cel.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 'main/cel.c')
| -rw-r--r-- | main/cel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/cel.c b/main/cel.c index 0e08e95c6..2c6dd9b27 100644 --- a/main/cel.c +++ b/main/cel.c @@ -440,7 +440,7 @@ struct ast_channel *ast_cel_fabricate_channel_from_event(const struct ast_event tchan->cid.cid_name = ast_strdup(record.caller_id_name); tchan->cid.cid_num = ast_strdup(record.caller_id_num); tchan->cid.cid_ani = ast_strdup(record.caller_id_ani); - tchan->cid.cid_rdnis = ast_strdup(record.caller_id_rdnis); + tchan->redirecting.from.number = ast_strdup(record.caller_id_rdnis); tchan->cid.cid_dnid = ast_strdup(record.caller_id_dnid); ast_copy_string(tchan->exten, record.extension, sizeof(tchan->exten)); @@ -533,7 +533,7 @@ int ast_cel_report_event(struct ast_channel *chan, enum ast_cel_event_type event AST_EVENT_IE_CEL_CIDNAME, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->cid.cid_name, ""), AST_EVENT_IE_CEL_CIDNUM, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->cid.cid_num, ""), AST_EVENT_IE_CEL_CIDANI, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->cid.cid_ani, ""), - AST_EVENT_IE_CEL_CIDRDNIS, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->cid.cid_rdnis, ""), + AST_EVENT_IE_CEL_CIDRDNIS, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->redirecting.from.number, ""), AST_EVENT_IE_CEL_CIDDNID, AST_EVENT_IE_PLTYPE_STR, S_OR(chan->cid.cid_dnid, ""), AST_EVENT_IE_CEL_EXTEN, AST_EVENT_IE_PLTYPE_STR, chan->exten, AST_EVENT_IE_CEL_CONTEXT, AST_EVENT_IE_PLTYPE_STR, chan->context, |