make tag in preparation for release

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.2.1@282 2fbb986a-6c06-0410-b554-c9c1f0a7f128
Send RR as command instead of response when T200 expires after receiving RNR.
2005-12-06 23:38:12 +00:00 · 2005-12-06 21:35:50 +00:00 · 2005-12-01 23:13:49 +00:00 · 2005-12-01 02:34:44 +00:00 · 2005-11-29 18:39:18 +00:00 · 2005-11-29 00:31:21 +00:00
20 changed files with 637 additions and 2527 deletions
--- a/.version
+++ b/.version
@@ -1 +0,0 @@
-1.6.0-beta1
--- a/221
+++ b/221
@@ -1,211 +1,16 @@
-2008-01-18  Russell Bryant  <russell@digium.com>
+libpri 0.3.0
+-- Fix talking to switch
+-- Add pri dump
+-- Add test application
+-- Fix strncpy stuff
+libpri 0.1.2
+-- Added PRI_EVENT_HANGUP_ACK so you can know when the disconnect was
+acknowledged

-	* libpri 1.6.0-beta1 released.
+libpri 0.1.1
+-- Added PRI_DEBUG_Q931_ANOMALY flag so that certain non-error-related
+messages would not be output unless specifically desired.

-2008-01-16 18:06 +0000 [r518]  Jason Parker <jparker@digium.com>
+libpri 0.1.0
+ -- Initial release

-	* Makefile, /: Add logging for 'make update' command (also fixes
-	  updates in some places). Issue #11766, initial patch by jmls.
-
-2008-01-11 16:36 +0000 [r515]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /: Merged revisions 514 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r514 | mattf | 2008-01-11 10:34:44 -0600 (Fri,
-	  11 Jan 2008) | 9 lines Merged revisions 513 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r513
-	  | mattf | 2008-01-11 10:33:52 -0600 (Fri, 11 Jan 2008) | 1 line
-	  We should not be parsing further into the bearer capability IE if
-	  the length does not confirm that there actually is data present
-	  ........ ................
-
-2007-12-26 17:35 +0000 [r505]  Russell Bryant <russell@digium.com>
-
-	* libpri.h: Remove unnecessary usage of the extern keyword.
-
-2007-12-06 22:16 +0000 [r494-496]  Russell Bryant <russell@digium.com>
-
-	* q921.c, q931.c, pri_facility.c, pri.c: Change malloc+memset to
-	  calloc. Also, handle allocation failures early to reduce
-	  indentation. (closes issue #11469) Reported by: eliel Patches:
-	  pri.c.patch uploaded by eliel (license 64) q931.c.patch uploaded
-	  by eliel (license 64) q921.c.patch uploaded by eliel (license 64)
-	  pri_facility.c.patch uploaded by eliel (license 64)
-
-	* pri.c: Change a use of malloc+memset to calloc. Also, reduce
-	  indentation of a function by doing the check for memory
-	  allocation failure at the beginning.
-
-	* pri.c: Change the table used to hold the default timers to be
-	  global and const, instead of allocating it on the stack each time
-	  the function is called.
-
-2007-12-05 00:20 +0000 [r491-493]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c: Improve the parameter name to better reflect its use
-
-	* q921.c, q931.c: More PTMP fixes. Stand by, more changes to come
-
-	* q921.c, q931.c, testprilib.c: More magic to make BRI CPE PTMP
-	  work
-
-2007-11-21 22:30 +0000 [r486-487]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c: Make sure we loop BRI call references for one byte CREFs
-	  instead of two
-
-	* q921.c, q931.c, libpri.h, pri.c, pritest.c, pri_internal.h: Add
-	  BRI support to libpri
-
-2007-10-22 15:15 +0000 [r480]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /, pri_internal.h: Merged revisions 479 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r479 | kpfleming | 2007-10-22 10:10:06 -0500
-	  (Mon, 22 Oct 2007) | 11 lines Merged revisions 478 via svnmerge
-	  from https://origsvn.digium.com/svn/libpri/branches/1.2 ........
-	  r478 | kpfleming | 2007-10-22 10:09:27 -0500 (Mon, 22 Oct 2007) |
-	  3 lines we need to include stddef.h for 'size_t' ........
-	  ................
-
-2007-10-13 16:00 +0000 [r473]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Make sure that we only output the message handling debug
-	  when we're actually debugging
-
-2007-10-05 16:46 +0000 [r471]  Jason Parker <jparker@digium.com>
-
-	* /, libpri.h: Merged revisions 470 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue
-	  #10832) ........ r470 | qwell | 2007-10-05 11:45:39 -0500 (Fri,
-	  05 Oct 2007) | 4 lines Fix an incorrect pri_event structure
-	  definition. Issue 10832, patch by flefoll ........
-
-2007-09-25 21:56 +0000 [r469]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c: Fix user-user IE order in setup message (#10705)
-
-2007-09-14 21:34 +0000 [r466]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /, libpri.h: Merged revisions 465 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r465
-	  | mattf | 2007-09-14 16:32:54 -0500 (Fri, 14 Sep 2007) | 1 line
-	  Fix for #10189. Make sure we properly report the user layer 1 for
-	  H.223 and H.245 ........
-
-2007-09-06 15:15 +0000 [r463]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri_facility.c, /, pri.c: Merged revisions 462 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r462 | mattf | 2007-09-06 10:11:29 -0500 (Thu,
-	  06 Sep 2007) | 9 lines Merged revisions 460 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r460
-	  | mattf | 2007-09-06 10:06:42 -0500 (Thu, 06 Sep 2007) | 1 line
-	  TBCT now works. It should work for NI2, 4E, and 5E. This code was
-	  tested on NI2. ........ ................
-
-2007-08-27 19:22 +0000 [r447]  Jason Parker <jparker@digium.com>
-
-	* Makefile, /: Merged revisions 446 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r446 | qwell | 2007-08-27 14:21:08 -0500 (Mon,
-	  27 Aug 2007) | 10 lines Merged revisions 445 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r445
-	  | qwell | 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) | 2 lines
-	  Make sure we build both the static and shared modules with -fPIC.
-	  ........ ................
-
-2007-08-06 19:58 +0000 [r442]  Jason Parker <jparker@digium.com>
-
-	* Makefile, /: Merged revisions 441 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue
-	  #10253) ........ r441 | qwell | 2007-08-06 14:58:19 -0500 (Mon,
-	  06 Aug 2007) | 4 lines Allow setting CC to something with a
-	  space, such as `make CC="gcc -m32"` Issue 10253. ........
-
-2007-06-20 15:18 +0000 [r428-430]  Matthew Fredrickson <creslin@digium.com>
-
-	* Makefile: Revert that back to how it was
-
-	* Makefile, q921.c, q931.c, prisched.c, testprilib.c, pri_timers.h,
-	  libpri.h, pri.c, pri_internal.h, pri_q921.h: Patch to add PTMP
-	  mode (BRI support)
-
-	* q931.c, /: Merged revisions 427 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r427 | mattf | 2007-06-19 13:23:36 -0500 (Tue,
-	  19 Jun 2007) | 9 lines Merged revisions 426 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r426
-	  | mattf | 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) | 1 line
-	  Try to send pending facility messages if we receive alerting (for
-	  when we don't get proceeding) (#9651) ........ ................
-
-2007-06-06 21:59 +0000 [r417-425]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri_facility.c, /: Merged revisions 424 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r424 | mattf | 2007-06-06 16:58:22 -0500 (Wed,
-	  06 Jun 2007) | 9 lines Merged revisions 423 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r423
-	  | mattf | 2007-06-06 16:57:15 -0500 (Wed, 06 Jun 2007) | 1 line
-	  Oops, that should not be on one line ........ ................
-
-	* q931.c, pri_facility.c, pri_facility.h, pri.c, pri_internal.h:
-	  Preliminary patch plus mods for Q.SIG Path Replacement (Q.SIG
-	  version of 2BCT) #7778
-
-	* pri_facility.c, /: Merged revisions 416 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r416 | mattf | 2007-06-06 08:22:15 -0500 (Wed,
-	  06 Jun 2007) | 10 lines Merged revisions 415 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r415
-	  | mattf | 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) | 2 lines
-	  Make sure we only send the NFE when we are talking QSIG ........
-	  ................
-
-2007-05-25 17:36 +0000 [r413]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, pri_facility.c, pri_facility.h, libpri.h: Commit path for
-	  ROSE-12 and ROSE-13 support (#9076)
-
-2007-01-23 22:02 +0000 [r391-393]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /: Merged revisions 390 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r390 | mattf | 2007-01-22 16:29:24 -0600 (Mon,
-	  22 Jan 2007) | 10 lines Merged revisions 389 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r389
-	  | mattf | 2007-01-22 16:20:59 -0600 (Mon, 22 Jan 2007) | 2 lines
-	  Make sure we send DISCONNECT if we reached the active state and a
-	  call is disconnected, regardless of cause code. ........
-	  ................
-
-	* /: Fix mess up in up-port
-
-	* /: Merged revisions 389 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........
-	  ........
-
-2006-12-30 19:18 +0000 [r387]  Joshua Colp <jcolp@digium.com>
-
-	* Makefile, /: Merged revisions 386 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.4
-	  ................ r386 | file | 2006-12-30 14:17:34 -0500 (Sat, 30
-	  Dec 2006) | 10 lines Merged revisions 385 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r385
-	  | file | 2006-12-30 14:16:17 -0500 (Sat, 30 Dec 2006) | 2 lines
-	  Specify full path to restorecon instead of assuming it will be
-	  available from what is in $PATH. (issue #8670 reported by djflux)
-	  ........ ................
-
-2006-11-03 18:16 +0000 [r382]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Remove pointless recursion. (#8281)
-
-2006-09-20 21:00 +0000 [r374]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /: set up merge tracking from 1.4 branch
-
-2006-09-20  Kevin P. Fleming  <kpfleming@digium.com>
-
-	* libpri 1.4.0-beta1 released.
--- a/42
+++ b/42
@@ -32,22 +32,23 @@ CC=gcc
 OSARCH=$(shell uname -s)
 PROC?=$(shell uname -m)

+TOBJS=testpri.o
+T2OBJS=testprilib.o
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY=libpri.so.1.0
 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
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
-INSTALL_PREFIX=$(DESTDIR)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+INSTALL_PREFIX?=
 INSTALL_BASE=/usr
-SOFLAGS = -Wl,-hlibpri.so.1.0
+SOFLAGS = -Wl,-hlibpri.so.1
 LDCONFIG = /sbin/ldconfig
-ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
+ifeq (${OSARCH},Linux)
 LDCONFIG_FLAGS=-n
 else
 ifeq (${OSARCH},FreeBSD)
 LDCONFIG_FLAGS=-m
 CFLAGS += -I../zaptel -I../zapata
-INSTALL_BASE=/usr/local
 endif
 endif
 ifeq (${OSARCH},SunOS)
@@ -71,16 +72,10 @@ all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 update:
 	@if [ -d .svn ]; then \
 		echo "Updating from Subversion..." ; \
-		fromrev="`svn info | $(AWK) '/Revision: / {print $$2}'`"; \
-		svn update | tee update.out; \
-		torev="`svn info | $(AWK) '/Revision: / {print $$2}'`"; \
-		echo "`date`  Updated from revision $${fromrev} to $${torev}." >> update.log; \
-		rm -f .version; \
-		if [ `grep -c ^C update.out` -gt 0 ]; then \
-			echo ; echo "The following files have conflicts:" ; \
-			grep ^C update.out | cut -b4- ; \
-		fi ; \
-		rm -f update.out; \
+		svn update -q; \
+	elif [ -d CVS ]; then \
+		echo "Updating from CVS..." ; \
+		cvs -q -z3 update -Pd; \
 	else \
 		echo "Not under version control";  \
 	fi
@@ -91,14 +86,14 @@ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 ifneq (${OSARCH},SunOS)
 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
+	if test $$(id -u) = 0; then $(LDCONFIG); fi
 else
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
+	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) )
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
 endif

@@ -127,7 +122,7 @@ include .depend
 endif

 %.lo : %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) -fPIC $(CFLAGS) -o $@ -c $<

 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
