Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.

Browse Source 
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
certified/1.8.6
Richard Mudgett 17 years ago
parent 5333a48b17
commit a5a0a5f867
20 changed files with 66 additions and 118 deletions
Show Stats Download Patch File Download Diff File

3
apps/app_amd.c
Unescape View File

@ -188,7 +188,8 @@ static void isAnsweringMachine(struct ast_channel *chan, const char *data)
AST_APP_ARG(argMaximumWordLength);
);
ast_verb(3, "AMD: %s %s %s (Fmt: %s)\n", chan->name, chan->cid.cid_ani, chan->cid.cid_rdnis, ast_getformatname(chan->readformat));
ast_verb(3, "AMD: %s %s %s (Fmt: %s)\n", chan->name, chan->cid.cid_ani,
chan->redirecting.from.number, ast_getformatname(chan->readformat));
/* Lets parse the arguments. */
if (!ast_strlen_zero(parse)) {

30
apps/app_dial.c
Unescape View File

@ -691,12 +691,11 @@ static void handle_cause(int cause, struct cause_args *num)
}
}
/* free the buffer if allocated, and set the pointer to the second arg */
#define S_REPLACE(s, new_val) \
do { \
if (s) \
ast_free(s); \
s = (new_val); \
/*! \brief free the buffer if allocated, and set the pointer to the second arg */
#define S_REPLACE(s, new_val) \
do { \
ast_free(s); \
s = (new_val); \
} while (0)
static int onedigit_goto(struct ast_channel *chan, const char *context, char exten, int pri)
@ -773,8 +772,6 @@ static void do_forward(struct chanlist *o,
struct ast_channel *original = o->chan;
struct ast_channel *c = o->chan; /* the winner */
struct ast_channel *in = num->chan; /* the input channel */
struct ast_party_redirecting *apr = &o->chan->redirecting;
struct ast_party_connected_line *apc = &o->chan->connected;
char *stuff;
char *tech;
int cause;
@ -825,12 +822,19 @@ static void do_forward(struct chanlist *o,
ast_rtp_instance_early_bridge_make_compatible(c, in);
}
ast_channel_set_redirecting(c, apr);
ast_channel_set_redirecting(c, &original->redirecting);
ast_channel_lock(c);
while (ast_channel_trylock(in)) {
CHANNEL_DEADLOCK_AVOIDANCE(c);
}
S_REPLACE(c->cid.cid_rdnis, ast_strdup(S_OR(original->cid.cid_rdnis, S_OR(in->macroexten, in->exten))));
if (ast_strlen_zero(c->redirecting.from.number)) {
/*
* The call was not previously redirected so it is
* now redirected from this number.
*/
S_REPLACE(c->redirecting.from.number,
ast_strdup(S_OR(in->macroexten, in->exten)));
}
c->cid.cid_tns = in->cid.cid_tns;
@ -842,10 +846,9 @@ static void do_forward(struct chanlist *o,
ast_party_caller_copy(&c->cid, &in->cid);
ast_string_field_set(c, accountcode, in->accountcode);
}
ast_party_connected_line_copy(&c->connected, apc);
ast_party_connected_line_copy(&c->connected, &original->connected);
S_REPLACE(in->cid.cid_rdnis, ast_strdup(c->cid.cid_rdnis));
ast_channel_update_redirecting(in, apr);
ast_channel_update_redirecting(in, &c->redirecting);
ast_clear_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE);
if (ast_test_flag64(peerflags, OPT_CANCEL_TIMEOUT)) {
@ -1913,7 +1916,6 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
ast_connected_line_copy_from_caller(&tc->connected, &chan->cid);
}
S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
ast_party_redirecting_copy(&tc->redirecting, &chan->redirecting);
tc->cid.cid_tns = chan->cid.cid_tns;

2
apps/app_dumpchan.c
Unescape View File

@ -119,7 +119,7 @@ static int serialize_showchan(struct ast_channel *c, char *buf, size_t size)
S_OR(c->cid.cid_num, "(N/A)"),
S_OR(c->cid.cid_name, "(N/A)"),
S_OR(c->cid.cid_dnid, "(N/A)"),
S_OR(c->cid.cid_rdnis, "(N/A)"),
S_OR(c->redirecting.from.number, "(N/A)"),
c->parkinglot,
c->language,
ast_state2str(c->_state),

28
apps/app_queue.c
Unescape View File

@ -2835,9 +2835,6 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
tmp->update_connectedline = 0;
}
if (tmp->chan->cid.cid_rdnis)
ast_free(tmp->chan->cid.cid_rdnis);
tmp->chan->cid.cid_rdnis = ast_strdup(qe->chan->cid.cid_rdnis);
ast_party_redirecting_copy(&tmp->chan->redirecting, &qe->chan->redirecting);
tmp->chan->cid.cid_tns = qe->chan->cid.cid_tns;
@ -3275,8 +3272,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
winner = NULL;
continue;
} else if (!ast_strlen_zero(o->chan->call_forward)) {
struct ast_party_redirecting *apr = &o->chan->redirecting;
struct ast_party_connected_line *apc = &o->chan->connected;
struct ast_channel *original = o->chan;
char tmpchan[256];
char *stuff;
@ -3312,22 +3307,23 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
ast_string_field_set(o->chan, accountcode, in->accountcode);
ast_channel_set_redirecting(o->chan, apr);
if (o->chan->cid.cid_rdnis)
ast_free(o->chan->cid.cid_rdnis);
o->chan->cid.cid_rdnis = ast_strdup(S_OR(original->cid.cid_rdnis,S_OR(in->macroexten, in->exten)));
ast_channel_set_redirecting(o->chan, &original->redirecting);
if (ast_strlen_zero(o->chan->redirecting.from.number)) {
/*
* The call was not previously redirected so it is
* now redirected from this number.
*/
ast_free(o->chan->redirecting.from.number);
o->chan->redirecting.from.number =
ast_strdup(S_OR(in->macroexten, in->exten));
}
o->chan->cid.cid_tns = in->cid.cid_tns;
ast_party_caller_copy(&o->chan->cid, &in->cid);
ast_party_connected_line_copy(&o->chan->connected, apc);
ast_party_connected_line_copy(&o->chan->connected, &original->connected);
ast_channel_update_redirecting(in, apr);
if (in->cid.cid_rdnis) {
ast_free(in->cid.cid_rdnis);
}
in->cid.cid_rdnis = ast_strdup(o->chan->cid.cid_rdnis);
ast_channel_update_redirecting(in, &o->chan->redirecting);
update_connectedline = 1;

2
channels/chan_dahdi.c
Unescape View File

@ -8741,7 +8741,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
if (!ast_strlen_zero(i->exten))
ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
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->dnid))
tmp->cid.cid_dnid = ast_strdup(i->dnid);

