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 /res | |
| 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 'res')
| -rw-r--r-- | res/res_agi.c | 2 | ||||
| -rw-r--r-- | res/snmp/agent.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index cf1679daf..d0ba17e8d 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1633,7 +1633,7 @@ static void setup_env(struct ast_channel *chan, char *request, int fd, int enhan ast_agi_send(fd, chan, "agi_callington: %d\n", chan->cid.cid_ton); ast_agi_send(fd, chan, "agi_callingtns: %d\n", chan->cid.cid_tns); ast_agi_send(fd, chan, "agi_dnid: %s\n", S_OR(chan->cid.cid_dnid, "unknown")); - ast_agi_send(fd, chan, "agi_rdnis: %s\n", S_OR(chan->cid.cid_rdnis, "unknown")); + ast_agi_send(fd, chan, "agi_rdnis: %s\n", S_OR(chan->redirecting.from.number, "unknown")); /* Context information */ ast_agi_send(fd, chan, "agi_context: %s\n", chan->context); diff --git a/res/snmp/agent.c b/res/snmp/agent.c index df4523339..b902affcc 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -451,8 +451,8 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le } break; case ASTCHANCIDRDNIS: - if (chan->cid.cid_rdnis) { - strncpy(string_ret, chan->cid.cid_rdnis, sizeof(string_ret)); + if (chan->redirecting.from.number) { + strncpy(string_ret, chan->redirecting.from.number, sizeof(string_ret)); string_ret[sizeof(string_ret) - 1] = '\0'; *var_len = strlen(string_ret); ret = (u_char *)string_ret; |