@@ -136,17 +131,16 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
 $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
-	ln -sf libpri.so.1.0 libpri.so
-	ln -sf libpri.so.1.0 libpri.so.1
+	ln -sf libpri.so.1 libpri.so
 	$(SOSLINK)

 clean:
 	rm -f *.o *.so *.lo *.so.1 *.so.1.0
-	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+	rm -f testpri testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	rm -f pritest pridump
 	rm -f .depend

 depend: .depend

 .depend: 
-	CC="$(CC)" ./mkdep ${CFLAGS} `ls *.c`
+	CC=$(CC) ./mkdep ${CFLAGS} `ls *.c`
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-libpri: An implementation of Primary Rate ISDN
+libpri: An implementation of Primate Rate ISDN

 Written by Mark Spencer <markster@digium.com>

--- a/4
+++ b/4
@@ -1,8 +1,10 @@
 General: 
+-- D-Channel Backup
+-- Test against 4e

 Q.921:
 -- Support unnumbered information frames
-- Get TEI codes working for BRI interfaces

 Q.931:
+-- Locking Shift IE
 -- Implement the 11 missing Q.931 timers
--- a/libpri.h
+++ b/libpri.h
@@ -142,10 +142,10 @@

 /* Causes for disconnection */
 #define PRI_CAUSE_UNALLOCATED					1
-#define PRI_CAUSE_NO_ROUTE_TRANSIT_NET			2	/* !Q.SIG */
+#define PRI_CAUSE_NO_ROUTE_TRANSIT_NET			2
 #define PRI_CAUSE_NO_ROUTE_DESTINATION			3
 #define PRI_CAUSE_CHANNEL_UNACCEPTABLE			6
-#define PRI_CAUSE_CALL_AWARDED_DELIVERED		7	/* !Q.SIG */
+#define PRI_CAUSE_CALL_AWARDED_DELIVERED		7
 #define PRI_CAUSE_NORMAL_CLEARING				16
 #define PRI_CAUSE_USER_BUSY						17
 #define PRI_CAUSE_NO_USER_RESPONSE				18
@@ -154,29 +154,27 @@
 #define PRI_CAUSE_NUMBER_CHANGED				22
 #define PRI_CAUSE_DESTINATION_OUT_OF_ORDER		27
 #define PRI_CAUSE_INVALID_NUMBER_FORMAT			28
-#define PRI_CAUSE_FACILITY_REJECTED				29	/* !Q.SIG */
+#define PRI_CAUSE_FACILITY_REJECTED				29
 #define PRI_CAUSE_RESPONSE_TO_STATUS_ENQUIRY	30
 #define PRI_CAUSE_NORMAL_UNSPECIFIED			31
 #define PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION		34
-#define PRI_CAUSE_NETWORK_OUT_OF_ORDER			38	/* !Q.SIG */
+#define PRI_CAUSE_NETWORK_OUT_OF_ORDER			38
 #define PRI_CAUSE_NORMAL_TEMPORARY_FAILURE		41
-#define PRI_CAUSE_SWITCH_CONGESTION				42	/* !Q.SIG */
-#define PRI_CAUSE_ACCESS_INFO_DISCARDED			43	/* !Q.SIG */
+#define PRI_CAUSE_SWITCH_CONGESTION				42
+#define PRI_CAUSE_ACCESS_INFO_DISCARDED			43
 #define PRI_CAUSE_REQUESTED_CHAN_UNAVAIL		44
-#define PRI_CAUSE_PRE_EMPTED					45	/* !Q.SIG */
-#define PRI_CAUSE_FACILITY_NOT_SUBSCRIBED  		50	/* !Q.SIG */
-#define PRI_CAUSE_OUTGOING_CALL_BARRED     		52	/* !Q.SIG */
-#define PRI_CAUSE_INCOMING_CALL_BARRED     		54	/* !Q.SIG */
+#define PRI_CAUSE_PRE_EMPTED					45
+#define PRI_CAUSE_FACILITY_NOT_SUBSCRIBED  		50
+#define PRI_CAUSE_OUTGOING_CALL_BARRED     		52
+#define PRI_CAUSE_INCOMING_CALL_BARRED     		54
 #define PRI_CAUSE_BEARERCAPABILITY_NOTAUTH		57
 #define PRI_CAUSE_BEARERCAPABILITY_NOTAVAIL     58
-#define PRI_CAUSE_SERVICEOROPTION_NOTAVAIL		63	/* Q.SIG */
 #define PRI_CAUSE_BEARERCAPABILITY_NOTIMPL		65
-#define PRI_CAUSE_CHAN_NOT_IMPLEMENTED     		66	/* !Q.SIG */
-#define PRI_CAUSE_FACILITY_NOT_IMPLEMENTED      69	/* !Q.SIG */
+#define PRI_CAUSE_CHAN_NOT_IMPLEMENTED     		66
+#define PRI_CAUSE_FACILITY_NOT_IMPLEMENTED      69
 #define PRI_CAUSE_INVALID_CALL_REFERENCE		81
-#define PRI_CAUSE_IDENTIFIED_CHANNEL_NOTEXIST	82	/* Q.SIG */
 #define PRI_CAUSE_INCOMPATIBLE_DESTINATION		88
-#define PRI_CAUSE_INVALID_MSG_UNSPECIFIED  		95	/* !Q.SIG */
+#define PRI_CAUSE_INVALID_MSG_UNSPECIFIED  		95
 #define PRI_CAUSE_MANDATORY_IE_MISSING			96
 #define PRI_CAUSE_MESSAGE_TYPE_NONEXIST			97
 #define PRI_CAUSE_WRONG_MESSAGE					98
@@ -184,9 +182,9 @@
 #define PRI_CAUSE_INVALID_IE_CONTENTS			100
 #define PRI_CAUSE_WRONG_CALL_STATE				101
 #define PRI_CAUSE_RECOVERY_ON_TIMER_EXPIRE		102
-#define PRI_CAUSE_MANDATORY_IE_LENGTH_ERROR		103	/* !Q.SIG */
+#define PRI_CAUSE_MANDATORY_IE_LENGTH_ERROR		103
 #define PRI_CAUSE_PROTOCOL_ERROR				111
-#define PRI_CAUSE_INTERWORKING					127	/* !Q.SIG */
+#define PRI_CAUSE_INTERWORKING					127

 /* Transmit capabilities */
 #define PRI_TRANS_CAP_SPEECH					0x0
@@ -202,7 +200,7 @@
 #define PRI_LAYER_1_ALAW			0x23
 #define PRI_LAYER_1_G721			0x24
 #define PRI_LAYER_1_G722_G725		0x25
-#define PRI_LAYER_1_H223_H245		0x26
+#define PRI_LAYER_1_G7XX_384K		0x26
 #define PRI_LAYER_1_NON_ITU_ADAPT	0x27
 #define PRI_LAYER_1_V120_RATE_ADAPT	0x28
 #define PRI_LAYER_1_X31_RATE_ADAPT	0x29
