[svn-commits] dhubbard: branch dhubbard/issue3450 r566 - in /team/dhubbard/issue3450: ./ bu...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Jun 4 12:43:16 CDT 2008 

Author: dhubbard
Date: Wed Jun  4 12:43:15 2008
New Revision: 566

URL: http://svn.digium.com/view/libpri?view=rev&rev=566
Log:
Merged revisions 549,553-555,563 via svnmerge from 
https://origsvn.digium.com/svn/libpri/trunk

........
r549 | bbryant | 2008-05-01 18:04:28 -0500 (Thu, 01 May 2008) | 2 lines

Add new API call to libpri ( pri_get_version ) which returns a version string.

........
r553 | mattf | 2008-05-06 11:15:32 -0500 (Tue, 06 May 2008) | 1 line

Final patch to pass certification
........
r554 | mattf | 2008-05-06 11:33:05 -0500 (Tue, 06 May 2008) | 1 line

We passed TBR3 layer 2 and layer 3 testing with this commit in for BRI-TE PTMP.
........
r555 | mattf | 2008-05-06 11:43:11 -0500 (Tue, 06 May 2008) | 1 line

Remove some unnecessary debug messages
........
r563 | dhubbard | 2008-06-04 12:07:17 -0500 (Wed, 04 Jun 2008) | 2 lines

While working on issue 3450 I noticed that the information channel selection field in the channel identification IE was displayed incorrectly when using 'pri intense debug'.  I wanted another pair of eyes to look at the code because everything looked correct until Shaun Ruffell noticed the missing comma in the msg_chan_sel array.

........

Added:
    team/dhubbard/issue3450/build_tools/
      - copied from r563, trunk/build_tools/
    team/dhubbard/issue3450/build_tools/make_version
      - copied unchanged from r563, trunk/build_tools/make_version
    team/dhubbard/issue3450/build_tools/make_version_c
      - copied unchanged from r563, trunk/build_tools/make_version_c
Modified:
    team/dhubbard/issue3450/   (props changed)
    team/dhubbard/issue3450/Makefile
    team/dhubbard/issue3450/libpri.h
    team/dhubbard/issue3450/pri.c
    team/dhubbard/issue3450/q921.c
    team/dhubbard/issue3450/q931.c

Propchange: team/dhubbard/issue3450/
------------------------------------------------------------------------------
    automerge-email = dhubbard at digium.com

Propchange: team/dhubbard/issue3450/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  4 12:43:15 2008
@@ -1,1 +1,1 @@
-/trunk:1-547
+/trunk:1-564

Modified: team/dhubbard/issue3450/Makefile
URL: http://svn.digium.com/view/libpri/team/dhubbard/issue3450/Makefile?view=diff&rev=566&r1=565&r2=566
==============================================================================
--- team/dhubbard/issue3450/Makefile (original)
+++ team/dhubbard/issue3450/Makefile Wed Jun  4 12:43:15 2008
@@ -28,6 +28,8 @@
 #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
 
 CC=gcc
+GREP=grep
+AWK=awk
 
 OSARCH=$(shell uname -s)
 PROC?=$(shell uname -m)
@@ -39,8 +41,8 @@
 
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
-STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
-DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
+STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
+DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
 CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
@@ -61,6 +63,10 @@
 LDCONFIG_FLAGS = \# # Trick to comment out the period in the command below
 #INSTALL_PREFIX = /opt/asterisk  # Uncomment out to install in standard Solaris location for 3rd party code
 endif
+
+export PRIVERSION
+
+PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 #This works for even old (2.96) versions of gcc and provides a small boost either way.
@@ -141,6 +147,11 @@
 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
 	ln -sf libpri.so.$(SONAME) libpri.so
 
+version.c:
+	@build_tools/make_version_c > $@.tmp
+	@cmp -s $@.tmp $@ || mv $@.tmp $@
+	@rm -f $@.tmp
+
 clean:
 	rm -f *.o *.so *.lo *.so.$(SONAME)
 	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
@@ -151,3 +162,5 @@
 
 .depend: 
 	CC="$(CC)" ./mkdep ${CFLAGS} `ls *.c`