6
channels/chan_h323.c
Unescape View File

@ -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;

6
channels/chan_iax2.c
Unescape View File

@ -4952,8 +4952,8 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
iax_ie_append_str(&ied, IAX_IE_LANGUAGE, c->language);
if (!ast_strlen_zero(c->cid.cid_dnid))
iax_ie_append_str(&ied, IAX_IE_DNID, c->cid.cid_dnid);
if (!ast_strlen_zero(c->cid.cid_rdnis))
iax_ie_append_str(&ied, IAX_IE_RDNIS, c->cid.cid_rdnis);
if (!ast_strlen_zero(c->redirecting.from.number))
iax_ie_append_str(&ied, IAX_IE_RDNIS, c->redirecting.from.number);
if (pds.context)
iax_ie_append_str(&ied, IAX_IE_CALLED_CONTEXT, pds.context);
@ -5549,7 +5549,7 @@ static struct ast_channel *ast_iax2_new(int callno, int state, format_t capabili
else
tmp->cid.cid_ani = ast_strdup(i->cid_num);
tmp->cid.cid_dnid = ast_strdup(i->dnid);
tmp->cid.cid_rdnis = ast_strdup(i->rdnis);
tmp->redirecting.from.number = ast_strdup(i->rdnis);
tmp->cid.cid_pres = i->calling_pres;
tmp->cid.cid_ton = i->calling_ton;
tmp->cid.cid_tns = i->calling_tns;

20
channels/chan_local.c
Unescape View File

@ -574,21 +574,15 @@ start_over:
* All these failure points just return -1. The individual strings will
* be cleared when we destroy the channel.
*/
if (p->owner->cid.cid_rdnis) {
if (!(p->chan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis))) {
ast_mutex_unlock(&p->lock);
ast_channel_unlock(p->chan);
return -1;
}
}
ast_party_redirecting_copy(&p->chan->redirecting, &p->owner->redirecting);
if (p->owner->cid.cid_dnid) {
if (!(p->chan->cid.cid_dnid = ast_strdup(p->owner->cid.cid_dnid))) {
ast_mutex_unlock(&p->lock);
ast_channel_unlock(p->chan);
return -1;
}
ast_free(p->chan->cid.cid_dnid);
p->chan->cid.cid_dnid = ast_strdup(p->owner->cid.cid_dnid);
if (!p->chan->cid.cid_dnid && p->owner->cid.cid_dnid) {
/* Allocation failure */
ast_mutex_unlock(&p->lock);
ast_channel_unlock(p->chan);
return -1;
}
p->chan->cid.cid_tns = p->owner->cid.cid_tns;

2
channels/chan_misdn.c
Unescape View File

@ -6090,7 +6090,7 @@ static void misdn_update_connected_line(struct ast_channel *ast, struct misdn_bc
static void misdn_copy_redirecting_from_ast(struct misdn_bchannel *bc, struct ast_channel *ast)
{
ast_copy_string(bc->redirecting.from.name, S_OR(ast->redirecting.from.name, ""), sizeof(bc->redirecting.from.name));
ast_copy_string(bc->redirecting.from.number, S_OR(ast->cid.cid_rdnis, ""), sizeof(bc->redirecting.from.number));
ast_copy_string(bc->redirecting.from.number, S_OR(ast->redirecting.from.number, ""), sizeof(bc->redirecting.from.number));
bc->redirecting.from.presentation = ast_to_misdn_pres(ast->redirecting.from.number_presentation);
bc->redirecting.from.screening = ast_to_misdn_screen(ast->redirecting.from.number_presentation);
bc->redirecting.from.number_type = ast_to_misdn_ton(ast->redirecting.from.number_type);

3
channels/chan_oss.c
Unescape View File

@ -601,7 +601,8 @@ static int oss_call(struct ast_channel *c, char *dest, int timeout)
AST_NONSTANDARD_APP_ARGS(args, parse, '/');
ast_verbose(" << Call to device '%s' dnid '%s' rdnis '%s' on console from '%s' <%s> >>\n", dest, c->cid.cid_dnid, c->cid.cid_rdnis, c->cid.cid_name, c->cid.cid_num);
ast_verbose(" << Call to device '%s' dnid '%s' rdnis '%s' on console from '%s' <%s> >>\n",
dest, c->cid.cid_dnid, c->redirecting.from.number, c->cid.cid_name, c->cid.cid_num);
if (!ast_strlen_zero(args.flags) && strcasecmp(args.flags, "answer") == 0) {
f.subclass.integer = AST_CONTROL_ANSWER;
ast_queue_frame(c, &f);

4
channels/chan_sip.c
Unescape View File

@ -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);

13
channels/sig_pri.c
Unescape View File

@ -665,19 +665,14 @@ static void sig_pri_party_id_from_ast(struct pri_party_id *pri_id, const struct
static void sig_pri_redirecting_update(struct sig_pri_chan *pvt, struct ast_channel *ast)
{
struct pri_party_redirecting pri_redirecting;
struct ast_party_redirecting ast_redirecting;
/* Gather asterisk redirecting data */
ast_redirecting = ast->redirecting;
ast_redirecting.from.number = ast->cid.cid_rdnis;
/*! \todo XXX Original called data can be put in a channel data store that is inherited. */
memset(&pri_redirecting, 0, sizeof(pri_redirecting));
sig_pri_party_id_from_ast(&pri_redirecting.from, &ast_redirecting.from);
sig_pri_party_id_from_ast(&pri_redirecting.to, &ast_redirecting.to);
pri_redirecting.count = ast_redirecting.count;
pri_redirecting.reason = ast_to_pri_reason(ast_redirecting.reason);
sig_pri_party_id_from_ast(&pri_redirecting.from, &ast->redirecting.from);
sig_pri_party_id_from_ast(&pri_redirecting.to, &ast->redirecting.to);
pri_redirecting.count = ast->redirecting.count;
pri_redirecting.reason = ast_to_pri_reason(ast->redirecting.reason);
pri_redirecting_update(pvt->pri->pri, pvt->call, &pri_redirecting);
}

10
funcs/func_callerid.c
Unescape View File

@ -209,8 +209,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
}
}
} else if (!strncasecmp("rdnis", data, 5)) {
if (chan->cid.cid_rdnis) {
ast_copy_string(buf, chan->cid.cid_rdnis, len);
if (chan->redirecting.from.number) {
ast_copy_string(buf, chan->redirecting.from.number, len);
}
} else if (!strncasecmp("pres", data, 4)) {
ast_copy_string(buf, ast_named_caller_presentation(chan->cid.cid_pres), len);
@ -311,10 +311,8 @@ static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
ast_channel_unlock(chan);
} else if (!strncasecmp("rdnis", data, 5)) {
ast_channel_lock(chan);
if (chan->cid.cid_rdnis) {
ast_free(chan->cid.cid_rdnis);
}
chan->cid.cid_rdnis = ast_strdup(value);
ast_free(chan->redirecting.from.number);
chan->redirecting.from.number = ast_strdup(value);
if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan);
}

6
funcs/func_redirecting.c
Unescape View File

@ -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;

13
include/asterisk/channel.h
Unescape View File

@ -256,12 +256,6 @@ struct ast_callerid {
*/
char *cid_ani;
/*!
* \brief Malloc'd Redirecting Directory Number Information Service (RDNIS)
* (Field will eventually move to struct ast_channel.redirecting.from.number)
*/
char *cid_rdnis;
/*!
* \brief Callerid Q.931 encoded number presentation/screening fields
* (Field will eventually move to struct ast_channel.caller.id.number_presentation)
@ -700,12 +694,7 @@ struct ast_channel {
*/
struct ast_party_connected_line connected;
/*!
* \brief Redirecting/Diversion information
* \note Until struct ast_channel.cid.cid_rdnis is replaced
* with ast_channel.redirecting.from.number, the
* ast_channel.redirecting.from.number field is not used.
*/
/*! \brief Redirecting/Diversion information */
struct ast_party_redirecting redirecting;
struct ast_frame dtmff; /*!< DTMF frame */

4
main/cel.c
Unescape View File

@ -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,

16
main/channel.c
Unescape View File

@ -1464,9 +1464,7 @@ static void free_cid(struct ast_callerid *cid)
ast_free(cid->cid_name);
if (cid->cid_ani)
ast_free(cid->cid_ani);
if (cid->cid_rdnis)
ast_free(cid->cid_rdnis);
cid->cid_dnid = cid->cid_num = cid->cid_name = cid->cid_ani = cid->cid_rdnis = NULL;
cid->cid_dnid = cid->cid_num = cid->cid_name = cid->cid_ani = NULL;
ast_party_subaddress_free(&cid->subaddress);
ast_party_subaddress_free(&cid->dialed_subaddress);
}
@ -6973,18 +6971,6 @@ void ast_channel_set_redirecting(struct ast_channel *chan, const struct ast_part
ast_channel_lock(chan);
ast_party_id_set(&chan->redirecting.from, &redirecting->from);
if (redirecting->from.number
&& redirecting->from.number != chan->redirecting.from.number) {
/*
* Must move string to ast_channel.cid.cid_rdnis until it goes away.
*/
if (chan->cid.cid_rdnis) {
ast_free(chan->cid.cid_rdnis);
}
chan->cid.cid_rdnis = chan->redirecting.from.number;
chan->redirecting.from.number = NULL;
}
ast_party_id_set(&chan->redirecting.to, &redirecting->to);
chan->redirecting.reason = redirecting->reason;
chan->redirecting.count = redirecting->count;

10
main/dial.c
Unescape View File

@ -174,15 +174,6 @@ static const struct ast_option_types {
{ AST_DIAL_OPTION_MAX, NULL, NULL }, /*!< Terminator of list */
};
/*! \brief free the buffer if allocated, and set the pointer to the second arg */
#define S_REPLACE(s, new_val) \
do { \
if (s) { \
free(s); \
} \
s = (new_val); \
} while (0)
/*! \brief Maximum number of channels we can watch at a time */
#define AST_MAX_WATCHERS 256
@ -275,7 +266,6 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann
ast_channel_datastore_inherit(chan, channel->owner);
/* Copy over callerid information */
S_REPLACE(channel->owner->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
ast_party_redirecting_copy(&channel->owner->redirecting, &chan->redirecting);
channel->owner->cid.cid_tns = chan->cid.cid_tns;

2
res/res_agi.c
Unescape View File

@ -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);

4
res/snmp/agent.c
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save