@@ -257,24 +255,20 @@ typedef struct q931_call q931_call;
 typedef struct pri_event_generic {
 	/* Events with no additional information fall in this category */
 	int e;
-	struct pri *pri;
 } pri_event_generic;

 typedef struct pri_event_error {
 	int e;
-	struct pri *pri;
 	char err[256];
 } pri_event_error;

 typedef struct pri_event_restart {
 	int e;
-	struct pri *pri;
 	int channel;
 } pri_event_restart;

 typedef struct pri_event_ringing {
 	int e;
-	struct pri *pri;
 	int channel;
 	int cref;
 	int progress;
@@ -285,7 +279,6 @@ typedef struct pri_event_ringing {

 typedef struct pri_event_answer {
 	int e;
-	struct pri *pri;
 	int channel;
 	int cref;
 	int progress;
@@ -296,9 +289,6 @@ typedef struct pri_event_answer {

 typedef struct pri_event_facname {
 	int e;
- 	struct pri *pri;
-	int callingpres;			/* Presentation of Calling CallerID */
-	int callingplan;			/* Dialing plan of Calling entity */
 	char callingname[256];
 	char callingnum[256];
 	int channel;
@@ -310,9 +300,7 @@ typedef struct pri_event_facname {
 #define PRI_CALLINGPLANRDNIS
 typedef struct pri_event_ring {
 	int e;
-	struct pri *pri;
 	int channel;				/* Channel requested */
-	int cref;					/* Call Reference Number */
 	int callingpres;			/* Presentation of Calling CallerID */
 	int callingplanani;			/* Dialing plan of Calling entity ANI */
 	int callingplan;			/* Dialing plan of Calling entity */
@@ -328,6 +316,7 @@ typedef struct pri_event_ring {
 	int callingplanrdnis;			/* Dialing plan of Redirecting Number */
 	char useruserinfo[260];		/* User->User info */
 	int flexible;				/* Are we flexible with our channel selection? */
+	int cref;					/* Call Reference Number */
 	int ctype;					/* Call type (see PRI_TRANS_CAP_* */
 	int layer1;					/* User layer 1 */
 	int complete;				/* Have we seen "Complete" i.e. no more number? */
@@ -343,10 +332,9 @@ typedef struct pri_event_ring {

 typedef struct pri_event_hangup {
 	int e;
-	struct pri *pri;
 	int channel;				/* Channel requested */
-	int cref;
 	int cause;
+	int cref;
 	q931_call *call;			/* Opaque call pointer */
 	long aoc_units;				/* Advise of Charge number of charged units */
 	char useruserinfo[260];		/* User->User info */
@@ -354,14 +342,12 @@ typedef struct pri_event_hangup {

 typedef struct pri_event_restart_ack {
 	int e;
-	struct pri *pri;
 	int channel;
 } pri_event_restart_ack;

 #define PRI_PROGRESS_CAUSE
 typedef struct pri_event_proceeding {
 	int e;
-	struct pri *pri;
 	int channel;
 	int cref;
 	int progress;
@@ -372,21 +358,17 @@ typedef struct pri_event_proceeding {
 
 typedef struct pri_event_setup_ack {
 	int e;
- 	struct pri *pri;
 	int channel;
-	q931_call *call;
 } pri_event_setup_ack;

 typedef struct pri_event_notify {
 	int e;
- 	struct pri *pri;
 	int channel;
 	int info;
 } pri_event_notify;

 typedef struct pri_event_keypad_digit {
 	int e;
- 	struct pri *pri;
 	int channel;
 	q931_call *call;
 	char digits[64];
@@ -401,7 +383,7 @@ typedef union {
 	pri_event_ring	  ring;		/* Ring */
 	pri_event_hangup  hangup;	/* Hang up */
 	pri_event_ringing ringing;	/* Ringing */
-	pri_event_answer  answer;	/* Answer */
+	pri_event_ringing answer;	/* Answer */
 	pri_event_restart_ack restartack;	/* Restart Acknowledge */
 	pri_event_proceeding  proceeding;	/* Call proceeding & Progress */
 	pri_event_setup_ack   setup_ack;	/* SETUP_ACKNOWLEDGE structure */
@@ -420,78 +402,73 @@ typedef int (*pri_io_cb)(struct pri *pri, void *buf, int buflen);
   channel operating in HDLC mode with FCS computed by the fd's driver.  Also it
   must be NON-BLOCKING! Frames received on the fd should include FCS.  Nodetype 
   must be one of PRI_NETWORK or PRI_CPE.  switchtype should be PRI_SWITCH_* */
-struct pri *pri_new(int fd, int nodetype, int switchtype);
-struct pri *pri_new_bri(int fd, int ptpmode, int nodetype, int switchtype);
+extern struct pri *pri_new(int fd, int nodetype, int switchtype);

 /* Create D-channel just as above with user defined I/O callbacks and data */
-struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read, pri_io_cb io_write, void *userdata);
+extern struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read, pri_io_cb io_write, void *userdata);

 /* Retrieve the user data associated with the D channel */
-void *pri_get_userdata(struct pri *pri);
+extern void *pri_get_userdata(struct pri *pri);

 /* Set the user data associated with the D channel */
-void pri_set_userdata(struct pri *pri, void *userdata);
+extern void pri_set_userdata(struct pri *pri, void *userdata);

 /* Set Network Specific Facility for PRI */
-void pri_set_nsf(struct pri *pri, int nsf);
+extern void pri_set_nsf(struct pri *pri, int nsf);

 /* Set debug parameters on PRI -- see above debug definitions */
-void pri_set_debug(struct pri *pri, int debug);
+extern void pri_set_debug(struct pri *pri, int debug);

 /* Get debug parameters on PRI -- see above debug definitions */
-int pri_get_debug(struct pri *pri);
+extern int pri_get_debug(struct pri *pri);

 #define PRI_FACILITY_ENABLE
 /* Enable transmission support of Facility IEs on the pri */
-void pri_facility_enable(struct pri *pri);
+extern void pri_facility_enable(struct pri *pri);

 /* Run PRI on the given D-channel, taking care of any events that
   need to be handled.  If block is set, it will block until an event
   occurs which needs to be handled */
-pri_event *pri_dchannel_run(struct pri *pri, int block);
+extern pri_event *pri_dchannel_run(struct pri *pri, int block);

 /* Check for an outstanding event on the PRI */
 pri_event *pri_check_event(struct pri *pri);

 /* Give a name to a given event ID */
-char *pri_event2str(int id);
+extern char *pri_event2str(int id);

 /* Give a name to a node type */
-char *pri_node2str(int id);
+extern char *pri_node2str(int id);

 /* Give a name to a switch type */
-char *pri_switch2str(int id);
+extern char *pri_switch2str(int id);

 /* Print an event */
-void pri_dump_event(struct pri *pri, pri_event *e);
+extern void pri_dump_event(struct pri *pri, pri_event *e);

 /* Turn presentation into a string */
-char *pri_pres2str(int pres);
+extern char *pri_pres2str(int pres);

 /* Turn numbering plan into a string */
-char *pri_plan2str(int plan);
+extern char *pri_plan2str(int plan);

 /* Turn cause into a string */
-char *pri_cause2str(int cause);
+extern char *pri_cause2str(int cause);

 /* Acknowledge a call and place it on the given channel.  Set info to non-zero if there
   is in-band data available on the channel */
-int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int info);
+extern int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int info);

 /* Send a digit in overlap mode */
-int pri_information(struct pri *pri, q931_call *call, char digit);
-
-#define PRI_KEYPAD_FACILITY_TX
-/* Send a keypad facility string of digits */
-int pri_keypad_facility(struct pri *pri, q931_call *call, char *digits);
+extern int pri_information(struct pri *pri, q931_call *call, char digit);

 /* Answer the incomplete(call without called number) call on the given channel.
   Set non-isdn to non-zero if you are not connecting to ISDN equipment */
-int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn);
+extern int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn);

 /* Answer the call on the given channel (ignored if you called acknowledge already).
   Set non-isdn to non-zero if you are not connecting to ISDN equipment */
-int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn);
+extern int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn);

 /* Set CRV reference for GR-303 calls */

@@ -508,59 +485,59 @@ int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn);

 /* Hangup a call */
 #define PRI_HANGUP
-int pri_hangup(struct pri *pri, q931_call *call, int cause);
+extern int pri_hangup(struct pri *pri, q931_call *call, int cause);

 #define PRI_DESTROYCALL
-void pri_destroycall(struct pri *pri, q931_call *call);
+extern void pri_destroycall(struct pri *pri, q931_call *call);

 #define PRI_RESTART
-int pri_restart(struct pri *pri);
+extern int pri_restart(struct pri *pri);

-int pri_reset(struct pri *pri, int channel);
+extern int pri_reset(struct pri *pri, int channel);

 /* Create a new call */
-q931_call *pri_new_call(struct pri *pri);
+extern q931_call *pri_new_call(struct pri *pri);

 /* Retrieve CRV reference for GR-303 calls.  Returns >0 on success. */
-int pri_get_crv(struct pri *pri, q931_call *call, int *callmode);
+extern int pri_get_crv(struct pri *pri, q931_call *call, int *callmode);

 /* Retrieve CRV reference for GR-303 calls.  CRV must be >0, call mode should be 0 */
-int pri_set_crv(struct pri *pri, q931_call *call, int crv, int callmode);
+extern int pri_set_crv(struct pri *pri, q931_call *call, int crv, int callmode);

 /* How long until you need to poll for a new event */
-struct timeval *pri_schedule_next(struct pri *pri);
+extern struct timeval *pri_schedule_next(struct pri *pri);

 /* Run any pending schedule events */
-pri_event *pri_schedule_run(struct pri *pri);
+extern pri_event *pri_schedule_run(struct pri *pri);

-int pri_call(struct pri *pri, q931_call *c, int transmode, int channel,
+extern int pri_call(struct pri *pri, q931_call *c, int transmode, int channel,
   int exclusive, int nonisdn, char *caller, int callerplan, char *callername, int callerpres,
 	 char *called,int calledplan, int ulayer1);

-struct pri_sr *pri_sr_new(void);
-void pri_sr_free(struct pri_sr *sr);
+extern struct pri_sr *pri_sr_new(void);
+extern void pri_sr_free(struct pri_sr *sr);

-int pri_sr_set_channel(struct pri_sr *sr, int channel, int exclusive, int nonisdn);
-int pri_sr_set_bearer(struct pri_sr *sr, int transmode, int userl1);
-int pri_sr_set_called(struct pri_sr *sr, char *called, int calledplan, int complete);
-int pri_sr_set_caller(struct pri_sr *sr, char *caller, char *callername, int callerplan, int callerpres);
-int pri_sr_set_redirecting(struct pri_sr *sr, char *num, int plan, int pres, int reason);
+extern int pri_sr_set_channel(struct pri_sr *sr, int channel, int exclusive, int nonisdn);
+extern int pri_sr_set_bearer(struct pri_sr *sr, int transmode, int userl1);
+extern int pri_sr_set_called(struct pri_sr *sr, char *called, int calledplan, int complete);
+extern int pri_sr_set_caller(struct pri_sr *sr, char *caller, char *callername, int callerplan, int callerpres);
+extern int pri_sr_set_redirecting(struct pri_sr *sr, char *num, int plan, int pres, int reason);
 #define PRI_USER_USER_TX
 /* Set the user user field.  Warning!  don't send binary data accross this field */
-void pri_sr_set_useruser(struct pri_sr *sr, const char *userchars);
+extern void pri_sr_set_useruser(struct pri_sr *sr, char *userchars);

-void pri_call_set_useruser(q931_call *sr, const char *userchars);
+extern void pri_call_set_useruser(q931_call *sr, char *userchars);

-int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req);
+extern int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req);

 /* Set a call has a call indpendent signalling connection (i.e. no bchan) */
-int pri_sr_set_connection_call_independent(struct pri_sr *req);
+extern int pri_sr_set_connection_call_independent(struct pri_sr *req);

 /* Send an MWI indication to a remote location.  If activate is non zero, activates, if zero, decativates */
-int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);
+extern int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);

 /* Send an MWI deactivate request to a remote location */
-int pri_mwi_deactivate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);
+extern int pri_mwi_deactivate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);

 #define PRI_2BCT
 /* Attempt to pass the channels back to the NET side if compatable and
@@ -569,30 +546,30 @@ int pri_channel_bridge(q931_call *call1, q931_call *call2);

 /* Override message and error stuff */
 #define PRI_NEW_SET_API
-void pri_set_message(void (*__pri_error)(struct pri *pri, char *));
-void pri_set_error(void (*__pri_error)(struct pri *pri, char *));
+extern void pri_set_message(void (*__pri_error)(struct pri *pri, char *));
+extern void pri_set_error(void (*__pri_error)(struct pri *pri, char *));

 /* Set overlap mode */
 #define PRI_SET_OVERLAPDIAL
-void pri_set_overlapdial(struct pri *pri,int state);
+extern void pri_set_overlapdial(struct pri *pri,int state);

 #define PRI_DUMP_INFO_STR
-char *pri_dump_info_str(struct pri *pri);
+extern char *pri_dump_info_str(struct pri *pri);

 /* Get file descriptor */
-int pri_fd(struct pri *pri);
+extern int pri_fd(struct pri *pri);

 #define PRI_PROGRESS
 /* Send call proceeding */
-int pri_progress(struct pri *pri, q931_call *c, int channel, int info);
+extern int pri_progress(struct pri *pri, q931_call *c, int channel, int info);

 #define PRI_PROCEEDING_FULL
 /* Send call proceeding */
-int pri_proceeding(struct pri *pri, q931_call *c, int channel, int info);
+extern int pri_proceeding(struct pri *pri, q931_call *c, int channel, int info);

 /* Enslave a PRI to another, so they share the same call list
   (and maybe some timers) */
-void pri_enslave(struct pri *master, struct pri *slave);
+extern void pri_enslave(struct pri *master, struct pri *slave);

 #define PRI_GR303_SUPPORT
 #define PRI_ENSLAVE_SUPPORT
@@ -603,20 +580,20 @@ void pri_enslave(struct pri *master, struct pri *slave);
 #define PRI_ANI

 /* Send notification */
-int pri_notify(struct pri *pri, q931_call *c, int channel, int info);
+extern int pri_notify(struct pri *pri, q931_call *c, int channel, int info);

 /* Get/Set PRI Timers  */
 #define PRI_GETSET_TIMERS
-int pri_set_timer(struct pri *pri, int timer, int value);
-int pri_get_timer(struct pri *pri, int timer);
-int pri_timer2idx(char *timer);
+extern int pri_set_timer(struct pri *pri, int timer, int value);
+extern int pri_get_timer(struct pri *pri, int timer);
+extern int pri_timer2idx(char *timer);

 #define PRI_MAX_TIMERS 32

 #define PRI_TIMER_N200	0	/* Maximum numer of q921 retransmissions */
 #define PRI_TIMER_N201	1	/* Maximum numer of octets in an information field */
 #define PRI_TIMER_N202	2	/* Maximum numer of transmissions of the TEI identity request message */
-#define PRI_TIMER_K		3	/* Maximum number of outstanding I-frames */
+#define PRI_TIMER_K	3	/* Maximum number of outstanding I-frames */

 #define PRI_TIMER_T200	4	/* time between SABME's */
 #define PRI_TIMER_T201	5	/* minimum time between retransmissions of the TEI Identity check messages */
@@ -644,7 +621,4 @@ int pri_timer2idx(char *timer);
 #define PRI_TIMER_T321	26
 #define PRI_TIMER_T322	27

-#define PRI_TIMER_TM20	28	/* maximum time avaiting XID response */
-#define PRI_TIMER_NM20	29	/* number of XID retransmits */
-
 #endif
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
 #
 #	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
 #	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
--- a/pri.c
+++ b/pri.c
@@ -81,7 +81,7 @@ char *pri_switch2str(int sw)

 static void pri_default_timers(struct pri *pri, int switchtype)
 {
-	static const int defaulttimers[20][PRI_MAX_TIMERS] = PRI_TIMERS_ALL;
+	int defaulttimers[20][PRI_MAX_TIMERS] = PRI_TIMERS_ALL;
 	int x;

 	for (x = 0; x<PRI_MAX_TIMERS; x++) {
@@ -187,81 +187,73 @@ static int __pri_write(struct pri *pri, void *buf, int buflen)
 	return res;
 }

-struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master, pri_io_cb rd, pri_io_cb wr, void *userdata, int tei, int bri)
+static struct pri *__pri_new(int fd, int node, int switchtype, struct pri *master, pri_io_cb rd, pri_io_cb wr, void *userdata)
 {
 	struct pri *p;
-
-	if (!(p = calloc(1, sizeof(*p))))
-		return NULL;
-
-	p->bri = bri;
-	p->fd = fd;
-	p->read_func = rd;
-	p->write_func = wr;
-	p->userdata = userdata;
-	p->localtype = node;
-	p->switchtype = switchtype;
-	p->cref = 1;
-	p->sapi = (tei == Q921_TEI_GROUP) ? Q921_SAPI_LAYER2_MANAGEMENT : Q921_SAPI_CALL_CTRL;
-	p->tei = tei;
-	p->nsf = PRI_NSF_NONE;
-	p->protodisc = Q931_PROTOCOL_DISCRIMINATOR;
-	p->master = master;
-	p->callpool = &p->localpool;
-	p->ev.gen.pri = p;
-	pri_default_timers(p, switchtype);
-	if (master) {
-		pri_set_debug(p, master->debug);
-		if (master->sendfacility)
-			pri_facility_enable(p);
-	}
+	p = malloc(sizeof(struct pri));
+	if (p) {
+		memset(p, 0, sizeof(struct pri));
+		p->fd = fd;
+		p->read_func = rd;
+		p->write_func = wr;
+		p->userdata = userdata;
+		p->localtype = node;
+		p->switchtype = switchtype;
+		p->cref = 1;
+		p->sapi = Q921_SAPI_CALL_CTRL;
+		p->tei = 0;
+		p->nsf = PRI_NSF_NONE;
+		p->protodisc = Q931_PROTOCOL_DISCRIMINATOR;
+		p->master = master;
+		p->callpool = &p->localpool;
+		pri_default_timers(p, switchtype);
 #ifdef LIBPRI_COUNTERS
-	p->q921_rxcount = 0;
-	p->q921_txcount = 0;
-	p->q931_rxcount = 0;
-	p->q931_txcount = 0;
+		p->q921_rxcount = 0;
+		p->q921_txcount = 0;
+		p->q931_rxcount = 0;
+		p->q931_txcount = 0;
 #endif
-	if (switchtype == PRI_SWITCH_GR303_EOC) {
-		p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
-		p->sapi = Q921_SAPI_GR303_EOC;
-		p->tei = Q921_TEI_GR303_EOC_OPS;
-		p->subchannel = __pri_new_tei(-1, node, PRI_SWITCH_GR303_EOC_PATH, p, NULL, NULL, NULL, Q921_TEI_GR303_EOC_PATH, 0);
-		if (!p->subchannel) {
-			free(p);
-			p = NULL;
+		if (switchtype == PRI_SWITCH_GR303_EOC) {
+			p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
+			p->sapi = Q921_SAPI_GR303_EOC;
+			p->tei = Q921_TEI_GR303_EOC_OPS;
+			p->subchannel = __pri_new(-1, node, PRI_SWITCH_GR303_EOC_PATH, p, NULL, NULL, NULL);
+			if (!p->subchannel) {
+				free(p);
+				p = NULL;
+			}
+		} else if (switchtype == PRI_SWITCH_GR303_TMC) {
+			p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
+			p->sapi = Q921_SAPI_GR303_TMC_CALLPROC;
+			p->tei = Q921_TEI_GR303_TMC_CALLPROC;
+			p->subchannel = __pri_new(-1, node, PRI_SWITCH_GR303_TMC_SWITCHING, p, NULL, NULL, NULL);
+			if (!p->subchannel) {
+				free(p);
+				p = NULL;
+			}
+		} else if (switchtype == PRI_SWITCH_GR303_TMC_SWITCHING) {
+			p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
+			p->sapi = Q921_SAPI_GR303_TMC_SWITCHING;
+			p->tei = Q921_TEI_GR303_TMC_SWITCHING;
+		} else if (switchtype == PRI_SWITCH_GR303_EOC_PATH) {
+			p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
+			p->sapi = Q921_SAPI_GR303_EOC;
+			p->tei = Q921_TEI_GR303_EOC_PATH;
 		}
-	} else if (switchtype == PRI_SWITCH_GR303_TMC) {
-		p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
-		p->sapi = Q921_SAPI_GR303_TMC_CALLPROC;
-		p->tei = Q921_TEI_GR303_TMC_CALLPROC;
-		p->subchannel = __pri_new_tei(-1, node, PRI_SWITCH_GR303_TMC_SWITCHING, p, NULL, NULL, NULL, Q921_TEI_GR303_TMC_SWITCHING, 0);
-		if (!p->subchannel) {
-			free(p);
-			p = NULL;
-		}
-	} else if (switchtype == PRI_SWITCH_GR303_TMC_SWITCHING) {
-		p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
-		p->sapi = Q921_SAPI_GR303_TMC_SWITCHING;
-		p->tei = Q921_TEI_GR303_TMC_SWITCHING;
-	} else if (switchtype == PRI_SWITCH_GR303_EOC_PATH) {
-		p->protodisc = GR303_PROTOCOL_DISCRIMINATOR;
-		p->sapi = Q921_SAPI_GR303_EOC;
-		p->tei = Q921_TEI_GR303_EOC_PATH;
+		/* Start Q.921 layer, Wait if we're the network */
+		if (p)
+			q921_start(p, p->localtype == PRI_CPE);
 	}
-	/* Start Q.921 layer, Wait if we're the network */
-	if (p)
-		q921_start(p, p->localtype == PRI_CPE);
-	
 	return p;
 }

-void pri_call_set_useruser(q931_call *c, const char *userchars)
+void pri_call_set_useruser(q931_call *c, char *userchars)
 {
 	if (userchars)
 		libpri_copy_string(c->useruserinfo, userchars, sizeof(c->useruserinfo));
 }

-void pri_sr_set_useruser(struct pri_sr *sr, const char *userchars)
+void pri_sr_set_useruser(struct pri_sr *sr, char *userchars)
 {
 	sr->useruserinfo = userchars;
 }
@@ -278,15 +270,7 @@ int pri_restart(struct pri *pri)

 struct pri *pri_new(int fd, int nodetype, int switchtype)
 {
-	return __pri_new_tei(fd, nodetype, switchtype, NULL, __pri_read, __pri_write, NULL, Q921_TEI_PRI, 0);
-}
-
-struct pri *pri_new_bri(int fd, int ptpmode, int nodetype, int switchtype)
-{
-	if (ptpmode)
-		return __pri_new_tei(fd, nodetype, switchtype, NULL, __pri_read, __pri_write, NULL, Q921_TEI_PRI, 1);
-	else
-		return __pri_new_tei(fd, nodetype, switchtype, NULL, __pri_read, __pri_write, NULL, Q921_TEI_GROUP, 1);
+	return __pri_new(fd, nodetype, switchtype, NULL, __pri_read, __pri_write, NULL);
 }

 struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read, pri_io_cb io_write, void *userdata)
@@ -295,7 +279,7 @@ struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read,
 		io_read = __pri_read;
 	if (!io_write)
 		io_write = __pri_write;
-	return __pri_new_tei(fd, nodetype, switchtype, NULL, io_read, io_write, userdata, Q921_TEI_PRI, 0);
+	return __pri_new(fd, nodetype, switchtype, NULL, io_read, io_write, userdata);
 }

 void *pri_get_userdata(struct pri *pri)
@@ -487,14 +471,6 @@ int pri_information(struct pri *pri, q931_call *call, char digit)
 	return q931_information(pri, call, digit);
 }

