[svn-commits] rmudgett: branch rmudgett/sig_ss7 r263192 - /team/rmudgett/sig_ss7/channels/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri May 14 14:27:22 2010
New Revision: 263192

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=263192
Log:
Reorganized struct sig_ss7_chan

Modified:
    team/rmudgett/sig_ss7/channels/sig_ss7.h

Modified: team/rmudgett/sig_ss7/channels/sig_ss7.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/sig_ss7/channels/sig_ss7.h?view=diff&rev=263192&r1=263191&r2=263192
==============================================================================
--- team/rmudgett/sig_ss7/channels/sig_ss7.h (original)
+++ team/rmudgett/sig_ss7/channels/sig_ss7.h Fri May 14 14:27:22 2010
@@ -119,6 +119,10 @@
 	/*! \brief Opaque libss7 call control structure */
 	struct isup_call *ss7call;
 
+	int channel;					/*!< Channel Number */
+	int cic;						/*!< CIC associated with channel */
+	unsigned int dpc;				/*!< CIC's DPC */
+
 	/* Options to be set by user */
 	/*!
 	 * \brief Number of most significant digits/characters to strip from the dialed number.
@@ -136,21 +140,27 @@
 	 * from the Asterisk channel for outgoing calls.
 	 */
 	unsigned int use_callingpres:1;
-	unsigned int immediate:1;			/*!< Answer before getting digits? */
+	unsigned int immediate:1;		/*!< Answer before getting digits? */
+
+	/*! \brief TRUE if the channel is locally blocked.  Set by user and link. */
+	unsigned int locallyblocked:1;
+	/*! \brief TRUE if the channel is remotely blocked.  Set by user and link. */
+	unsigned int remotelyblocked:1;
+
+	char context[AST_MAX_CONTEXT];
+	char mohinterpret[MAX_MUSICCLASS];
 
 	/* Options to be checked by user */
-	int cid_ani2;						/*!< Automatic Number Identification number (Alternate PRI caller ID number) */
+	int cid_ani2;					/*!< Automatic Number Identification number (Alternate PRI caller ID number) */
 	int cid_ton;					/*!< Type Of Number (TON) */
 	int callingpres;				/*!< The value of calling presentation that we're going to use when placing a PRI call */
 	char cid_num[AST_MAX_EXTENSION];
-	char cid_subaddr[AST_MAX_EXTENSION];/*!< BUGBUG SS7 may not support. */
+	char cid_subaddr[AST_MAX_EXTENSION];/*!< XXX SS7 may not support. */
 	char cid_name[AST_MAX_EXTENSION];
 	char cid_ani[AST_MAX_EXTENSION];
 	char exten[AST_MAX_EXTENSION];
 
-	/* Options to be set by user */
-	char context[AST_MAX_CONTEXT];
-	char mohinterpret[MAX_MUSICCLASS];
+	/* Options to be checked by user that are stuffed into channel variables. */
 	char charge_number[50];
 	char gen_add_number[50];
 	char gen_dig_number[50];
@@ -164,24 +174,22 @@
 	unsigned char gen_dig_type;
 	unsigned char gen_dig_scheme;
 	char jip_number[50];
+#if 0
 	unsigned char lspi_type;
 	unsigned char lspi_scheme;
 	unsigned char lspi_context;
+#endif
 	char lspi_ident[50];
 	unsigned int call_ref_ident;
 	unsigned int call_ref_pc;
 	unsigned char calling_party_cat;
 
-	int cic;							/*!< CIC associated with channel */
-	unsigned int dpc;						/*!< CIC's DPC */
-	int channel;					/*!< Channel Number */
-
-	/*! \brief TRUE if the channel is locally blocked. */
-	unsigned int locallyblocked:1;
-	/*! \brief TRUE if the channel is remotely blocked. */
-	unsigned int remotelyblocked:1;
-
+	/*
+	 * Channel status bits.
+	 */
+	/*! TRUE if channel is associated with a link that is down. */
 	unsigned int inalarm:1;
+	/*! TRUE if this channel is being used for an outgoing call. */
 	unsigned int outgoing:1;
 	/*!
 	 * \brief TRUE if call is in a proceeding state.
@@ -196,7 +204,7 @@
 	unsigned int alreadyhungup:1;
 	/*! \brief XXX BOOLEAN Purpose??? */
 	unsigned int rlt:1;
-
+	/*! TRUE if this channel is in loopback. */
 	unsigned int loopedback:1;
 };