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

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Aug 25 11:50:56 2009
New Revision: 1019

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1019
Log:
Put connected name in display ie for CONNECT message.

Modified:
    branches/1.4/q931.c

Modified: branches/1.4/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/branches/1.4/q931.c?view=diff&rev=1019&r1=1018&r2=1019
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Tue Aug 25 11:50:56 2009
@@ -1791,6 +1791,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;
 
@@ -3660,7 +3672,7 @@
 	q931_release(ctrl, c, PRI_CAUSE_NORMAL_CLEARING);
 }
 
-static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_IE_CONNECTED_NUM, -1 };
+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)
 {