-int pri_keypad_facility(struct pri *pri, q931_call *call, char *digits)
-{
-	if (!pri || !call || !digits || !digits[0])
-		return -1;
-
-	return q931_keypad_facility(pri, call, digits);
-}
-
 int pri_notify(struct pri *pri, q931_call *call, int channel, int info)
 {
 	if (!pri || !call)
@@ -545,44 +521,24 @@ int pri_channel_bridge(q931_call *call1, q931_call *call2)
 	if (!call1 || !call2)
 		return -1;

-	/* Make sure we have compatible switchtypes */
-	if (call1->pri->switchtype != call2->pri->switchtype)
+	/* Check switchtype compatibility */
+	if (call1->pri->switchtype != PRI_SWITCH_LUCENT5E ||
+			call2->pri->switchtype != PRI_SWITCH_LUCENT5E)
 		return -1;

 	/* Check for bearer capability */
 	if (call1->transcapability != call2->transcapability)
 		return -1;
-
-	/* Check to see if we're on the same PRI */
+	/* Check to see if calls are on the same PRI dchannel
+	 * Currently only support calls on the same dchannel
+	 */
 	if (call1->pri != call2->pri)
 		return -1;
 	
-	switch (call1->pri->switchtype) {
-		case PRI_SWITCH_NI2:
-		case PRI_SWITCH_LUCENT5E:
-		case PRI_SWITCH_ATT4ESS:
-			if (eect_initiate_transfer(call1->pri, call1, call2))
-				return -1;
-			else
-				return 0;
-			break;
-		case PRI_SWITCH_DMS100:
-			if (rlt_initiate_transfer(call1->pri, call1, call2))
-				return -1;
-			else
-				return 0;
-			break;
-		case PRI_SWITCH_QSIG:
-			call1->bridged_call = call2;
-			call2->bridged_call = call1;
-			if (anfpr_initiate_transfer(call1->pri, call1, call2))
-				return -1;
-			else
-				return 0;
-			break;
-		default:
-			return -1;
-	}
+	if (eect_initiate_transfer(call1->pri, call1, call2))
+		return -1;
+
+	return 0;
 }

 int pri_hangup(struct pri *pri, q931_call *call, int cause)
@@ -819,7 +775,6 @@ char *pri_dump_info_str(struct pri *pri)
 	len += sprintf(buf + len, "T203 Timer: %d\n", pri->timers[PRI_TIMER_T203]);
 	len += sprintf(buf + len, "T305 Timer: %d\n", pri->timers[PRI_TIMER_T305]);
 	len += sprintf(buf + len, "T308 Timer: %d\n", pri->timers[PRI_TIMER_T308]);
-	len += sprintf(buf + len, "T309 Timer: %d\n", pri->timers[PRI_TIMER_T309]);
 	len += sprintf(buf + len, "T313 Timer: %d\n", pri->timers[PRI_TIMER_T313]);
 	len += sprintf(buf + len, "N200 Counter: %d\n", pri->timers[PRI_TIMER_N200]);

