[asterisk-commits] rmudgett: branch rmudgett/cid r264623 - in /team/rmudgett/cid: channels/ incl...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 20 11:48:43 2010
New Revision: 264623

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

Modified:
    team/rmudgett/cid/channels/chan_misdn.c
    team/rmudgett/cid/channels/chan_sip.c
    team/rmudgett/cid/include/asterisk/channel.h

Modified: team/rmudgett/cid/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/channels/chan_misdn.c?view=diff&rev=264623&r1=264622&r2=264623
==============================================================================
--- team/rmudgett/cid/channels/chan_misdn.c (original)
+++ team/rmudgett/cid/channels/chan_misdn.c Thu May 20 11:48:43 2010
@@ -6457,7 +6457,7 @@
 			strncat(newbc->incoming_cid_tag, newbc->caller.number, sizeof(newbc->incoming_cid_tag) - strlen(newbc->incoming_cid_tag) - 1);
 		}
 
-		ast->cid.cid_tag = ast_strdup(newbc->incoming_cid_tag);
+		ast->caller.id.tag = ast_strdup(newbc->incoming_cid_tag);
 
 		misdn_cfg_get(port, MISDN_CFG_LOCALDIALPLAN, &number_type, sizeof(number_type));
 		if (number_type < 0) {
@@ -9859,7 +9859,7 @@
 		}
 
 		ast_channel_lock(chan);
-		chan->cid.cid_tag = ast_strdup(bc->incoming_cid_tag);
+		chan->caller.id.tag = ast_strdup(bc->incoming_cid_tag);
 		ast_channel_unlock(chan);
 
 		if (!ast_strlen_zero(bc->redirecting.from.number)) {

Modified: team/rmudgett/cid/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/channels/chan_sip.c?view=diff&rev=264623&r1=264622&r2=264623
==============================================================================
--- team/rmudgett/cid/channels/chan_sip.c (original)
+++ team/rmudgett/cid/channels/chan_sip.c Thu May 20 11:48:43 2010
@@ -6282,7 +6282,7 @@
 	ast_channel_lock(tmp);
 	sip_pvt_lock(i);
 	ast_channel_cc_params_init(tmp, i->cc_params);
-	tmp->cid.cid_tag = ast_strdup(i->cid_tag);
+	tmp->caller.id.tag = ast_strdup(i->cid_tag);
 	ast_channel_unlock(tmp);
 
 	tmp->tech = ( ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_INFO || ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_SHORTINFO) ?  &sip_tech_info : &sip_tech;

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=264623&r1=264622&r2=264623
==============================================================================
--- team/rmudgett/cid/include/asterisk/channel.h (original)
+++ team/rmudgett/cid/include/asterisk/channel.h Thu May 20 11:48:43 2010
@@ -336,16 +336,6 @@
 	 * (Field will eventually move to struct ast_channel.caller.id.number_type)
 	 */
 	int cid_ton;
-
-	/*!
-	 * \brief Callerid "Tag"
-	 * A user-settable field used to help associate some extrinsic information
-	 * about the channel or user of the channel to the caller ID. This information
-	 * is not transmitted over the wire and so is only useful within an Asterisk
-	 * environment.
-	 * (Field will eventually move to struct ast_channel.caller.id.tag)
-	 */
-	char *cid_tag;
 };
 
 /*!
@@ -368,7 +358,14 @@
 	/*! \brief Subscriber subaddress. */
 	struct ast_party_subaddress subaddress;
 
-	/*! \brief User-set "tag" */
+	/*!
+	 * \brief User-set "tag"
+	 * \details
+	 * A user-settable field used to help associate some extrinsic information
+	 * about the channel or user of the channel to the party ID.  This information
+	 * is normally not transmitted over the wire and so is only useful within an
+	 * Asterisk environment.
+	 */
 	char *tag;
 };