[svn-commits] rmudgett: branch group/issue10217 r1036 - /team/group/issue10217/q931.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Aug 27 16:17:47 2009
New Revision: 1036

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1036
Log:
Fixed some logical merge conflicts with recent changes.

Modified:
    team/group/issue10217/q931.c

Modified: team/group/issue10217/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/issue10217/q931.c?view=diff&rev=1036&r1=1035&r2=1036
==============================================================================
--- team/group/issue10217/q931.c (original)
+++ team/group/issue10217/q931.c Thu Aug 27 16:17:47 2009
@@ -3959,8 +3959,6 @@
 	return send_message(ctrl, c, Q931_ALERTING, alerting_ies);
 }
 
-static int llc_connect_ies[] = {  Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_CONNECTED_NUM, Q931_LOW_LAYER_COMPAT, -1 };
-
 static int setup_ack_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_CONNECTED_NUM, -1 };
 
 int q931_setup_ack(struct pri *ctrl, q931_call *c, int channel, int nonisdn)
@@ -4042,6 +4040,8 @@
 	c->alive = 1;
 	q931_release(ctrl, c, PRI_CAUSE_NORMAL_CLEARING);
 }
+
+static int llc_connect_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_DISPLAY, Q931_IE_CONNECTED_NUM, Q931_LOW_LAYER_COMPAT, -1 };
 
 static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_DISPLAY, Q931_IE_CONNECTED_NUM, -1 };
 
@@ -4171,8 +4171,8 @@
 	Q931_SENDING_COMPLETE, Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };
 
 static int llc_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_NETWORK_SPEC_FAC, Q931_DISPLAY,
-	Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_IE_USER_USER, Q931_REPEAT_INDIC, Q931_LOW_LAYER_COMPAT, Q931_SENDING_COMPLETE,
-	Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };
+	Q931_REVERSE_CHARGE_INDIC, Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_REPEAT_INDIC, Q931_LOW_LAYER_COMPAT, 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 };