@@ -845,7 +800,7 @@ void pri_enslave(struct pri *master, struct pri *slave)
 struct pri_sr *pri_sr_new(void)
 {
 	struct pri_sr *req;
-	req = malloc(sizeof(*req));
+	req = malloc(sizeof(struct pri_sr));
 	if (req) 
 		pri_sr_init(req);
 	return req;
--- a/pri_facility.c
+++ b/pri_facility.c
--- a/pri_facility.h
+++ b/pri_facility.h
@@ -9,7 +9,6 @@

 #ifndef _PRI_FACILITY_H
 #define _PRI_FACILITY_H
-#include "pri_q931.h"

 /* Protocol Profile field */
 #define Q932_PROTOCOL_ROSE			0x11	/* X.219 & X.229 */
@@ -33,15 +32,6 @@
 #define COMP_TYPE_NFE						0xAA

 /* Operation ID values */
-/* Q.952.7 (ECMA-178) ROSE operations (Transfer) */
-#define ROSE_CALL_TRANSFER_IDENTIFY			7
-#define ROSE_CALL_TRANSFER_ABANDON			8
-#define ROSE_CALL_TRANSFER_INITIATE			9
-#define ROSE_CALL_TRANSFER_SETUP			10
-#define ROSE_CALL_TRANSFER_ACTIVE			11
-#define ROSE_CALL_TRANSFER_COMPLETE			12
-#define ROSE_CALL_TRANSFER_UPDATE			13
-#define ROSE_SUBADDRESS_TRANSFER 			14
 /* Q.952 ROSE operations (Diverting) */
 #define ROSE_DIVERTING_LEG_INFORMATION1		18
 #define ROSE_DIVERTING_LEG_INFORMATION2		0x15
@@ -58,7 +48,6 @@
 #define ROSE_AOC_IDENTIFICATION_OF_CHARGE	37
 /* Q.SIG operations */
 #define SS_CNID_CALLINGNAME					0
-#define SS_ANFPR_PATHREPLACEMENT                                4
 #define SS_DIVERTING_LEG_INFORMATION2		21
 #define SS_MWI_ACTIVATE						80
 #define SS_MWI_DEACTIVATE					81
@@ -115,7 +104,7 @@
 #define ASN1_CLAN_MASK			0xc0
 #define ASN1_UNIVERSAL			0x00
 #define ASN1_APPLICATION		0x40
-#define ASN1_CONTEXT_SPECIFIC		0x80
+#define ASN1_CONTEXT_SPECIFIC	0x80
 #define ASN1_PRIVATE			0xc0

 /* ASN.1 Length masks */
@@ -146,44 +135,30 @@
 #define Q932_TON_SUBSCRIBER				0x04
 #define Q932_TON_ABBREVIATED			0x06

-/* RLT related Operations */
-#define RLT_SERVICE_ID		0x3e
-#define RLT_OPERATION_IND	0x01
-#define RLT_THIRD_PARTY		0x02
-
 struct rose_component {
 	u_int8_t type;
 	u_int8_t len;
 	u_int8_t data[0];
 };

-#if 1
-	#define GET_COMPONENT(component, idx, ptr, length) \
-	if ((idx)+2 > (length)) \
-		break; \
-	(component) = (struct rose_component*)&((ptr)[idx]); \
-	if ((idx)+(component)->len+2 > (length)) { \
-		if ((component)->len != ASN1_LEN_INDEF) \
-			pri_message(pri, "Length (%d) of 0x%X component is too long\n", (component)->len, (component)->type); \
-	}
-#else /* Debugging */
-	#define GET_COMPONENT(component, idx, ptr, length) \
+#define GET_COMPONENT(component, idx, ptr, length) \
 	if ((idx)+2 > (length)) \
 		break; \
 	(component) = (struct rose_component*)&((ptr)[idx]); \
 	if ((idx)+(component)->len+2 > (length)) { \
 		if ((component)->len != 128) \
 			pri_message(pri, "Length (%d) of 0x%X component is too long\n", (component)->len, (component)->type); \
-	} \
-	pri_message(pri, "XX  %s:%d  Got component %d (0x%02X), length %d\n", __FUNCTION__, __LINE__, (component)->type, (component)->type, (component)->len); \
+	}
+/*
+	pri_message("XX Got component %d (0x%02X), length %d\n", (component)->type, (component)->type, (component)->len); \
 	if ((component)->len > 0) { \
 		int zzz; \
-		pri_message(pri, "XX  Data:"); \
+		pri_message("XX  Data:"); \
 		for (zzz = 0; zzz < (component)->len; ++zzz) \
-			pri_message(pri, " %02X", (component)->data[zzz]); \
-		pri_message(pri, "\n"); \
+			pri_message(" %02X", (component)->data[zzz]); \
+		pri_message("\n"); \
 	}
-#endif
+*/

 #define NEXT_COMPONENT(component, idx) \
 	(idx) += (component)->len + 2
@@ -194,7 +169,6 @@ struct rose_component {
 #define CHECK_COMPONENT(component, comptype, message) \
 	if ((component)->type && ((component)->type & ASN1_TYPE_MASK) != (comptype)) { \
 		pri_message(pri, (message), (component)->type); \
-		asn1_dump(pri, (component), (component)->len+2); \
 		break; \
 	}
 	
@@ -255,51 +229,35 @@ struct rose_component {
 		(stack)[(stackpointer)]->len = (unsigned char *)&((data)[(idx)]) - (unsigned char *)(stack)[(stackpointer)] - 2; \
 	} while (0)

-/* Decoder for the invoke ROSE component */
-int rose_invoke_decode(struct pri *pri, struct q931_call *call, q931_ie *ie, unsigned char *data, int len);
+/* Decoder for the invoke part of a ROSE request */
+extern int rose_invoke_decode(struct pri *pri, struct q931_call *call, unsigned char *data, int len);

-/* Decoder for the return result ROSE component */
-int rose_return_result_decode(struct pri *pri, struct q931_call *call, q931_ie *ie, unsigned char *data, int len);
+extern int asn1_copy_string(char * buf, int buflen, struct rose_component *comp);

-/* Decoder for the return error ROSE component */
-int rose_return_error_decode(struct pri *pri, struct q931_call *call, q931_ie *ie, unsigned char *data, int len);
-
-/* Decoder for the reject ROSE component */
-int rose_reject_decode(struct pri *pri, struct q931_call *call, q931_ie *ie, unsigned char *data, int len);
-
-int asn1_copy_string(char * buf, int buflen, struct rose_component *comp);
-
-int asn1_string_encode(unsigned char asn1_type, void *data, int len, int max_len, void *src, int src_len);
+extern int asn1_string_encode(unsigned char asn1_type, void *data, int len, int max_len, void *src, int src_len);

 /* Get Name types from ASN.1 */
-int asn1_name_decode(void * data, int len, char *namebuf, int buflen);
+extern int asn1_name_decode(void * data, int len, char *namebuf, int buflen);

-int typeofnumber_from_q931(struct pri *pri, int ton);
+extern int typeofnumber_from_q931(struct pri *pri, int ton);

-int redirectingreason_from_q931(struct pri *pri, int redirectingreason);
+extern int redirectingreason_from_q931(struct pri *pri, int redirectingreason);

 /* Queues an MWI apdu on a the given call */
-int mwi_message_send(struct pri *pri, q931_call *call, struct pri_sr *req, int activate);
+extern int mwi_message_send(struct pri *pri, q931_call *call, struct pri_sr *req, int activate);

 /* starts a 2BCT */
-int eect_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);
+extern int eect_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);

-int rlt_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);
-
-/* starts a QSIG Path Replacement */
-extern int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);
-
-/* Use this function to queue a facility-IE born APDU onto a call
+/* Use this function to queue a facility-IE born ADPU onto a call
 * call is the call to use, messagetype is any one of the Q931 messages,
 * apdu is the apdu data, apdu_len is the length of the apdu data  */
-int pri_call_apdu_queue(q931_call *call, int messagetype, void *apdu, int apdu_len, void (*function)(void *data), void *data);
+extern int pri_call_apdu_queue(q931_call *call, int messagetype, void *apdu, int apdu_len, void (*function)(void *data), void *data);

 /* Used by q931.c to cleanup the apdu queue upon destruction of a call */
-int pri_call_apdu_queue_cleanup(q931_call *call);
+extern int pri_call_apdu_queue_cleanup(q931_call *call);

-/* Adds the "standard" APDUs to a call */
-int pri_call_add_standard_apdus(struct pri *pri, q931_call *call);
-
-int asn1_dump(struct pri *pri, void *comp, int len);
+/* Adds the "standard" ADPUs to a call */
+extern int pri_call_add_standard_apdus(struct pri *pri, q931_call *call);

 #endif /* _PRI_FACILITY_H */
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -25,12 +25,8 @@
 #ifndef _PRI_INTERNAL_H
 #define _PRI_INTERNAL_H

-#include <stddef.h>
 #include <sys/time.h>

