From 28e7e1cdfe805380ab1350d6eb4f5f0e00b40f53 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 13 Oct 2009 19:06:26 +0000 Subject: [PATCH] Reduce future conflicts when adding ie's to the SETUP message. git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@1191 2fbb986a-6c06-0410-b554-c9c1f0a7f128 --- q931.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/q931.c b/q931.c index 92f1e36..cb89b16 100644 --- a/q931.c +++ b/q931.c @@ -3906,14 +3906,40 @@ int q931_disconnect(struct pri *ctrl, q931_call *c, int cause) 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 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 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) {