[asterisk-commits] rmudgett: branch rmudgett/cid r263636 - in /team/rmudgett/cid: apps/ channels...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 17 16:27:27 CDT 2010
Author: rmudgett
Date: Mon May 17 16:27:23 2010
New Revision: 263636
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=263636
Log:
Move ast_channel.cid.cid_tns to ast_channel.dialed.transit_network_select.
Modified:
team/rmudgett/cid/apps/app_dial.c
team/rmudgett/cid/apps/app_queue.c
team/rmudgett/cid/channels/chan_iax2.c
team/rmudgett/cid/include/asterisk/channel.h
team/rmudgett/cid/main/dial.c
team/rmudgett/cid/main/pbx.c
team/rmudgett/cid/res/res_agi.c
team/rmudgett/cid/res/snmp/agent.c
team/rmudgett/cid/tests/test_substitution.c
Modified: team/rmudgett/cid/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/apps/app_dial.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/apps/app_dial.c (original)
+++ team/rmudgett/cid/apps/app_dial.c Mon May 17 16:27:23 2010
@@ -868,7 +868,7 @@
ast_strdup(S_OR(in->macroexten, in->exten)));
}
- c->cid.cid_tns = in->cid.cid_tns;
+ c->dialed.transit_network_select = in->dialed.transit_network_select;
if (ast_test_flag64(o, OPT_FORCECLID)) {
S_REPLACE(c->cid.cid_num, ast_strdup(S_OR(in->macroexten, in->exten)));
@@ -2060,7 +2060,7 @@
ast_party_redirecting_copy(&tc->redirecting, &chan->redirecting);
- tc->cid.cid_tns = chan->cid.cid_tns;
+ tc->dialed.transit_network_select = chan->dialed.transit_network_select;
if (!ast_strlen_zero(chan->accountcode)) {
ast_string_field_set(tc, peeraccount, chan->accountcode);
Modified: team/rmudgett/cid/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/apps/app_queue.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/apps/app_queue.c (original)
+++ team/rmudgett/cid/apps/app_queue.c Mon May 17 16:27:23 2010
@@ -2875,7 +2875,7 @@
ast_party_redirecting_copy(&tmp->chan->redirecting, &qe->chan->redirecting);
- tmp->chan->cid.cid_tns = qe->chan->cid.cid_tns;
+ tmp->chan->dialed.transit_network_select = qe->chan->dialed.transit_network_select;
ast_connected_line_copy_from_caller(&tmp->chan->connected, &qe->chan->cid);
@@ -3369,7 +3369,7 @@
ast_strdup(S_OR(in->macroexten, in->exten));
}
- o->chan->cid.cid_tns = in->cid.cid_tns;
+ o->chan->dialed.transit_network_select = in->dialed.transit_network_select;
ast_party_caller_copy(&o->chan->cid, &in->cid);
ast_party_connected_line_copy(&o->chan->connected, &original->connected);
Modified: team/rmudgett/cid/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/channels/chan_iax2.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/channels/chan_iax2.c (original)
+++ team/rmudgett/cid/channels/chan_iax2.c Mon May 17 16:27:23 2010
@@ -4941,7 +4941,7 @@
}
iax_ie_append_byte(&ied, IAX_IE_CALLINGTON, c->connected.id.number_type);
- iax_ie_append_short(&ied, IAX_IE_CALLINGTNS, c->cid.cid_tns);
+ iax_ie_append_short(&ied, IAX_IE_CALLINGTNS, c->dialed.transit_network_select);
if (n)
iax_ie_append_str(&ied, IAX_IE_CALLING_NAME, n);
@@ -5552,7 +5552,7 @@
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;
+ tmp->dialed.transit_network_select = i->calling_tns;
if (!ast_strlen_zero(i->language))
ast_string_field_set(tmp, language, i->language);
if (!ast_strlen_zero(i->accountcode))
Modified: team/rmudgett/cid/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/include/asterisk/channel.h?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/include/asterisk/channel.h (original)
+++ team/rmudgett/cid/include/asterisk/channel.h Mon May 17 16:27:23 2010
@@ -340,14 +340,6 @@
* (Field will eventually move to struct ast_channel.caller.id.number_type)
*/
int cid_ton;
-
- /*!
- * \brief Callerid Transit Network Select
- * \note Currently this value is just passed around the system.
- * You can read it and set it but it is never used for anything.
- * (Field will eventually move to struct ast_channel.dialed.transit_network_select)
- */
- int cid_tns;
/*!
* \brief Callerid "Tag"
Modified: team/rmudgett/cid/main/dial.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/dial.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/main/dial.c (original)
+++ team/rmudgett/cid/main/dial.c Mon May 17 16:27:23 2010
@@ -268,7 +268,7 @@
/* Copy over callerid information */
ast_party_redirecting_copy(&channel->owner->redirecting, &chan->redirecting);
- channel->owner->cid.cid_tns = chan->cid.cid_tns;
+ channel->owner->dialed.transit_network_select = chan->dialed.transit_network_select;
ast_connected_line_copy_from_caller(&channel->owner->connected, &chan->cid);
Modified: team/rmudgett/cid/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/pbx.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/main/pbx.c (original)
+++ team/rmudgett/cid/main/pbx.c Mon May 17 16:27:23 2010
@@ -3020,7 +3020,7 @@
ast_str_set(str, maxlen, "%d", c->cid.cid_ton);
s = ast_str_buffer(*str);
} else if (!strcmp(var + 7, "TNS")) { /* CALLINGTNS */
- ast_str_set(str, maxlen, "%d", c->cid.cid_tns);
+ ast_str_set(str, maxlen, "%d", c->dialed.transit_network_select);
s = ast_str_buffer(*str);
}
}
Modified: team/rmudgett/cid/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/res/res_agi.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/res/res_agi.c (original)
+++ team/rmudgett/cid/res/res_agi.c Mon May 17 16:27:23 2010
@@ -1631,7 +1631,7 @@
ast_agi_send(fd, chan, "agi_callingpres: %d\n", chan->cid.cid_pres);
ast_agi_send(fd, chan, "agi_callingani2: %d\n", chan->cid.cid_ani2);
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_callingtns: %d\n", chan->dialed.transit_network_select);
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->redirecting.from.number, "unknown"));
Modified: team/rmudgett/cid/res/snmp/agent.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/res/snmp/agent.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/res/snmp/agent.c (original)
+++ team/rmudgett/cid/res/snmp/agent.c Mon May 17 16:27:23 2010
@@ -471,7 +471,7 @@
ret = (u_char *)&long_ret;
break;
case ASTCHANCIDTNS:
- long_ret = chan->cid.cid_tns;
+ long_ret = chan->dialed.transit_network_select;
ret = (u_char *)&long_ret;
break;
case ASTCHANAMAFLAGS:
Modified: team/rmudgett/cid/tests/test_substitution.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/tests/test_substitution.c?view=diff&rev=263636&r1=263635&r2=263636
==============================================================================
--- team/rmudgett/cid/tests/test_substitution.c (original)
+++ team/rmudgett/cid/tests/test_substitution.c Mon May 17 16:27:23 2010
@@ -223,7 +223,7 @@
TEST(test_chan_integer(test, c, &c->cid.cid_pres, "${CALLINGPRES}"));
TEST(test_chan_integer(test, c, &c->cid.cid_ani2, "${CALLINGANI2}"));
TEST(test_chan_integer(test, c, &c->cid.cid_ton, "${CALLINGTON}"));
- TEST(test_chan_integer(test, c, &c->cid.cid_tns, "${CALLINGTNS}"));
+ TEST(test_chan_integer(test, c, &c->dialed.transit_network_select, "${CALLINGTNS}"));
TEST(test_chan_integer(test, c, &c->hangupcause, "${HANGUPCAUSE}"));
TEST(test_chan_integer(test, c, &c->priority, "${PRIORITY}"));
TEST(test_chan_string(test, c, c->context, sizeof(c->context), "${CONTEXT}"));
More information about the asterisk-commits
mailing list