-#define DBGHEAD __FILE__ ":%d %s: "
-#define DBGINFO __LINE__,__PRETTY_FUNCTION__
-
 struct pri_sched {
 	struct timeval when;
 	void (*callback)(void *data);
@@ -61,7 +57,6 @@ struct pri {
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */

-	int bri;
 	int sapi;
 	int tei;
 	int protodisc;
@@ -85,9 +80,6 @@ struct pri {
 	/* Various timers */
 	int sabme_timer;	/* SABME retransmit */
 	int t203_timer;		/* Max idle time */
-	int t202_timer;
-	int n202_counter;
-	int ri;
 	int t200_timer;		/* T-200 retransmission timer */
 	/* All ISDN Timer values */
 	int timers[MAX_TIMERS];
@@ -137,8 +129,7 @@ struct pri_sr {
 	int redirectingpres;
 	int redirectingreason;
 	int justsignalling;
-	const char *useruserinfo;
-	int transferable;
+	char *useruserinfo;
 };

 /* Internal switch types */
@@ -215,7 +206,7 @@ struct q931_call {
 	char callernum[256];
 	char callername[256];

-	char keypad_digits[64];		/* Buffer for digits that come in KEYPAD_FACILITY */
+	char digitbuf[64];		/* Buffer for digits that come in KEYPAD_FACILITY */

 	int ani2;               /* ANI II */
 	
@@ -248,12 +239,6 @@ struct q931_call {
 	long aoc_units;				/* Advice of Charge Units */

 	struct apdu_event *apdus;	/* APDU queue for call */
-
-	int transferable;
-	unsigned int rlt_call_id;	/* RLT call id */
-
-	/* Bridged call info */
-	q931_call *bridged_call;        /* Pointer to other leg of bridged call */
 };

 extern int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), void *data);
@@ -270,6 +255,4 @@ extern void pri_error(struct pri *pri, char *fmt, ...);

 void libpri_copy_string(char *dst, const char *src, size_t size);

-struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master, pri_io_cb rd, pri_io_cb wr, void *userdata, int tei, int bri);
-
 #endif
--- a/pri_q921.h
+++ b/pri_q921.h
@@ -46,11 +46,10 @@
 #define Q921_FRAMETYPE_I	0x0
 #define Q921_FRAMETYPE_S	0x1

-#define Q921_TEI_GROUP					127
-#define Q921_TEI_PRI					0
+#define Q921_TEI_GROUP				127
 #define Q921_TEI_GR303_EOC_PATH			0
 #define Q921_TEI_GR303_EOC_OPS			4
-#define Q921_TEI_GR303_TMC_SWITCHING	0
+#define Q921_TEI_GR303_TMC_SWITCHING		0
 #define Q921_TEI_GR303_TMC_CALLPROC		0

 #define Q921_SAPI_CALL_CTRL		0
@@ -64,14 +63,6 @@
 #define Q921_SAPI_LAYER2_MANAGEMENT	63


-#define Q921_TEI_IDENTITY_REQUEST			1
-#define Q921_TEI_IDENTITY_ASSIGNED			2
-#define Q921_TEI_IDENTITY_DENIED			3
-#define Q921_TEI_IDENTITY_CHECK_REQUEST		4
-#define Q921_TEI_IDENTITY_CHECK_RESPONSE	5
-#define Q921_TEI_IDENTITY_REMOVE			6
-#define Q921_TEI_IDENTITY_VERIFY			7
-
 typedef struct q921_header {
 #if __BYTE_ORDER == __BIG_ENDIAN
 	u_int8_t	sapi:6;	/* Service Access Point Indentifier (always 0 for PRI) (0) */
@@ -163,12 +154,6 @@ typedef struct q921_frame {
 #define Q921_INC(j) (j) = (((j) + 1) % 128)

 typedef enum q921_state {
-	Q921_DOWN,
-	Q921_TEI_UNASSIGNED,
-	Q921_TEI_AWAITING_ESTABLISH,
-	Q921_TEI_AWAITING_ASSIGN,
-	Q921_TEI_ASSIGNED,
-	Q921_NEGOTIATION,
 	Q921_LINK_CONNECTION_RELEASED,	/* Also known as TEI_ASSIGNED */
 	Q921_LINK_CONNECTION_ESTABLISHED,
 	Q921_AWAITING_ESTABLISH,
--- a/pri_q931.h
+++ b/pri_q931.h
@@ -243,10 +243,6 @@ typedef struct q931_ie {
 /* EuroISDN  */
 #define Q931_SENDING_COMPLETE		0xa1

-
-/* Q.SIG specific */
-#define QSIG_IE_TRANSIT_COUNT		0x31
-
 extern int q931_receive(struct pri *pri, q931_h *h, int len);

 extern int q931_alerting(struct pri *pri, q931_call *call, int channel, int info);
@@ -261,8 +257,6 @@ extern int q931_setup_ack(struct pri *pri, q931_call *call, int channel, int non

 extern int q931_information(struct pri *pri, q931_call *call, char digit);

-extern int q931_keypad_facility(struct pri *pri, q931_call *call, char *digits);
-
 extern int q931_connect(struct pri *pri, q931_call *call, int channel, int nonisdn);

 extern int q931_release(struct pri *pri, q931_call *call, int cause);
@@ -285,7 +279,5 @@ extern int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req);
 extern void q931_dump(struct pri *pri, q931_h *h, int len, int txrx);

 extern void __q931_destroycall(struct pri *pri, q931_call *c);
-
-extern void q931_dl_indication(struct pri *pri, int event);
-
+	
 #endif
--- a/pri_timers.h
+++ b/pri_timers.h
@@ -26,37 +26,34 @@
 #define _PRI_TIMERS_H

 /* -1 means we dont currently support the timer/counter */
-#define PRI_TIMERS_DEFAULT { \
-				3,		/* N200 */ \
-				-1,		/* N201 */ \
-				3,		/* N202 */ \
-				7,		/* K */ \
+#define PRI_TIMERS_DEFAULT {	3,	/* N200 */ \
+				-1,	/* N201 */ \
+				-1,	/* N202 */ \
+				7,	/* K */ \
 				1000,	/* T200 */ \
-				-1,		/* T201 */ \
-				10000,	/* T202 */ \
+				-1,	/* T201 */ \
+				-1,	/* T202 */ \
 				10000,	/* T203 */ \
-				-1,		/* T300 */ \
-				-1,		/* T301 */ \
-				-1,		/* T302 */ \
-				-1,		/* T303 */ \
-				-1,		/* T304 */ \
+				-1,	/* T300 */ \
+				-1,	/* T301 */ \
+				-1,	/* T302 */ \
+				-1,	/* T303 */ \
+				-1,	/* T304 */ \
 				30000,	/* T305 */ \
-				-1,		/* T306 */ \
-				-1,		/* T307 */ \
+				-1,	/* T306 */ \
+				-1,	/* T307 */ \
 				4000,	/* T308 */ \
-				-1,		/* T309 */ \
-				-1,		/* T310 */ \
+				-1,	/* T309 */ \
+				-1,	/* T310 */ \
 				4000,	/* T313 */ \
-				-1,		/* T314 */ \
-				-1,		/* T316 */ \
-				-1,		/* T317 */ \
-				-1,		/* T318 */ \
-				-1,		/* T319 */ \
-				-1,		/* T320 */ \
-				-1,		/* T321 */ \
-				-1,		/* T322 */ \
-				2500,	/* TM20 - Q.921 Appendix IV */ \
-				3,		/* NM20 - Q.921 Appendix IV */ \
+				-1,	/* T314 */ \
+				-1,	/* T316 */ \
+				-1,	/* T317 */ \
+				-1,	/* T318 */ \
+				-1,	/* T319 */ \
+				-1,	/* T320 */ \
+				-1,	/* T321 */ \
+				-1	/* T322 */ \
 			}

 /* XXX Only our default timers are setup now XXX */
--- a/pridump.c
+++ b/pridump.c
@@ -37,7 +37,11 @@
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/types.h>
-#include <zaptel/zaptel.h>
+#if defined(__linux__)
+#include <linux/zaptel.h>
+#elif defined(__FreeBSD__)
+#include <zaptel.h>
+#endif
 #include "libpri.h"
 #include "pri_q921.h"
 #include "pri_q931.h"
--- a/prisched.c
+++ b/prisched.c
@@ -35,9 +35,6 @@ int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), vo
 {
 	int x;
 	struct timeval tv;
-	/* Scheduling runs on master channels only */
-	while (pri->master)
-		pri = pri->master;
 	for (x=1;x<MAX_SCHED;x++)
 		if (!pri->pri_sched[x].callback)
 			break;
@@ -116,8 +113,6 @@ pri_event *pri_schedule_run(struct pri *pri)

 void pri_schedule_del(struct pri *pri,int id)
 {
-	while (pri->master)
-		pri = pri->master;
 	if ((id >= MAX_SCHED) || (id < 0)) 
 		pri_error(pri, "Asked to delete sched id %d???\n", id);
 	pri->pri_sched[id].callback = NULL;
--- a/pritest.c
+++ b/pritest.c
@@ -40,7 +40,11 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/time.h>
-#include <zaptel/zaptel.h>
+#if defined(__linux__)
+#include <linux/zaptel.h>
+#elif defined(__FreeBSD__)
+#include <zaptel.h>
+#endif
 #include <zap.h>
 #include "libpri.h"

@@ -294,7 +298,7 @@ static int run_pri(int dfd, int swtype, int node)
 	fd_set rfds, efds;
 	int res,x;

-	pri = pri_new_bri(dfd, 1, node, swtype);
+	pri = pri_new(dfd, node, swtype);
 	if (!pri) {
 		fprintf(stderr, "Unable to create PRI\n");
 		return -1;
--- a/q921.c
+++ b/q921.c
@@ -51,7 +51,6 @@
 } while(0)

 static void reschedule_t203(struct pri *pri);
-static void q921_restart(struct pri *pri, int now);

 static void q921_discard_retransmissions(struct pri *pri)
 {
@@ -69,10 +68,8 @@ static void q921_discard_retransmissions(struct pri *pri)
 static int q921_transmit(struct pri *pri, q921_h *h, int len) 
 {
 	int res;
-
-	while (pri->master)
-		pri = pri->master;
-
+	if (pri->master)
+		return q921_transmit(pri->master, h, len);
 #ifdef RANDOM_DROPS
   if (!(random() % 3)) {
         pri_message(pri, " === Dropping Packet ===\n");
@@ -83,7 +80,7 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
 	pri->q921_txcount++;      
 #endif
 	/* Just send it raw */
-	if (pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
+	if (pri->debug & PRI_DEBUG_Q921_DUMP)
 		q921_dump(pri, h, len, pri->debug & PRI_DEBUG_Q921_RAW, 1);
 	/* Write an extra two bytes for the FCS */
 	res = pri->write_func ? pri->write_func(pri, h, len + 2) : 0;
@@ -95,49 +92,6 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
 	return 0;
 }

-static void q921_send_tei(struct pri *pri, int message, int ri, int ai, int isreq)
-{
-	q921_u *f;
-
-	if (!(f = calloc(1, sizeof(*f) + 5)))
-		return;
-
-	Q921_INIT(pri, *f);
-	f->h.c_r = isreq;
-	f->ft = Q921_FRAMETYPE_U;
-	f->data[0] = 0x0f;	/* Management entity */
-	f->data[1] = (ri >> 8) & 0xff;
-	f->data[2] = ri & 0xff;
-	f->data[3] = message;
-	f->data[4] = (ai << 1) | 1;
-//	if (pri->debug & PRI_DEBUG_Q921_STATE)
-		pri_message(pri, "Sending TEI management message %d, TEI=%d\n", message, ai);
-	q921_transmit(pri, (q921_h *)f, 8);
-	free(f);
-}
-
-static void q921_tei_request(void *vpri)
-{
-	struct pri *pri = (struct pri *)vpri;
-
-	if (pri->subchannel) {
-		pri_error(pri, "Cannot request TEI while its already assigned\n");
-		return;
-	}
-	pri->n202_counter++;
-#if 0
-	if (pri->n202_counter > pri->timers[PRI_TIMER_N202]) {
-		pri_error(pri, "Unable to assign TEI from network\n");
-		return;
-	}
-#endif
-	pri->ri = random() % 65535;
-	q921_send_tei(pri, Q921_TEI_IDENTITY_REQUEST, pri->ri, Q921_TEI_GROUP, 1);
-	if (pri->t202_timer)
-		pri_schedule_del(pri, pri->t202_timer);
-	pri->t202_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T202], q921_tei_request, pri);
-}
-
 static void q921_send_ua(struct pri *pri, int pfbit)
 {
 	q921_h h;
@@ -157,7 +111,7 @@ static void q921_send_ua(struct pri *pri, int pfbit)
 		pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
 		return;
 	}
-	if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "Sending Unnumbered Acknowledgement\n");
 	q921_transmit(pri, &h, 3);
 }
@@ -189,11 +143,9 @@ static void q921_send_sabme(void *vpri, int now)
 		pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
 		return;
 	}
-	if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "Sending Set Asynchronous Balanced Mode Extended\n");
 	q921_transmit(pri, &h, 3);
-	if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_AWAITING_ESTABLISH)
-		pri_message(pri, DBGHEAD "q921_state now is Q921_AWAITING_ESTABLISH\n", DBGINFO);
 	pri->q921_state = Q921_AWAITING_ESTABLISH;
 }

@@ -214,7 +166,7 @@ static int q921_ack_packet(struct pri *pri, int num)
 				prev->next = f->next;
 			else
 				pri->txqueue = f->next;
-			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "-- ACKing packet %d, new txqueue is %d (-1 means empty)\n", f->h.n_s, pri->txqueue ? pri->txqueue->h.n_s : -1);
 			/* Update v_a */
 			pri->v_a = num;
@@ -228,7 +180,7 @@ static int q921_ack_packet(struct pri *pri, int num)
 			while(f) {
 				if (!f->transmitted) {
 					/* Send it now... */
-					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+					if (pri->debug & PRI_DEBUG_Q921_STATE)
 						pri_message(pri, "-- Finally transmitting %d, since window opened up\n", f->h.n_s);
 					f->transmitted++;
 					pri->windowlen++;
@@ -254,7 +206,7 @@ static void reschedule_t203(struct pri *pri)
 {
 	if (pri->t203_timer) {
 		pri_schedule_del(pri, pri->t203_timer);
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- Restarting T203 counter\n");
 		/* Nothing to transmit, start the T203 counter instead */
 		pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
@@ -277,31 +229,31 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack)
 		return ev;
 	}
 	/* Cancel each packet as necessary */
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "-- ACKing all packets from %d to (but not including) %d\n", pri->v_a, ack);
 	for (x=pri->v_a; x != ack; Q921_INC(x)) 
 		cnt += q921_ack_packet(pri, x);	
 	if (!pri->txqueue) {
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- Since there was nothing left, stopping T200 counter\n");
 		/* Something was ACK'd.  Stop T200 counter */
 		pri_schedule_del(pri, pri->t200_timer);
 		pri->t200_timer = 0;
 	}
 	if (pri->t203_timer) {
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- Stopping T203 counter since we got an ACK\n");
 		pri_schedule_del(pri, pri->t203_timer);
 		pri->t203_timer = 0;
 	}
 	if (pri->txqueue) {
 		/* Something left to transmit, Start the T200 counter again if we stopped it */
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- Something left to transmit (%d), restarting T200 counter\n", pri->txqueue->h.n_s);
 		if (!pri->t200_timer)
 			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 	} else {
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- Nothing left, starting T203 counter\n");
 		/* Nothing to transmit, start the T203 counter instead */
 		pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
@@ -329,7 +281,7 @@ static void q921_reject(struct pri *pri, int pf)
 		pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
 		return;
 	}
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "Sending Reject (%d)\n", pri->v_r);
 	pri->sentrej = 1;
 	q921_transmit(pri, &h, 4);
@@ -361,7 +313,7 @@ static void q921_rr(struct pri *pri, int pbit, int cmd) {
 		return;
 	}
 	pri->v_na = pri->v_r;	/* Make a note that we've already acked this */
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "Sending Receiver Ready (%d)\n", pri->v_r);
 	q921_transmit(pri, &h, 4);
 }
@@ -371,7 +323,7 @@ static void t200_expire(void *vpri)
 	struct pri *pri = vpri;
 	if (pri->txqueue) {
 		/* Retransmit first packet in the queue, setting the poll bit */
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug & PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "-- T200 counter expired, What to do...\n");
 		/* Force Poll bit */
 		pri->txqueue->h.p_f = 1;	
@@ -383,7 +335,7 @@ static void t200_expire(void *vpri)
      /* Up to three retransmissions */
      if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
         /* Reschedule t200_timer */
