[svn-commits] rmudgett: branch rmudgett/ani r276350 - in /team/rmudgett/ani: apps/ channels...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jul 14 11:11:21 CDT 2010
Author: rmudgett
Date: Wed Jul 14 11:11:09 2010
New Revision: 276350
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276350
Log:
Rename XXX_name and XXX_number in preparation for merging.
Modified:
team/rmudgett/ani/apps/app_amd.c
team/rmudgett/ani/channels/chan_dahdi.c
team/rmudgett/ani/channels/chan_h323.c
team/rmudgett/ani/channels/chan_iax2.c
team/rmudgett/ani/channels/chan_jingle.c
team/rmudgett/ani/channels/chan_mgcp.c
team/rmudgett/ani/channels/chan_misdn.c
team/rmudgett/ani/channels/chan_oss.c
team/rmudgett/ani/channels/chan_phone.c
team/rmudgett/ani/channels/chan_sip.c
team/rmudgett/ani/channels/chan_skinny.c
team/rmudgett/ani/channels/chan_usbradio.c
team/rmudgett/ani/channels/chan_vpb.cc
team/rmudgett/ani/channels/sig_analog.c
team/rmudgett/ani/channels/sig_pri.c
team/rmudgett/ani/channels/sig_ss7.c
team/rmudgett/ani/main/cdr.c
team/rmudgett/ani/main/cel.c
team/rmudgett/ani/main/channel.c
team/rmudgett/ani/res/snmp/agent.c
Modified: team/rmudgett/ani/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/apps/app_amd.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/apps/app_amd.c (original)
+++ team/rmudgett/ani/apps/app_amd.c Wed Jul 14 11:11:09 2010
@@ -189,7 +189,7 @@
);
ast_verb(3, "AMD: %s %s %s (Fmt: %s)\n", chan->name,
- S_COR(chan->caller.ani.XXX_number.valid, chan->caller.ani.XXX_number.str, "(N/A)"),
+ S_COR(chan->caller.ani.number.valid, chan->caller.ani.number.str, "(N/A)"),
S_COR(chan->redirecting.from.number.valid, chan->redirecting.from.number.str, "(N/A)"),
ast_getformatname(chan->readformat));
Modified: team/rmudgett/ani/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_dahdi.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_dahdi.c (original)
+++ team/rmudgett/ani/channels/chan_dahdi.c Wed Jul 14 11:11:09 2010
@@ -2932,7 +2932,7 @@
ast_copy_string(p->cid_tag, caller->id.tag, sizeof(p->cid_tag));
}
ast_copy_string(p->cid_ani,
- S_COR(caller->ani.XXX_number.valid, caller->ani.XXX_number.str, ""),
+ S_COR(caller->ani.number.valid, caller->ani.number.str, ""),
sizeof(p->cid_ani));
p->cid_ani2 = caller->ani2;
}
@@ -8186,12 +8186,12 @@
switch (p->whichwink) {
case 0:
ast_debug(1, "ANI2 set to '%d' and ANI is '%s'\n", p->owner->caller.ani2,
- S_COR(p->owner->caller.ani.XXX_number.valid,
- p->owner->caller.ani.XXX_number.str, ""));
+ S_COR(p->owner->caller.ani.number.valid,
+ p->owner->caller.ani.number.str, ""));
snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%d%s#",
p->owner->caller.ani2,
- S_COR(p->owner->caller.ani.XXX_number.valid,
- p->owner->caller.ani.XXX_number.str, ""));
+ S_COR(p->owner->caller.ani.number.valid,
+ p->owner->caller.ani.number.str, ""));
break;
case 1:
ast_copy_string(p->dop.dialstr, p->finaldial, sizeof(p->dop.dialstr));
@@ -9203,16 +9203,16 @@
* generate a needless NewCallerID event */
#if defined(HAVE_PRI) || defined(HAVE_SS7)
if (!ast_strlen_zero(i->cid_ani)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_ani);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_ani);
} else if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
#else
if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
tmp->caller.id.name.presentation = i->callingpres;
Modified: team/rmudgett/ani/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_h323.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_h323.c (original)
+++ team/rmudgett/ani/channels/chan_h323.c Wed Jul 14 11:11:09 2010
@@ -1083,8 +1083,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(cid_num)) {
- ch->caller.ani.XXX_number.valid = 1;
- ch->caller.ani.XXX_number.str = ast_strdup(cid_num);
+ ch->caller.ani.number.valid = 1;
+ ch->caller.ani.number.str = ast_strdup(cid_num);
}
if (pvt->cd.redirect_reason >= 0) {
Modified: team/rmudgett/ani/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_iax2.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_iax2.c (original)
+++ team/rmudgett/ani/channels/chan_iax2.c Wed Jul 14 11:11:09 2010
@@ -4972,9 +4972,9 @@
if (n)
iax_ie_append_str(&ied, IAX_IE_CALLING_NAME, n);
if (ast_test_flag64(iaxs[callno], IAX_SENDANI)
- && c->connected.ani.XXX_number.valid
- && c->connected.ani.XXX_number.str) {
- iax_ie_append_str(&ied, IAX_IE_CALLING_ANI, c->connected.ani.XXX_number.str);
+ && c->connected.ani.number.valid
+ && c->connected.ani.number.str) {
+ iax_ie_append_str(&ied, IAX_IE_CALLING_ANI, c->connected.ani.number.str);
}
if (!ast_strlen_zero(c->language))
@@ -5607,11 +5607,11 @@
/* Don't use ast_set_callerid() here because it will
* generate a NewCallerID event before the NewChannel event */
if (!ast_strlen_zero(i->ani)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->ani);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->ani);
} else if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
tmp->dialed.number.str = ast_strdup(i->dnid);
tmp->redirecting.from.number.valid = 1;
Modified: team/rmudgett/ani/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_jingle.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_jingle.c (original)
+++ team/rmudgett/ani/channels/chan_jingle.c Wed Jul 14 11:11:09 2010
@@ -869,8 +869,8 @@
/* Don't use ast_set_callerid() here because it will
* generate an unnecessary NewCallerID event */
if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) {
tmp->dialed.number.str = ast_strdup(i->exten);
Modified: team/rmudgett/ani/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_mgcp.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_mgcp.c (original)
+++ team/rmudgett/ani/channels/chan_mgcp.c Wed Jul 14 11:11:09 2010
@@ -1534,8 +1534,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
if (!i->adsi) {
@@ -3005,7 +3005,7 @@
ast_set_callerid(chan,
p->hidecallerid ? "" : p->cid_num,
p->hidecallerid ? "" : p->cid_name,
- chan->caller.ani.XXX_number.valid ? NULL : p->cid_num);
+ chan->caller.ani.number.valid ? NULL : p->cid_num);
ast_setstate(chan, AST_STATE_RING);
/*dahdi_enable_ec(p);*/
if (p->dtmfmode & MGCP_DTMF_HYBRID) {
Modified: team/rmudgett/ani/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_misdn.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_misdn.c (original)
+++ team/rmudgett/ani/channels/chan_misdn.c Wed Jul 14 11:11:09 2010
@@ -7942,8 +7942,8 @@
if (!ast_strlen_zero(cid_num)) {
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(cid_num);
}
if (pipe(chlist->pipe) < 0) {
Modified: team/rmudgett/ani/channels/chan_oss.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_oss.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_oss.c (original)
+++ team/rmudgett/ani/channels/chan_oss.c Wed Jul 14 11:11:09 2010
@@ -808,8 +808,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(o->cid_num)) {
- c->caller.ani.XXX_number.valid = 1;
- c->caller.ani.XXX_number.str = ast_strdup(o->cid_num);
+ c->caller.ani.number.valid = 1;
+ c->caller.ani.number.str = ast_strdup(o->cid_num);
}
if (!ast_strlen_zero(ext)) {
c->dialed.number.str = ast_strdup(ext);
Modified: team/rmudgett/ani/channels/chan_phone.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_phone.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_phone.c (original)
+++ team/rmudgett/ani/channels/chan_phone.c Wed Jul 14 11:11:09 2010
@@ -889,8 +889,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a NewCallerID event before the NewChannel event */
if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
i->owner = tmp;
Modified: team/rmudgett/ani/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_sip.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_sip.c (original)
+++ team/rmudgett/ani/channels/chan_sip.c Wed Jul 14 11:11:09 2010
@@ -6514,8 +6514,8 @@
/* Don't use ast_set_callerid() here because it will
* generate an unnecessary NewCallerID event */
if (!ast_strlen_zero(i->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(i->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(i->cid_num);
}
if (!ast_strlen_zero(i->rdnis)) {
tmp->redirecting.from.number.valid = 1;
Modified: team/rmudgett/ani/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_skinny.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_skinny.c (original)
+++ team/rmudgett/ani/channels/chan_skinny.c Wed Jul 14 11:11:09 2010
@@ -3774,7 +3774,7 @@
ast_set_callerid(c,
l->hidecallerid ? "" : l->cid_num,
l->hidecallerid ? "" : l->cid_name,
- c->caller.ani.XXX_number.valid ? NULL : l->cid_num);
+ c->caller.ani.number.valid ? NULL : l->cid_num);
#if 1 /* XXX This code is probably not necessary */
ast_party_number_free(&c->connected.id.number);
ast_party_number_init(&c->connected.id.number);
@@ -4574,8 +4574,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(l->cid_num)) {
- tmp->caller.ani.XXX_number.valid = 1;
- tmp->caller.ani.XXX_number.str = ast_strdup(l->cid_num);
+ tmp->caller.ani.number.valid = 1;
+ tmp->caller.ani.number.str = ast_strdup(l->cid_num);
}
tmp->priority = 1;
Modified: team/rmudgett/ani/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_usbradio.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_usbradio.c (original)
+++ team/rmudgett/ani/channels/chan_usbradio.c Wed Jul 14 11:11:09 2010
@@ -2202,8 +2202,8 @@
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(o->cid_num)) {
- c->caller.ani.XXX_number.valid = 1;
- c->caller.ani.XXX_number.str = ast_strdup(o->cid_num);
+ c->caller.ani.number.valid = 1;
+ c->caller.ani.number.str = ast_strdup(o->cid_num);
}
if (!ast_strlen_zero(ext)) {
c->dialed.number.str = ast_strdup(ext);
Modified: team/rmudgett/ani/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/chan_vpb.cc?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/chan_vpb.cc (original)
+++ team/rmudgett/ani/channels/chan_vpb.cc Wed Jul 14 11:11:09 2010
@@ -788,7 +788,7 @@
ast_shrink_phone_number(number);
ast_set_callerid(owner,
number, name,
- owner->caller.ani.XXX_number.valid ? NULL : number);
+ owner->caller.ani.number.valid ? NULL : number);
if (!ast_strlen_zero(name)){
snprintf(p->callerid, sizeof(p->callerid), "%s %s", number, name);
} else {
Modified: team/rmudgett/ani/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/sig_analog.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/sig_analog.c (original)
+++ team/rmudgett/ani/channels/sig_analog.c Wed Jul 14 11:11:09 2010
@@ -3039,12 +3039,12 @@
switch (p->whichwink) {
case 0:
ast_debug(1, "ANI2 set to '%d' and ANI is '%s'\n", p->owner->caller.ani2,
- S_COR(p->owner->caller.ani.XXX_number.valid,
- p->owner->caller.ani.XXX_number.str, ""));
+ S_COR(p->owner->caller.ani.number.valid,
+ p->owner->caller.ani.number.str, ""));
snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%d%s#",
p->owner->caller.ani2,
- S_COR(p->owner->caller.ani.XXX_number.valid,
- p->owner->caller.ani.XXX_number.str, ""));
+ S_COR(p->owner->caller.ani.number.valid,
+ p->owner->caller.ani.number.str, ""));
break;
case 1:
ast_copy_string(p->dop.dialstr, p->finaldial, sizeof(p->dop.dialstr));
Modified: team/rmudgett/ani/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/sig_pri.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/sig_pri.c (original)
+++ team/rmudgett/ani/channels/sig_pri.c Wed Jul 14 11:11:09 2010
@@ -224,10 +224,10 @@
}
caller.id.tag = p->user_tag;
- caller.ani.XXX_number.str = p->cid_ani;
- //caller.ani.XXX_number.plan = p->xxx;
- //caller.ani.XXX_number.presentation = p->xxx;
- caller.ani.XXX_number.valid = 1;
+ caller.ani.number.str = p->cid_ani;
+ //caller.ani.number.plan = p->xxx;
+ //caller.ani.number.presentation = p->xxx;
+ caller.ani.number.valid = 1;
caller.ani2 = p->cid_ani2;
p->calls->set_callerid(p->chan_pvt, &caller);
Modified: team/rmudgett/ani/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/channels/sig_ss7.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/channels/sig_ss7.c (original)
+++ team/rmudgett/ani/channels/sig_ss7.c Wed Jul 14 11:11:09 2010
@@ -141,10 +141,10 @@
caller.id.subaddress.str = p->cid_subaddr;
}
- caller.ani.XXX_number.str = p->cid_ani;
- //caller.ani.XXX_number.plan = p->xxx;
- //caller.ani.XXX_number.presentation = p->xxx;
- caller.ani.XXX_number.valid = 1;
+ caller.ani.number.str = p->cid_ani;
+ //caller.ani.number.plan = p->xxx;
+ //caller.ani.number.presentation = p->xxx;
+ caller.ani.number.valid = 1;
caller.ani2 = p->cid_ani2;
p->calls->set_callerid(p->chan_pvt, &caller);
Modified: team/rmudgett/ani/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/main/cdr.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/main/cdr.c (original)
+++ team/rmudgett/ani/main/cdr.c Wed Jul 14 11:11:09 2010
@@ -853,7 +853,7 @@
}
/* Grab source from ANI or normal Caller*ID */
- num = S_COR(c->caller.ani.XXX_number.valid, c->caller.ani.XXX_number.str,
+ num = S_COR(c->caller.ani.number.valid, c->caller.ani.number.str,
S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL));
ast_callerid_merge(cdr->clid, sizeof(cdr->clid),
S_COR(c->caller.id.name.valid, c->caller.id.name.str, NULL), num, "");
Modified: team/rmudgett/ani/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/main/cel.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/main/cel.c (original)
+++ team/rmudgett/ani/main/cel.c Wed Jul 14 11:11:09 2010
@@ -441,8 +441,8 @@
tchan->caller.id.name.str = ast_strdup(record.caller_id_name);
tchan->caller.id.number.valid = 1;
tchan->caller.id.number.str = ast_strdup(record.caller_id_num);
- tchan->caller.ani.XXX_number.valid = 1;
- tchan->caller.ani.XXX_number.str = ast_strdup(record.caller_id_ani);
+ tchan->caller.ani.number.valid = 1;
+ tchan->caller.ani.number.str = ast_strdup(record.caller_id_ani);
tchan->redirecting.from.number.valid = 1;
tchan->redirecting.from.number.str = ast_strdup(record.caller_id_rdnis);
tchan->dialed.number.str = ast_strdup(record.caller_id_dnid);
@@ -539,7 +539,7 @@
AST_EVENT_IE_CEL_CIDNUM, AST_EVENT_IE_PLTYPE_STR,
S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""),
AST_EVENT_IE_CEL_CIDANI, AST_EVENT_IE_PLTYPE_STR,
- S_COR(chan->caller.ani.XXX_number.valid, chan->caller.ani.XXX_number.str, ""),
+ S_COR(chan->caller.ani.number.valid, chan->caller.ani.number.str, ""),
AST_EVENT_IE_CEL_CIDRDNIS, AST_EVENT_IE_PLTYPE_STR,
S_COR(chan->redirecting.from.number.valid, chan->redirecting.from.number.str, ""),
AST_EVENT_IE_CEL_CIDDNID, AST_EVENT_IE_PLTYPE_STR,
Modified: team/rmudgett/ani/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/main/channel.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/main/channel.c (original)
+++ team/rmudgett/ani/main/channel.c Wed Jul 14 11:11:09 2010
@@ -6185,9 +6185,9 @@
chan->caller.id.name.str = ast_strdup(cid_name);
}
if (cid_ani) {
- chan->caller.ani.XXX_number.valid = 1;
- ast_free(chan->caller.ani.XXX_number.str);
- chan->caller.ani.XXX_number.str = ast_strdup(cid_ani);
+ chan->caller.ani.number.valid = 1;
+ ast_free(chan->caller.ani.number.str);
+ chan->caller.ani.number.str = ast_strdup(cid_ani);
}
report_new_callerid(chan);
Modified: team/rmudgett/ani/res/snmp/agent.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ani/res/snmp/agent.c?view=diff&rev=276350&r1=276349&r2=276350
==============================================================================
--- team/rmudgett/ani/res/snmp/agent.c (original)
+++ team/rmudgett/ani/res/snmp/agent.c Wed Jul 14 11:11:09 2010
@@ -443,8 +443,8 @@
}
break;
case ASTCHANCIDANI:
- if (chan->caller.ani.XXX_number.valid && chan->caller.ani.XXX_number.str) {
- strncpy(string_ret, chan->caller.ani.XXX_number.str, sizeof(string_ret));
+ if (chan->caller.ani.number.valid && chan->caller.ani.number.str) {
+ strncpy(string_ret, chan->caller.ani.number.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
More information about the svn-commits
mailing list