[svn-commits] rmudgett: branch 1.4 r1191 - /branches/1.4/q931.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Oct 13 14:06:26 2009
New Revision: 1191

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1191
Log:
Reduce future conflicts when adding ie's to the SETUP message.

Modified:
    branches/1.4/q931.c

Modified: branches/1.4/q931.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q931.c?view=diff&rev=1191&r1=1190&r2=1191
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Tue Oct 13 14:06:26 2009
@@ -3906,14 +3906,40 @@
 		return 0;
 }
 
-static int setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_NETWORK_SPEC_FAC, Q931_DISPLAY,
-	Q931_REVERSE_CHARGE_INDIC, Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_IE_USER_USER,
-	Q931_SENDING_COMPLETE, Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };
-
-static int gr303_setup_ies[] =  { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, -1 };
+static int setup_ies[] = {
+	Q931_BEARER_CAPABILITY,
+	Q931_CHANNEL_IDENT,
+	Q931_IE_FACILITY,
+	Q931_PROGRESS_INDICATOR,
+	Q931_NETWORK_SPEC_FAC,
+	Q931_DISPLAY,
+	Q931_REVERSE_CHARGE_INDIC,
+	Q931_CALLING_PARTY_NUMBER,
+	Q931_CALLED_PARTY_NUMBER,
+	Q931_REDIRECTING_NUMBER,
+	Q931_IE_USER_USER,
+	Q931_SENDING_COMPLETE,
+	Q931_IE_ORIGINATING_LINE_INFO,
+	Q931_IE_GENERIC_DIGITS,
+	-1
+};
+
+static int gr303_setup_ies[] = {
+	Q931_BEARER_CAPABILITY,
+	Q931_CHANNEL_IDENT,
+	-1
+};
 
 /*! Call Independent Signalling SETUP ie's */
-static int cis_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_SENDING_COMPLETE, -1 };
+static int cis_setup_ies[] = {
+	Q931_BEARER_CAPABILITY,
+	Q931_CHANNEL_IDENT,
+	Q931_IE_FACILITY,
+	Q931_CALLING_PARTY_NUMBER,
+	Q931_CALLED_PARTY_NUMBER,
+	Q931_SENDING_COMPLETE,
+	-1
+};
 
 int q931_setup(struct pri *ctrl, q931_call *c, struct pri_sr *req)
 {