+
+.PHONY: version.c

Modified: team/dhubbard/issue3450/libpri.h
URL: http://svn.digium.com/view/libpri/team/dhubbard/issue3450/libpri.h?view=diff&rev=566&r1=565&r2=566
==============================================================================
--- team/dhubbard/issue3450/libpri.h (original)
+++ team/dhubbard/issue3450/libpri.h Wed Jun  4 12:43:15 2008
@@ -700,4 +700,7 @@
 #define PRI_TIMER_TM20	28	/* maximum time avaiting XID response */
 #define PRI_TIMER_NM20	29	/* number of XID retransmits */
 
+/* Get PRI version */
+const char *pri_get_version(void);
+
 #endif

Modified: team/dhubbard/issue3450/pri.c
URL: http://svn.digium.com/view/libpri/team/dhubbard/issue3450/pri.c?view=diff&rev=566&r1=565&r2=566
==============================================================================
--- team/dhubbard/issue3450/pri.c (original)
+++ team/dhubbard/issue3450/pri.c Wed Jun  4 12:43:15 2008
@@ -190,7 +190,6 @@
 /* Pass in the master for this function */
 void __pri_free_tei(struct pri * p)
 {
-	pri_error(NULL, "Freeing TEI %d\n", p->tei);
 	free (p);
 }
 

Modified: team/dhubbard/issue3450/q921.c
URL: http://svn.digium.com/view/libpri/team/dhubbard/issue3450/q921.c?view=diff&rev=566&r1=565&r2=566
==============================================================================
--- team/dhubbard/issue3450/q921.c (original)
+++ team/dhubbard/issue3450/q921.c Wed Jun  4 12:43:15 2008
@@ -1155,12 +1155,10 @@
 {
 	q921_reset(pri);
 	if ((pri->sapi == Q921_SAPI_LAYER2_MANAGEMENT) && (pri->tei == Q921_TEI_GROUP)) {
-		pri_message(pri, "Starting in BRI mode\n");
 		pri->q921_state = Q921_DOWN;
 		if (isCPE)
 			q921_tei_request(pri);
 	} else {
-		pri_message(pri, "Starting in PRI mode, isCPE=%d, SAPI/TEI=%d/%d\n", isCPE, pri->sapi, pri->tei);
 		q921_send_sabme(pri, isCPE);
 	}
 }

Modified: team/dhubbard/issue3450/q931.c
URL: http://svn.digium.com/view/libpri/team/dhubbard/issue3450/q931.c?view=diff&rev=566&r1=565&r2=566
==============================================================================
--- team/dhubbard/issue3450/q931.c (original)
+++ team/dhubbard/issue3450/q931.c Wed Jun  4 12:43:15 2008
@@ -423,7 +423,7 @@
 	int x;
 	int res = 0;
 	static const char*	msg_chan_sel[] = {
-		"No channel selected", "B1 channel", "B2 channel","Any channel selected" 
+		"No channel selected", "B1 channel", "B2 channel","Any channel selected",  
 		"No channel selected", "As indicated in following octets", "Reserved","Any channel selected"
 	};
 
@@ -3817,7 +3817,15 @@
 			    (c->cause != PRI_CAUSE_INTERWORKING)) 
 				pri_error(pri, "Received unsolicited status: %s\n", pri_cause2str(c->cause));
 			/* Workaround for S-12 ver 7.3 - it responds for invalid/non-implemented IEs at SETUP with null call state */
+#if 0
 			if (!c->sugcallstate && (c->ourcallstate != Q931_CALL_STATE_CALL_INITIATED)) {
+#else
+			/* Remove "workaround" since it breaks certification testing.  If we receive a STATUS message of call state
+ 			 * NULL and we are not in the call state NULL we must clear resources and return to the call state to pass
+ 			 * testing.  See section 5.8.11 of Q.931 */
+
+			if (!c->sugcallstate) {
+#endif
 				pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
 				pri->ev.hangup.cause = c->cause;
 				pri->ev.hangup.cref = c->cr;

More information about the svn-commits mailing list