[svn-commits] tilghman: branch group/issue10217 r1027 - in /team/group/issue10217: ./ q931.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Aug 25 13:36:48 2009
New Revision: 1027

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1027
Log:
Merged revisions 1018-1019 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

........
  r1018 | rmudgett | 2009-08-25 11:49:07 -0500 (Tue, 25 Aug 2009) | 1 line
  
  Fix ie ordering in some ie lists for send_message().
........
  r1019 | rmudgett | 2009-08-25 11:50:56 -0500 (Tue, 25 Aug 2009) | 1 line
  
  Put connected name in display ie for CONNECT message.
........

Modified:
    team/group/issue10217/   (props changed)
    team/group/issue10217/q931.c

Propchange: team/group/issue10217/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue10217/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 25 13:36:48 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-1013
+/branches/1.4:1-1026

Modified: team/group/issue10217/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/issue10217/q931.c?view=diff&rev=1027&r1=1026&r2=1027
==============================================================================
--- team/group/issue10217/q931.c (original)
+++ team/group/issue10217/q931.c Tue Aug 25 13:36:48 2009
@@ -2156,6 +2156,18 @@
 static int receive_display(int full_ie, struct pri *ctrl, q931_call *call, int msgtype, q931_ie *ie, int len)
 {
 	unsigned char *data;
+
+	switch (msgtype) {
+	case Q931_SETUP:
+	case Q931_CONNECT:
+		/*
+		 * Only keep the display message on SETUP and CONNECT messages
+		 * as the remote name.
+		 */
+		break;
+	default:
+		return 0;
+	}
 
 	call->remote_id.name.valid = 1;
 
@@ -3628,6 +3640,21 @@
 	return 0;
 }
 
+/*!
+ * \internal
+ * \brief Build and send the requested message.
+ *
+ * \param ctrl D channel controller.
+ * \param call Q.931 call leg
+ * \param msgtype Q.931 message type to build.
+ * \param ies List of ie's to put in the message.
+ *
+ * \note The ie's in the ie list must be in numerical order.
+ * See Q.931 section 4.5.1 coding rules.
+ *
+ * \retval 0 on success.
+ * \retval -1 on error.
+ */
 static int send_message(struct pri *ctrl, q931_call *call, int msgtype, int ies[])
 {
 	unsigned char buf[1024];
@@ -3815,7 +3842,7 @@
 #ifdef ALERTING_NO_PROGRESS
 static int call_progress_ies[] = { -1 };
 #else
-static int call_progress_with_cause_ies[] = { Q931_PROGRESS_INDICATOR, Q931_CAUSE, -1 };
+static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
 
 static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
 #endif
@@ -3896,7 +3923,7 @@
 	return send_message(ctrl, c, Q931_CALL_PROCEEDING, call_proceeding_ies);
 }
 #ifndef ALERTING_NO_PROGRESS
-static int alerting_ies[] = { Q931_PROGRESS_INDICATOR, Q931_IE_USER_USER, Q931_IE_FACILITY, -1 };
+static int alerting_ies[] = { Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_USER_USER, -1 };
 #else
 static int alerting_ies[] = { Q931_IE_FACILITY, -1 };
 #endif
@@ -3929,10 +3956,10 @@
 	return send_message(ctrl, c, Q931_ALERTING, alerting_ies);
 }
 
-static int llc_connect_ies[] = {  Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_IE_CONNECTED_NUM, Q931_IE_FACILITY, Q931_LOW_LAYER_COMPAT, -1 };
- 
-static int connect_ies[] = {  Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_IE_CONNECTED_NUM, Q931_IE_FACILITY, -1 };
- 
+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)
 {
 	if (channel) { 
@@ -3951,7 +3978,7 @@
 	UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_OVERLAP_RECEIVING);
 	c->peercallstate = Q931_CALL_STATE_OVERLAP_SENDING;
 	c->alive = 1;
-	return send_message(ctrl, c, Q931_SETUP_ACKNOWLEDGE, connect_ies);
+	return send_message(ctrl, c, Q931_SETUP_ACKNOWLEDGE, setup_ack_ies);
 }
 
 /* T313 expiry, first time */
@@ -4012,6 +4039,8 @@
 	c->alive = 1;
 	q931_release(ctrl, c, PRI_CAUSE_NORMAL_CLEARING);
 }
+
+static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_DISPLAY, Q931_IE_CONNECTED_NUM, -1 };
 
 int q931_connect(struct pri *ctrl, q931_call *c, int channel, int nonisdn)
 {