[svn-commits] rmudgett: branch group/issue14292 r189109 - in /team/group/issue14292: ./ cha...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Apr 17 15:22:51 CDT 2009
Author: rmudgett
Date: Fri Apr 17 15:22:45 2009
New Revision: 189109
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189109
Log:
Merged revisions 189072,189076 via svnmerge from
https://origsvn.digium.com/svn/asterisk/team/group/issue14068
........
r189072 | rmudgett | 2009-04-17 13:15:24 -0500 (Fri, 17 Apr 2009) | 1 line
Updated to new issue8824 function names.
........
r189076 | rmudgett | 2009-04-17 14:34:50 -0500 (Fri, 17 Apr 2009) | 1 line
New names for new public identifiers.
........
Modified:
team/group/issue14292/ (props changed)
team/group/issue14292/channels/chan_dahdi.c
Propchange: team/group/issue14292/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- issue14292-integrated (original)
+++ issue14292-integrated Fri Apr 17 15:22:45 2009
@@ -1,1 +1,1 @@
-/team/group/issue14068:1-189022
+/team/group/issue14068:1-189077
Modified: team/group/issue14292/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue14292/channels/chan_dahdi.c?view=diff&rev=189109&r1=189108&r2=189109
==============================================================================
--- team/group/issue14292/channels/chan_dahdi.c (original)
+++ team/group/issue14292/channels/chan_dahdi.c Fri Apr 17 15:22:45 2009
@@ -14496,7 +14496,7 @@
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
if (c && (redirecting.from.number || redirecting.from.name)) {
- ast_set_redirecting(c, &redirecting);
+ ast_channel_set_redirecting(c, &redirecting);
}
if (!ast_strlen_zero(e->ring.callingsubaddr)) {
pbx_builtin_setvar_helper(c, "CALLINGSUBADDR", e->ring.callingsubaddr);
@@ -14546,7 +14546,7 @@
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
if (redirecting.from.number || redirecting.from.name) {
- ast_set_redirecting(c, &redirecting);
+ ast_channel_set_redirecting(c, &redirecting);
}
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%d", e->ring.ani2);
@@ -14657,7 +14657,7 @@
connected.id.number_type = e->ringing.calledplan;
connected.id.number_presentation = pri_to_ast_presentation(e->ringing.calledpres);
connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_queue_connected_line_update(pri->pvts[chanpos]->owner, &connected);
+ ast_channel_queue_connected_line_update(pri->pvts[chanpos]->owner, &connected);
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -14785,10 +14785,10 @@
e->facility.channel, ccbsnronprispan, explicit, channel);
if (channel == 0) {
for (i = 0; i < e->facility.subcmds.counter_subcmd; i++) {
- struct subcommand *subcmd = &e->facility.subcmds.subcmd[i];
+ struct pri_subcommand *subcmd = &e->facility.subcmds.subcmd[i];
switch (subcmd->cmd) {
- case CMD_CC_EXECPOSIBLE_INV:
+ case PRI_SUBCMD_CC_EXECPOSIBLE_INV:
{
int cr = e->facility.cref;
unsigned int state;
@@ -14835,51 +14835,51 @@
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
for (i = 0; i < e->facility.subcmds.counter_subcmd; i++) {
- struct subcommand *subcmd = &e->facility.subcmds.subcmd[i];
+ struct pri_subcommand *subcmd = &e->facility.subcmds.subcmd[i];
struct ast_channel *owner;
switch (subcmd->cmd) {
- case CMD_CONNECTEDLINE:
+ case PRI_SUBCMD_CONNECTED_LINE:
owner = pri->pvts[chanpos]->owner;
if (owner) {
struct ast_party_connected_line connected;
- struct cmd_connectedline *cmdcl;
+ struct pri_subcmd_connected_line *cmdcl;
/* Update the connected line information on the other channel */
ast_party_connected_line_init(&connected);
- cmdcl = &subcmd->connectedline;
- connected.id.number = cmdcl->connected.id.number;
- connected.id.name = cmdcl->connected.id.name;
- connected.id.number_type = cmdcl->connected.id.number_type;
- connected.id.number_presentation = pri_to_ast_presentation(cmdcl->connected.id.number_presentation);
- connected.source = pri_to_ast_connected_line_update_source(cmdcl->connected.source);
- ast_queue_connected_line_update(owner, &connected);
-
- ast_copy_string(pri->pvts[chanpos]->lastcid_num, cmdcl->connected.id.number, sizeof(pri->pvts[chanpos]->lastcid_num));
- ast_copy_string(pri->pvts[chanpos]->lastcid_name, cmdcl->connected.id.name, sizeof(pri->pvts[chanpos]->lastcid_name));
+ cmdcl = &subcmd->connected_line;
+ connected.id.number = cmdcl->party.id.number;
+ connected.id.name = cmdcl->party.id.name;
+ connected.id.number_type = cmdcl->party.id.number_type;
+ connected.id.number_presentation = pri_to_ast_presentation(cmdcl->party.id.number_presentation);
+ connected.source = pri_to_ast_connected_line_update_source(cmdcl->party.source);
+ ast_channel_queue_connected_line_update(owner, &connected);
+
+ ast_copy_string(pri->pvts[chanpos]->lastcid_num, cmdcl->party.id.number, sizeof(pri->pvts[chanpos]->lastcid_num));
+ ast_copy_string(pri->pvts[chanpos]->lastcid_name, cmdcl->party.id.name, sizeof(pri->pvts[chanpos]->lastcid_name));
pri->pvts[chanpos]->subs[SUB_REAL].needcallerid = 1;
//dahdi_enable_ec(pri->pvts[chanpos]);
}
break;
- case CMD_REDIRECTING:
+ case PRI_SUBCMD_REDIRECTING:
owner = pri->pvts[chanpos]->owner;
if (owner) {
struct ast_party_redirecting redirecting = {{0,},};
- struct cmd_redirecting *cmdr;
+ struct pri_subcmd_redirecting *cmdr;
cmdr = &subcmd->redirecting;
- redirecting.from.number = cmdr->redirecting.from.number;
- redirecting.from.name = cmdr->redirecting.from.name;
- redirecting.from.number_type = cmdr->redirecting.from.number_type;
- redirecting.from.number_presentation = pri_to_ast_presentation(cmdr->redirecting.from.number_presentation);
- redirecting.to.number = cmdr->redirecting.to.number;
- redirecting.to.name = cmdr->redirecting.to.name;
- redirecting.to.number_type = cmdr->redirecting.to.number_type;
- redirecting.to.number_presentation = pri_to_ast_presentation(cmdr->redirecting.to.number_presentation);
+ redirecting.from.number = cmdr->party.from.number;
+ redirecting.from.name = cmdr->party.from.name;
+ redirecting.from.number_type = cmdr->party.from.number_type;
+ redirecting.from.number_presentation = pri_to_ast_presentation(cmdr->party.from.number_presentation);
+ redirecting.to.number = cmdr->party.to.number;
+ redirecting.to.name = cmdr->party.to.name;
+ redirecting.to.number_type = cmdr->party.to.number_type;
+ redirecting.to.number_presentation = pri_to_ast_presentation(cmdr->party.to.number_presentation);
redirecting.count = 0;
- redirecting.reason = pri_to_ast_reason(cmdr->redirecting.reason);
- ast_queue_redirecting_update(owner, &redirecting);
+ redirecting.reason = pri_to_ast_reason(cmdr->party.reason);
+ ast_channel_queue_redirecting_update(owner, &redirecting);
}
break;
default:
@@ -14910,10 +14910,10 @@
if (channel == 0) { /* No channel Connection */
for (i = 0; i < e->answer.subcmds.counter_subcmd; i++) {
- struct subcommand *subcmd = &e->answer.subcmds.subcmd[i];
+ struct pri_subcommand *subcmd = &e->answer.subcmds.subcmd[i];
switch (subcmd->cmd) {
- case CMD_CC_CCBSREQUEST_RR:
+ case PRI_SUBCMD_CC_CCBSREQUEST_RR:
{
struct ccbsnr_link *cclink;
unsigned int handle;
@@ -14953,7 +14953,7 @@
break;
}
- case CMD_CC_CCNRREQUEST_RR:
+ case PRI_SUBCMD_CC_CCNRREQUEST_RR:
{
struct ccbsnr_link *cclink;
unsigned int handle;
@@ -15065,7 +15065,7 @@
connected.id.number_type = e->answer.connectedplan;
connected.id.number_presentation = pri_to_ast_presentation(e->answer.connectedpres);
connected.source = pri_to_ast_connected_line_update_source(e->answer.source);
- ast_queue_connected_line_update(owner, &connected);
+ ast_channel_queue_connected_line_update(owner, &connected);
}
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -15094,16 +15094,16 @@
unsigned int state;
for (i = 0; i < e->hangup.subcmds.counter_subcmd; i++) {
- struct subcommand *subcmd = &e->hangup.subcmds.subcmd[i];
+ struct pri_subcommand *subcmd = &e->hangup.subcmds.subcmd[i];
switch (subcmd->cmd) {
- case CMD_CC_ERROR:
+ case PRI_SUBCMD_CC_ERROR:
errorvalue = subcmd->cc_error.error_value;
ast_verb(4,
"Hangup cc-error RR value '%d' on channel %d/%d on span %d\n",
errorvalue, PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span);
break;
- case CMD_CC_CANCEL_INV:
+ case PRI_SUBCMD_CC_CANCEL_INV:
ast_verb(4,
"Hangup cc-cancel INV numberA '%s' numberB '%s' on channel %d/%d on span %d\n",
subcmd->cc_cancel_inv.cc_optional_arg.number_A,
@@ -15208,10 +15208,10 @@
}
#endif
for (i = 0; i < e->hangup.subcmds.counter_subcmd; i++) {
- struct subcommand *subcmd = &e->hangup.subcmds.subcmd[i];
+ struct pri_subcommand *subcmd = &e->hangup.subcmds.subcmd[i];
switch (subcmd->cmd) {
- case CMD_CC_RINGOUT_INV:
+ case PRI_SUBCMD_CC_RINGOUT_INV:
ast_verb(3, "Facility cc-suspend INV on channel %d/%d, span %d\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
break;
More information about the svn-commits
mailing list