From 6b2cc87b301d1871795cc4cd2d15e53f13e88e02 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 9 Feb 2016 21:46:26 +0000
Subject: [PATCH] q931.c: Update ALERTING_NO_PROGRESS conditional code.

The conditional is to only remove the Progress Indicator ie from being
added to select messages.

* Made so the ALERTING message can have the User-User ie if needed when
ALERTING_NO_PROGRESS is defined.


git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2335 2fbb986a-6c06-0410-b554-c9c1f0a7f128
---
 q931.c | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/q931.c b/q931.c
index 89a52f1..5055429 100644
--- a/q931.c
+++ b/q931.c
@@ -5637,11 +5637,12 @@ int q931_notify(struct pri *ctrl, q931_call *c, int channel, int info)
 	return q931_notify_redirection(ctrl, c, info, NULL, NULL);
 }
 
-#ifdef ALERTING_NO_PROGRESS
-static int call_progress_ies[] = { -1 };
-#else
-static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
+static int call_progress_ies[] = {
+#ifndef ALERTING_NO_PROGRESS
+	Q931_PROGRESS_INDICATOR,
 #endif
+	-1
+};
 
 int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
 {
@@ -5669,11 +5670,13 @@ int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
 	return send_message(ctrl, c, Q931_PROGRESS, call_progress_ies);
 }
 
-#ifdef ALERTING_NO_PROGRESS
-static int call_progress_with_cause_ies[] = { Q931_CAUSE, -1 };
-#else
-static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
+static int call_progress_with_cause_ies[] = {
+	Q931_CAUSE,
+#ifndef ALERTING_NO_PROGRESS
+	Q931_PROGRESS_INDICATOR,
 #endif
+	-1
+};
 
 int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, int info, int cause)
 {
@@ -5705,11 +5708,13 @@ int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, i
 	return send_message(ctrl, c, Q931_PROGRESS, call_progress_with_cause_ies);
 }
 
-#ifdef ALERTING_NO_PROGRESS
-static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, -1 };
-#else
-static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
+static int call_proceeding_ies[] = {
+	Q931_CHANNEL_IDENT,
+#ifndef ALERTING_NO_PROGRESS
+	Q931_PROGRESS_INDICATOR,
 #endif
+	-1
+};
 
 int q931_call_proceeding(struct pri *ctrl, q931_call *c, int channel, int info)
 {
@@ -5740,11 +5745,15 @@ int q931_call_proceeding(struct pri *ctrl, q931_call *c, int channel, int info)
 	c->alive = 1;
 	return send_message(ctrl, c, Q931_CALL_PROCEEDING, call_proceeding_ies);
 }
+
+static int alerting_ies[] = {
+	Q931_IE_FACILITY,
 #ifndef ALERTING_NO_PROGRESS
-static int alerting_ies[] = { Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_USER_USER, -1 };
-#else
-static int alerting_ies[] = { Q931_IE_FACILITY, -1 };
+	Q931_PROGRESS_INDICATOR,
 #endif
+	Q931_IE_USER_USER,
+	-1
+};
 
 int q931_alerting(struct pri *ctrl, q931_call *c, int channel, int info)
 {