[asterisk-commits] rmudgett: branch rmudgett/subaddr r220212 - /team/rmudgett/subaddr/include/as...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Sep 24 13:17:52 2009
New Revision: 220212

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220212
Log:
Define the ast_party_subaddress structure and embed it in the ast_party_id structure.

Modified:
    team/rmudgett/subaddr/include/asterisk/channel.h

Modified: team/rmudgett/subaddr/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/subaddr/include/asterisk/channel.h?view=diff&rev=220212&r1=220211&r2=220212
==============================================================================
--- team/rmudgett/subaddr/include/asterisk/channel.h (original)
+++ team/rmudgett/subaddr/include/asterisk/channel.h Thu Sep 24 13:17:52 2009
@@ -185,6 +185,37 @@
 };
 
 /*!
+ * \since 1.6.3
+ * \brief Information needed to specify a subaddress in a call.
+ * \note All string fields here are malloc'ed, so they need to be
+ * freed when the structure is deleted.
+ * \note NULL and "" must be considered equivalent.
+ */
+struct ast_party_subaddress {
+	/*!
+	 * \brief Malloced subaddress string.
+	 * \note If the subaddress type is user specified then the subaddress is
+	 * a string of ASCII hex because the actual subaddress is likely BCD encoded.
+	 */
+	char *str;
+	/*!
+	 * \brief Q.931 subaddress type.
+	 * \details
+	 * nsap(0),
+	 * user_specified(2)
+	 */
+	int type;
+	/*!
+	 * \brief TRUE if odd number of address signals
+	 * \note The odd/even indicator is used when the type of subaddress is
+	 * user_specified and the coding is BCD.
+	 */
+	unsigned char odd_even_indicator;
+	/*! \brief TRUE if the subaddress information is valid/present */
+	unsigned char valid;
+};
+
+/*!
  * \brief Structure for all kinds of caller ID identifications.
  * \note All string fields here are malloc'ed, so they need to be
  * freed when the structure is deleted.
@@ -260,6 +291,11 @@
 	 * (Field will eventually move to struct ast_channel.dialed.transit_network_select)
 	 */
 	int cid_tns;
+	/*!
+	 * \brief Caller id subaddress.
+	 * (Field will eventually move to struct ast_channel.caller.id.subaddress)
+	 */
+	struct ast_party_subaddress subaddress;
 };
 
 /*!
@@ -275,6 +311,9 @@
 
 	/*! \brief Subscriber name (Malloced) */
 	char *name;
+
+	/*! \brief Subscriber subaddress. */
+	struct ast_party_subaddress subaddress;
 
 	/*! \brief Q.931 encoded type-of-number/numbering-plan fields */
 	int number_type;