[svn-commits] rmudgett: branch group/issue14068 r189076 - /team/group/issue14068/channels/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Apr 17 14:34:50 2009
New Revision: 189076

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189076
Log:
New names for new public identifiers.

Modified:
    team/group/issue14068/channels/chan_dahdi.c

Modified: team/group/issue14068/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue14068/channels/chan_dahdi.c?view=diff&rev=189076&r1=189075&r2=189076
==============================================================================
--- team/group/issue14068/channels/chan_dahdi.c (original)
+++ team/group/issue14068/channels/chan_dahdi.c Fri Apr 17 14:34:50 2009
@@ -13564,50 +13564,50 @@
 
 						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);
+									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->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));
+									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);
+									redirecting.reason = pri_to_ast_reason(cmdr->party.reason);
 									ast_channel_queue_redirecting_update(owner, &redirecting);
 								}
 								break;