[svn-commits] rmudgett: branch rmudgett/cid r264618 - in /team/rmudgett/cid: channels/ incl...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu May 20 11:34:12 2010
New Revision: 264618

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264618
Log:
Move ast_channel.cid.subaddress to ast_channel.caller.id.subaddress.

Modified:
    team/rmudgett/cid/channels/sig_pri.c
    team/rmudgett/cid/include/asterisk/channel.h
    team/rmudgett/cid/main/cdr.c

Modified: team/rmudgett/cid/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/channels/sig_pri.c?view=diff&rev=264618&r1=264617&r2=264618
==============================================================================
--- team/rmudgett/cid/channels/sig_pri.c (original)
+++ team/rmudgett/cid/channels/sig_pri.c Thu May 20 11:34:12 2010
@@ -2352,7 +2352,7 @@
 				pri->pvts[chanpos]->cid_subaddr[0] = '\0';
 #if defined(HAVE_PRI_SUBADDR)
 				if (ast_connected.id.subaddress.valid) {
-					ast_party_subaddress_set(&owner->cid.subaddress,
+					ast_party_subaddress_set(&owner->caller.id.subaddress,
 						&ast_connected.id.subaddress);
 					if (ast_connected.id.subaddress.str) {
 						ast_copy_string(pri->pvts[chanpos]->cid_subaddr,
@@ -3337,7 +3337,7 @@
 									/* Set Calling Subaddress */
 									sig_pri_lock_owner(pri, chanpos);
 									sig_pri_set_subaddress(
-										&pri->pvts[chanpos]->owner->cid.subaddress,
+										&pri->pvts[chanpos]->owner->caller.id.subaddress,
 										&e->ring.calling.subaddress);
 									if (!e->ring.calling.subaddress.type
 										&& !ast_strlen_zero(
@@ -3438,7 +3438,7 @@
 									/* Set Calling Subaddress */
 									sig_pri_lock_owner(pri, chanpos);
 									sig_pri_set_subaddress(
-										&pri->pvts[chanpos]->owner->cid.subaddress,
+										&pri->pvts[chanpos]->owner->caller.id.subaddress,
 										&e->ring.calling.subaddress);
 									if (!e->ring.calling.subaddress.type
 										&& !ast_strlen_zero(

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=264618&r1=264617&r2=264618
==============================================================================
--- team/rmudgett/cid/include/asterisk/channel.h (original)
+++ team/rmudgett/cid/include/asterisk/channel.h Thu May 20 11:34:12 2010
@@ -346,12 +346,6 @@
 	 * (Field will eventually move to struct ast_channel.caller.id.tag)
 	 */
 	char *cid_tag;
-
-	/*!
-	 * \brief Caller id subaddress.
-	 * (Field will eventually move to struct ast_channel.caller.id.subaddress)
-	 */
-	struct ast_party_subaddress subaddress;
 };
 
 /*!

Modified: team/rmudgett/cid/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/cdr.c?view=diff&rev=264618&r1=264617&r2=264618
==============================================================================
--- team/rmudgett/cid/main/cdr.c (original)
+++ team/rmudgett/cid/main/cdr.c Thu May 20 11:34:12 2010
@@ -862,8 +862,8 @@
 	ast_copy_string(cdr->src, S_OR(num, ""), sizeof(cdr->src));
 	ast_cdr_setvar(cdr, "dnid", S_OR(c->dialed.number.str, ""), 0);
 
-	if (c->cid.subaddress.valid) {
-		ast_cdr_setvar(cdr, "callingsubaddr", S_OR(c->cid.subaddress.str, ""), 0);
+	if (c->caller.id.subaddress.valid) {
+		ast_cdr_setvar(cdr, "callingsubaddr", S_OR(c->caller.id.subaddress.str, ""), 0);
 	}
 	if (c->dialed.subaddress.valid) {
 		ast_cdr_setvar(cdr, "calledsubaddr", S_OR(c->dialed.subaddress.str, ""), 0);