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_sip.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_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 59ba5dce2..934a925f0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5568,7 +5568,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit * generate an unnecessary NewCallerID event */ tmp->cid.cid_ani = ast_strdup(i->cid_num); if (!ast_strlen_zero(i->rdnis)) - tmp->cid.cid_rdnis = ast_strdup(i->rdnis); + tmp->redirecting.from.number = ast_strdup(i->rdnis); if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) tmp->cid.cid_dnid = ast_strdup(i->exten); @@ -9654,7 +9654,7 @@ static void add_diversion_header(struct sip_request *req, struct sip_pvt *pvt) return; } - diverting_number = pvt->owner->cid.cid_rdnis; + diverting_number = pvt->owner->redirecting.from.number; diverting_name = pvt->owner->redirecting.from.name; reason = sip_reason_code_to_str(pvt->owner->redirecting.reason); |