-         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+         if (pri->debug & PRI_DEBUG_Q921_STATE)
            pri_message(pri, "-- Retransmitting %d bytes\n", pri->txqueue->len);
 		if (pri->busy) 
 			q921_rr(pri, 1, 1);
@@ -392,14 +344,12 @@ static void t200_expire(void *vpri)
 				pri_error(pri, "!! Not good - head of queue has not been transmitted yet\n");
 			q921_transmit(pri, (q921_h *)&pri->txqueue->h, pri->txqueue->len);
 		}
-         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+         if (pri->debug & PRI_DEBUG_Q921_STATE) 
               pri_message(pri, "-- Rescheduling retransmission (%d)\n", pri->retrans);
         pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
      } else {
-         if (pri->debug & PRI_DEBUG_Q921_STATE)
+         if (pri->debug & PRI_DEBUG_Q921_STATE) 
               pri_message(pri, "-- Timeout occured, restarting PRI\n");
-	if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_LINK_CONNECTION_RELEASED)
-		pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_RELEASED\n",DBGINFO);
         pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
      	pri->t200_timer = 0;
         q921_dchannel_down(pri);
@@ -407,7 +357,7 @@ static void t200_expire(void *vpri)
         pri->schedev = 1;
      }
 	} else if (pri->solicitfbit) {
-         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+         if (pri->debug & PRI_DEBUG_Q921_STATE)
            pri_message(pri, "-- Retrying poll with f-bit\n");
 		pri->retrans++;
 		if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
@@ -415,10 +365,8 @@ static void t200_expire(void *vpri)
 			q921_rr(pri, 1, 1);
 			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 		} else {
-			if (pri->debug & PRI_DEBUG_Q921_STATE)
+			if (pri->debug & PRI_DEBUG_Q921_STATE) 
 				pri_message(pri, "-- Timeout occured, restarting PRI\n");
-			if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_LINK_CONNECTION_RELEASED)
-				pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_RELEASED\n", DBGINFO);
 			pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
 			pri->t200_timer = 0;
 			q921_dchannel_down(pri);
@@ -434,10 +382,10 @@ static void t200_expire(void *vpri)
 int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 {
 	q921_frame *f, *prev=NULL;
-
 	for (f=pri->txqueue; f; f = f->next) prev = f;
-	f = calloc(1, sizeof(q921_frame) + len + 2);
+	f = malloc(sizeof(q921_frame) + len + 2);
 	if (f) {
+		memset(f,0,sizeof(q921_frame) + len + 2);
 		Q921_INIT(pri, f->h);
 		switch(pri->localtype) {
 		case PRI_NETWORK:
@@ -475,23 +423,23 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 				q921_transmit(pri, (q921_h *)(&f->h), f->len);
 				f->transmitted++;
 			} else {
-				if (pri->debug & PRI_DEBUG_Q921_DUMP)
+				if (pri->debug & PRI_DEBUG_Q921_STATE)
 					pri_message(pri, "Delaying transmission of %d, window is %d/%d long\n", 
 						f->h.n_s, pri->windowlen, pri->window);
 			}
 		}
 		if (pri->t203_timer) {
-			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "Stopping T_203 timer\n");
 			pri_schedule_del(pri, pri->t203_timer);
 			pri->t203_timer = 0;
 		}
 		if (!pri->t200_timer) {
-			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "Starting T_200 timer\n");
 			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 		} else
-			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "T_200 timer already going (%d)\n", pri->t200_timer);
 		
 	} else {
@@ -505,7 +453,7 @@ static void t203_expire(void *vpri)
 {
 	struct pri *pri = vpri;
 	if (pri->q921_state == Q921_LINK_CONNECTION_ESTABLISHED) {
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "T203 counter expired, sending RR and scheduling T203 again\n");
 		/* Solicit an F-bit in the other's RR */
 		pri->solicitfbit = 1;
@@ -514,7 +462,7 @@ static void t203_expire(void *vpri)
 		/* Start timer T200 to resend our RR if we don't get it */
 		pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 	} else {
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
 			pri_message(pri, "T203 counter expired in weird state %d\n", pri->q921_state);
 		pri->t203_timer = 0;
 	}
@@ -699,25 +647,18 @@ static pri_event *q921_dchannel_up(struct pri *pri)
 	q921_reset(pri);
 	
 	/* Stop any SABME retransmissions */
-	if (pri->sabme_timer) {
-		pri_schedule_del(pri, pri->sabme_timer);
-		pri->sabme_timer = 0;
-	}
+	pri_schedule_del(pri, pri->sabme_timer);
+	pri->sabme_timer = 0;
 	
 	/* Reset any rejects */
 	pri->sentrej = 0;
 	
 	/* Go into connection established state */
-	if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_LINK_CONNECTION_ESTABLISHED)
-		pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_ESTABLISHED\n", DBGINFO);
 	pri->q921_state = Q921_LINK_CONNECTION_ESTABLISHED;

 	/* Start the T203 timer */
 	pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
 	
-	/* Notify Layer 3 */
-	q931_dl_indication(pri, PRI_EVENT_DCHAN_UP);
-
 	/* Report event that D-Channel is now up */
 	pri->ev.gen.e = PRI_EVENT_DCHAN_UP;
 	return &pri->ev;
@@ -728,9 +669,6 @@ static pri_event *q921_dchannel_down(struct pri *pri)
 	/* Reset counters, reset sabme timer etc */
 	q921_reset(pri);
 	
-	/* Notify Layer 3 */
-	q931_dl_indication(pri, PRI_EVENT_DCHAN_DOWN);
-
 	/* Report event that D-Channel is now up */
 	pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN;
 	return &pri->ev;
@@ -745,19 +683,14 @@ void q921_reset(struct pri *pri)
 	pri->v_na = 0;
 	pri->window = pri->timers[PRI_TIMER_K];
 	pri->windowlen = 0;
-	if (pri->sabme_timer)
-		pri_schedule_del(pri, pri->sabme_timer);
-	if (pri->t203_timer)
-		pri_schedule_del(pri, pri->t203_timer);
-	if (pri->t200_timer)
-		pri_schedule_del(pri, pri->t200_timer);
+	pri_schedule_del(pri, pri->sabme_timer);
+	pri_schedule_del(pri, pri->t203_timer);
+	pri_schedule_del(pri, pri->t200_timer);
 	pri->sabme_timer = 0;
 	pri->t203_timer = 0;
 	pri->t200_timer = 0;
 	pri->busy = 0;
 	pri->solicitfbit = 0;
-	if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_LINK_CONNECTION_RELEASED)
-		pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_RELEASED\n", DBGINFO);
 	pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
 	pri->retrans = 0;
 	pri->sentrej = 0;
@@ -766,66 +699,6 @@ void q921_reset(struct pri *pri)
 	q921_discard_retransmissions(pri);
 }

-static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
-{
-	int ri;
-	struct pri *sub;
-	int tei;
-	pri_message(pri, "Received MDL message\n");
-	if (h->data[0] != 0x0f) {
-		pri_error(pri, "Received MDL with unsupported management entity %02x\n", h->data[0]);
-		return NULL;
-	}
-	if (!(h->data[4] & 0x01)) {
-		pri_error(pri, "Received MDL with multibyte TEI identifier\n");
-		return NULL;
-	}
-	ri = (h->data[1] << 8) | h->data[2];
-	tei = (h->data[4] >> 1);
-	switch(h->data[3]) {
-	case Q921_TEI_IDENTITY_REQUEST:
-		if (tei != 127) {
-			pri_error(pri, "Received TEI identity request with invalid TEI %d\n", tei);
-			q921_send_tei(pri, Q921_TEI_IDENTITY_DENIED, ri, tei, 0);
-		}
-		/* Go to master */
-		for (sub = pri; sub->master; sub = sub->master);
-		tei = 64;
-		while(sub->subchannel) {
-			if(sub->subchannel->tei == tei)
-				++tei;
-		}
-		sub->subchannel = __pri_new_tei(-1, pri->localtype, pri->switchtype, pri, NULL, NULL, NULL, tei, 1);
-		if (!sub->subchannel) {
-			pri_error(pri, "Unable to allocate D-channel for new TEI %d\n", tei);
-			return NULL;
-		}
-		q921_send_tei(pri, Q921_TEI_IDENTITY_ASSIGNED, ri, tei, 0);
-		break;
-	case Q921_TEI_IDENTITY_ASSIGNED:
-		if (ri != pri->ri) {
-			pri_message(pri, "TEI assignment received for invalid Ri %02x (our is %02x)\n", ri, pri->ri);
-			return NULL;
-		}
-		if (pri->t202_timer) {
-			pri_schedule_del(pri, pri->t202_timer);
-			pri->t202_timer = 0;
-		}
-		if (pri->subchannel) {
-			pri_error(pri, "TEI already assigned (new is %d, current is %d)\n", tei, pri->subchannel->tei);
-		}
-		pri_message(pri, "TEI assiged to %d\n", tei);
-		pri->subchannel = __pri_new_tei(-1, pri->localtype, pri->switchtype, pri, NULL, NULL, NULL, tei, 1);
-		if (!pri->subchannel) {
-			pri_error(pri, "Unable to allocate D-channel for new TEI %d\n", tei);
-			return NULL;
-		}
-		pri->q921_state = Q921_TEI_ASSIGNED;
-		break;
-	}
-	return NULL;	/* Do we need to return something??? */
-}
-
 static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 {
 	q921_frame *f;
@@ -866,69 +739,69 @@ static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 			if (h->s.p_f) {
 				/* If it's a p/f one then send back a RR in return with the p/f bit set */
 				if (pri->solicitfbit) {
-					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+					if (pri->debug & PRI_DEBUG_Q921_STATE) 
 						pri_message(pri, "-- Got RR response to our frame\n");
 				} else {
-					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+					if (pri->debug & PRI_DEBUG_Q921_STATE) 
 						pri_message(pri, "-- Unsolicited RR with P/F bit, responding\n");
 						q921_rr(pri, 1, 0);
 				}
 				pri->solicitfbit = 0;
 			}
 			break;
- 		case 1:
- 			/* Receiver not ready */
- 			if (pri->debug & PRI_DEBUG_Q921_STATE)
- 				pri_message(pri, "-- Got receiver not ready\n");
- 			if(h->s.p_f) {
- 				/* Send RR if poll bit set */
- 				q921_rr(pri, h->s.p_f, 0);
- 			}
- 			pri->busy = 1;
- 			break;   
- 		case 2:
- 			/* Just retransmit */
- 			if (pri->debug & PRI_DEBUG_Q921_STATE)
- 				pri_message(pri, "-- Got reject requesting packet %d...  Retransmitting.\n", h->s.n_r);
- 			if (h->s.p_f) {
- 				/* If it has the poll bit set, send an appropriate supervisory response */
- 				q921_rr(pri, 1, 0);
- 			}
- 			sendnow = 0;
- 			/* Resend the proper I-frame */
- 			for(f=pri->txqueue;f;f=f->next) {
- 				if ((sendnow || (f->h.n_s == h->s.n_r)) && f->transmitted) {
- 					/* Matches the request, or follows in our window, and has
- 					   already been transmitted. */
- 					sendnow = 1;
- 					pri_error(pri, "!! Got reject for frame %d, retransmitting frame %d now, updating n_r!\n", h->s.n_r, f->h.n_s);
- 					f->h.n_r = pri->v_r;
- 					q921_transmit(pri, (q921_h *)(&f->h), f->len);
- 				}
- 			}
- 			if (!sendnow) {
- 				if (pri->txqueue) {
- 					/* This should never happen */
- 					if (!h->s.p_f || h->s.n_r) {
- 						pri_error(pri, "!! Got reject for frame %d, but we only have others!\n", h->s.n_r);
- 					}
- 				} else {
- 					/* Hrm, we have nothing to send, but have been REJ'd.  Reset v_a, v_s, etc */
- 					pri_error(pri, "!! Got reject for frame %d, but we have nothing -- resetting!\n", h->s.n_r);
- 					pri->v_a = h->s.n_r;
- 					pri->v_s = h->s.n_r;
- 					/* Reset t200 timer if it was somehow going */
- 					if (pri->t200_timer) {
- 						pri_schedule_del(pri, pri->t200_timer);
- 						pri->t200_timer = 0;
- 					}
- 					/* Reset and restart t203 timer */
- 					if (pri->t203_timer)
- 						pri_schedule_del(pri, pri->t203_timer);
- 					pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
- 				}
- 			}
- 			break;
+      case 1:
+         /* Receiver not ready */
+         if (pri->debug & PRI_DEBUG_Q921_STATE)
+            pri_message(pri, "-- Got receiver not ready\n");
+	 if(h->s.p_f) {
+		/* Send RR if poll bit set */
+		q921_rr(pri, h->s.p_f, 0);
+	 }
+         pri->busy = 1;
+         break;   
+      case 2:
+         /* Just retransmit */
+         if (pri->debug & PRI_DEBUG_Q921_STATE)
+            pri_message(pri, "-- Got reject requesting packet %d...  Retransmitting.\n", h->s.n_r);
+         if (h->s.p_f) {
+            /* If it has the poll bit set, send an appropriate supervisory response */
+            q921_rr(pri, 1, 0);
+         }
+		 sendnow = 0;
+         /* Resend the proper I-frame */
+         for(f=pri->txqueue;f;f=f->next) {
+               if ((sendnow || (f->h.n_s == h->s.n_r)) && f->transmitted) {
+                     /* Matches the request, or follows in our window, and has
+					    already been transmitted. */
+					 sendnow = 1;
+					 pri_error(pri, "!! Got reject for frame %d, retransmitting frame %d now, updating n_r!\n", h->s.n_r, f->h.n_s);
+				     f->h.n_r = pri->v_r;
+                     q921_transmit(pri, (q921_h *)(&f->h), f->len);
+               }
+         }
+         if (!sendnow) {
+               if (pri->txqueue) {
+                     /* This should never happen */
+		     if (!h->s.p_f || h->s.n_r) {
+			pri_error(pri, "!! Got reject for frame %d, but we only have others!\n", h->s.n_r);
+		     }
+               } else {
+                     /* Hrm, we have nothing to send, but have been REJ'd.  Reset v_a, v_s, etc */
+				pri_error(pri, "!! Got reject for frame %d, but we have nothing -- resetting!\n", h->s.n_r);
+                     pri->v_a = h->s.n_r;
+                     pri->v_s = h->s.n_r;
+                     /* Reset t200 timer if it was somehow going */
+                     if (pri->t200_timer) {
+                           pri_schedule_del(pri, pri->t200_timer);
+                           pri->t200_timer = 0;
+                     }
+                     /* Reset and restart t203 timer */
+                     if (pri->t203_timer)
+                           pri_schedule_del(pri, pri->t203_timer);
+                     pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
+               }
+         }
+         break;
 		default:
 			pri_error(pri, "!! XXX Unknown Supervisory frame ss=0x%02x,pf=%02xnr=%02x vs=%02x, va=%02x XXX\n", h->s.ss, h->s.p_f, h->s.n_r,
 					pri->v_s, pri->v_a);
@@ -945,49 +818,38 @@ static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 				if (h->u.p_f) {
 					/* Section 5.7.1 says we should restart on receiving a DM response with the f-bit set to
 					   one, but we wait T200 first */
-					if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+					if (pri->debug & PRI_DEBUG_Q921_STATE)
 						pri_message(pri, "-- Got DM Mode from peer.\n");
 					/* Disconnected mode, try again after T200 */
 					ev = q921_dchannel_down(pri);
-					q921_restart(pri, 0);
+					q921_start(pri, 0);
 					return ev;
 						
 				} else {
-					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+					if (pri->debug & PRI_DEBUG_Q921_STATE)
 						pri_message(pri, "-- Ignoring unsolicited DM with p/f set to 0\n");
 #if 0
 					/* Requesting that we start */
-					q921_restart(pri, 0);
+					q921_start(pri, 0);
 #endif					
 				}
 				break;
 			} else if (!h->u.m2) {
-				if ((pri->sapi == Q921_SAPI_LAYER2_MANAGEMENT) && (pri->tei == Q921_TEI_GROUP))
-					q921_receive_MDL(pri, (q921_u *)h, len);
-				else {
-					int res;
-
-					res = q931_receive(pri, (q931_h *) h->u.data, len - 3);
-					if (res == -1) {
-						return NULL;
-					}
-					if (res & Q931_RES_HAVEEVENT)
-						return &pri->ev;
-				}
+				pri_message(pri, "XXX Unnumbered Information not implemented XXX\n");
 			}
 			break;
 		case 2:
-			if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+			if (pri->debug &  PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "-- Got Disconnect from peer.\n");
 			/* Acknowledge */
 			q921_send_ua(pri, h->u.p_f);
 			ev = q921_dchannel_down(pri);
-			q921_restart(pri, 0);
+			q921_start(pri, 0);
 			return ev;
 		case 3:
 			if (h->u.m2 == 3) {
 				/* SABME */
-				if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP)) {
+				if (pri->debug & PRI_DEBUG_Q921_STATE) {
 					pri_message(pri, "-- Got SABME from %s peer.\n", h->h.c_r ? "network" : "cpe");
 				}
 				if (h->h.c_r) {
@@ -1009,7 +871,7 @@ static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 			} else if (h->u.m2 == 0) {
 					/* It's a UA */
 				if (pri->q921_state == Q921_AWAITING_ESTABLISH) {
-					if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP)) {
+					if (pri->debug & PRI_DEBUG_Q921_STATE) {
 						pri_message(pri, "-- Got UA from %s peer  Link up.\n", h->h.c_r ? "cpe" : "network");
 					}
 					return q921_dchannel_up(pri);
@@ -1039,33 +901,28 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 	/* Discard FCS */
 	len -= 2;
 	
-	if (!pri->master && pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
+	if (!pri->master && pri->debug & PRI_DEBUG_Q921_DUMP)
 		q921_dump(pri, h, len, pri->debug & PRI_DEBUG_Q921_RAW, 0);

 	/* Check some reject conditions -- Start by rejecting improper ea's */
 	if (h->h.ea1 || !(h->h.ea2))
 		return NULL;

-#if 0 /* Will be rejected by subchannel analyzis */
 	/* Check for broadcasts - not yet handled */
 	if (h->h.tei == Q921_TEI_GROUP)
 		return NULL;
-#endif

-	if (!((h->h.sapi == pri->sapi) && ((h->h.tei == pri->tei) || (h->h.tei == Q921_TEI_GROUP)))) {
-		/* Check for SAPIs we don't yet handle */
+	/* Check for SAPIs we don't yet handle */
+	if ((h->h.sapi != pri->sapi) || (h->h.tei != pri->tei)) {
+#ifdef PROCESS_SUBCHANNELS
 		/* If it's not us, try any subchannels we have */
 		if (pri->subchannel)
 			return q921_receive(pri->subchannel, h, len + 2);
 		else 
-		{
-			pri_error(pri, "Message for SAPI/TEI=%d/%d IS NOT HANDLED\n", h->h.sapi, h->h.tei);
+#endif
 			return NULL;
-		}

 	}
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
-		pri_message(pri, "Handling message for SAPI/TEI=%d/%d\n", h->h.sapi, h->h.tei);
 	ev = __q921_receive_qualified(pri, h, len);
 	reschedule_t203(pri);
 	return ev;
@@ -1081,7 +938,7 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 	return e;
 }

-static void q921_restart(struct pri *pri, int now)
+void q921_start(struct pri *pri, int now)
 {
 	if (pri->q921_state != Q921_LINK_CONNECTION_RELEASED) {
 		pri_error(pri, "!! q921_start: Not in 'Link Connection Released' state\n");
@@ -1092,17 +949,3 @@ static void q921_restart(struct pri *pri, int now)
 	/* Do the SABME XXX Maybe we should implement T_WAIT? XXX */
 	q921_send_sabme(pri, now);
 }
-
-void q921_start(struct pri *pri, int isCPE)
-{
-	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);
-	}
-}
--- a/q931.c
+++ b/q931.c
--- a/testprilib.c
+++ b/testprilib.c
@@ -42,7 +42,11 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <zaptel/zaptel.h>
+#if defined(__linux__)
+#include <linux/zaptel.h>
+#elif defined(__FreeBSD__) || defined(SOLARIS)
+#include <zaptel.h>
+#endif
 #ifndef SOLARIS
 #include <zap.h>
 #endif
@@ -64,7 +68,7 @@ static struct pri *first, *cur;

 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;

-#define TEST_CALLS 1
+#define TEST_CALLS 32

 static void event1(struct pri *pri, pri_event *e)
 {
@@ -143,7 +147,7 @@ static void event2(struct pri *pri, pri_event *e)
 	}
 }

-static void testmsg(struct pri *pri, char *s)
+static void testmsg(char *s)
 {
 	char *c;
 	static int keeplast = 0;
@@ -169,7 +173,7 @@ static void testmsg(struct pri *pri, char *s)
 		keeplast = 0;
 }

-static void testerr(struct pri *pri, char *s)
+static void testerr(char *s)
 {
 	char *c;
 	static int keeplast = 0;
@@ -232,9 +236,9 @@ static void *dchan(void *data)
 		}
 		if (e) {
 			if (first == pri) {
-				event1(e->gen.pri, e);
+				event1(pri, e);
 			} else {
-				event2(e->gen.pri, e);
+				event2(pri, e);
 			}
 		}
 		pthread_mutex_unlock(&lock);
@@ -254,23 +258,21 @@ int main(int argc, char *argv[])
 		perror("socketpair");
 		exit(1);
 	}
-	if (!(pri = pri_new_bri(pair[0], 0, PRI_NETWORK, PRI_DEF_SWITCHTYPE))) {
+	if (!(pri = pri_new(pair[0], PRI_NETWORK, PRI_DEF_SWITCHTYPE))) {
 		perror("pri(0)");
 		exit(1);
 	}
 	first = pri;
 	pri_set_debug(pri, DEBUG_LEVEL);
-	pri_facility_enable(pri);
 	if (pthread_create(&tmp, NULL, dchan, pri)) {
 		perror("thread(0)");
 		exit(1);
 	}
-	if (!(pri = pri_new_bri(pair[1], 0, PRI_CPE, PRI_DEF_SWITCHTYPE))) {
+	if (!(pri = pri_new(pair[1], PRI_CPE, PRI_DEF_SWITCHTYPE))) {
 		perror("pri(1)");
 		exit(1);
 	}
 	pri_set_debug(pri, DEBUG_LEVEL);
-	pri_facility_enable(pri);
 	if (pthread_create(&tmp, NULL, dchan, pri)) {
 		perror("thread(1)");
 		exit(1);
Author	SHA1	Message	Date
Kevin P. Fleming	cbf719fa3a	make tag in preparation for release git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.2.1@282 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-12-06 23:38:12 +00:00
Matthew Fredrickson	8fc524e6e7	Send RR as command instead of response when T200 expires after receiving RNR. git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@280 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-12-06 21:35:50 +00:00
Kevin P. Fleming	50e2d23352	Makefile 'update' target now supports Subversion repositories (issue #5875 ) git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@274 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-12-01 23:13:49 +00:00
Matthew Fredrickson	8c424cc4ff	Backport of fix from trunk. Fix broken single digit keypad facility code. git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@270 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-12-01 02:34:44 +00:00
Kevin P. Fleming	2f6aee20d9	remove extraneous svn:executable properties git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@266 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-11-29 18:39:18 +00:00
Kevin P. Fleming	1328ab60de	remove CVS ignore list, update SVN ignore list git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@265 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-11-29 00:31:21 +00:00
Kevin P. Fleming	f826a6e4ad	rename branches git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.2@261 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-11-27 04:14:49 +00:00
Admin Commit	4ec90f7435	This commit was manufactured by cvs2svn to create branch 'v1-2'. git-svn-id: https://origsvn.digium.com/svn/libpri/branches/v1-2@256 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-10-25 16:59:59 +00:00