importing files for 1.4.0-beta1 release

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.0-beta1@376 2fbb986a-6c06-0410-b554-c9c1f0a7f128
Creating tag for the release of libpri-1.4.0-beta1
2006-09-20 21:22:25 +00:00 · 2006-09-20 21:20:41 +00:00 · 2006-09-20 21:00:32 +00:00 · 2006-09-20 20:58:27 +00:00 · 2006-07-28 14:41:57 +00:00 · 2006-07-21 15:55:54 +00:00
25 changed files with 5933 additions and 936 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +0,0 @@
-.depend
-*.lo
-libpri.so.1.0
-pritest
-
--- a/.version
+++ b/.version
@@ -0,0 +1 @@
+1.4.0-beta1
--- a/17
+++ b/17
@@ -1,16 +1,3 @@
-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 0.1.1
-- Added PRI_DEBUG_Q931_ANOMALY flag so that certain non-error-related
-messages would not be output unless specifically desired.
-
-libpri 0.1.0
- -- Initial release
+2006-09-20  Kevin P. Fleming  <kpfleming@digium.com>

+	* libpri 1.4.0-beta1 released.
--- a/341
+++ b/341
@@ -0,0 +1,341 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- a/99
+++ b/99
@@ -27,50 +27,95 @@
 # Uncomment if you want libpri to count number of Q921/Q931 sent/received
 #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS

-TOBJS=testpri.o
-T2OBJS=testprilib.o
+CC=gcc
+
+OSARCH=$(shell uname -s)
+PROC?=$(shell uname -m)
+
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY=libpri.so.1.0
-STATIC_OBJS=pri.o q921.o prisched.o q931.o
-DYNAMIC_OBJS=pri.lo q921.lo prisched.lo q931.lo
+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 $(ALERTING) $(LIBPRI_COUNTERS)
-INSTALL_PREFIX=
+INSTALL_PREFIX=$(DESTDIR)
+INSTALL_BASE=/usr
+SOFLAGS = -Wl,-hlibpri.so.1.0
+LDCONFIG = /sbin/ldconfig
+ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
+LDCONFIG_FLAGS=-n
+else
+ifeq (${OSARCH},FreeBSD)
+LDCONFIG_FLAGS=-m
+CFLAGS += -I../zaptel -I../zapata
+INSTALL_BASE=/usr/local
+endif
+endif
+ifeq (${OSARCH},SunOS)
+CFLAGS += -DSOLARIS -I../zaptel-solaris
+LDCONFIG = 
+LDCONFIG_FLAGS = \# # Trick to comment out the period in the command below
+SOSLINK = ln -sf libpri.so.1.0 libpri.so.1
+#INSTALL_PREFIX = /opt/asterisk  # Uncomment out to install in standard Solaris location for 3rd party code
+endif
+
+#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.
+#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+ifeq ($(PROC),sparc64)
+PROC=ultrasparc
+CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+endif

 all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)

 update:
-	@echo "Updating from CVS"
-	@cvs update -d
+	@if [ -d .svn ]; then \
+		echo "Updating from Subversion..." ; \
+		svn update -q; \
+	else \
+		echo "Not under version control";  \
+	fi

 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-	mkdir -p $(INSTALL_PREFIX)/usr/lib
-	mkdir -p $(INSTALL_PREFIX)/usr/include
-	install -m 644 libpri.h $(INSTALL_PREFIX)/usr/include
-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib
-	( cd $(INSTALL_PREFIX)/usr/lib ; ln -sf libpri.so.1 libpri.so )
-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib
-	/sbin/ldconfig
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+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  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 )
+	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
+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) )
+	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
+endif

 uninstall:
 	@echo "Removing Libpri"
-	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so.1.0
-	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so
-	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.a
-	rm -f $(INSTALL_PREFIX)/usr/include/libpri.h
+	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1.0
+	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1
+	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
+	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
+	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h

 pritest: pritest.o
-	$(CC) -o pritest pritest.o -L. -lpri -lzap
+	$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)

 testprilib.o: testprilib.c
 	$(CC) $(CFLAGS) -D_REENTRANT -D_GNU_SOURCE -o $@ -c $<

 testprilib: testprilib.o
-	$(CC) -o testprilib testprilib.o -L. -lpri -lpthread
+	$(CC) -o testprilib testprilib.o -L. -lpri -lpthread $(CFLAGS)

 pridump: pridump.o
-	$(CC) -o pridump pridump.o -L. -lpri -lzap
+	$(CC) -o pridump pridump.o -L. -lpri $(CFLAGS)

+ifneq ($(wildcard .depend),)
 include .depend
+endif

 %.lo : %.c
 	$(CC) -fPIC $(CFLAGS) -o $@ -c $<
@@ -80,17 +125,19 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ranlib $(STATIC_LIBRARY)

 $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
-	$(CC) -shared -Wl,-soname,libpri.so.1 -o $@ $(DYNAMIC_OBJS)
-	/sbin/ldconfig -n .
-	ln -sf libpri.so.1 libpri.so
+	$(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
+	$(SOSLINK)

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

 depend: .depend

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

-Written by Mark Spencer <markster@linux-support.net>
+Written by Mark Spencer <markster@digium.com>

 What is libpri?
 ===============

 libpri is a C implementation of the Primary Rate ISDN specification.  It was
 based on the Bellcore specification SR-NWT-002343 for National ISDN.  As of
-May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and Lucent 5E Custom protocols on switches from Nortel and Lucent.
+May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and 
+Lucent 5E Custom protocols on switches from Nortel and Lucent.

 What is the license for libpri?
 ===============================
-libpri is distributed under the terms of the GNU General Public License, which permit its use and linking with other GPL'd software only.  
+libpri is distributed under the terms of the GNU General Public License, 
+which permit its use and linking with other GPL'd software only.  
+The GNU GPL is included in the file LICENSE in this directory.
+
+As a special exception, libpri may also be linked to the OpenH323
+library, so long as the entirity of the derivative work (as defined
+within the GPL) is licensed either under the MPL of the OpenH323 license
+or the GPL of libpri.
+
+If you wish to use libpri in an application for which the GPL is not 
+appropriate (e.g. a proprietary embedded system), licenses for libpri 
+under more flexible terms can be readily obtained through Digium, Inc. 
+at reasonable cost.

-If you wish to use libpri in an application for which the GPL is not appropriate (e.g. a proprietary embedded system), licenses for libpri under more flexible terms can be readily obtained through Linux Support Services, Inc. at reasonable cost.

 How do I report bugs or contribute?
 ===================================
-For now, contact the author directly.  In the future if there is sufficient interest, we will setup a mailing list.
+For now, contact the author directly.  In the future if there is 
+sufficient interest, we will setup a mailing list.

 Does anything use this library so far?
 ======================================
-Yes, the Asterisk Open Source PBX does.  http://www.asteriskpbx.com
+Yes, the Asterisk Open Source PBX does.  http://www.asterisk.org

 Also, the Zapata library has hooks for it.  http://www.zapatatelephony.org

 Special thanks
 ==============
-Special thanks to Jim Dixon <jim@lambdatel.com> for his help in testing and fixing the implementation.
+Special thanks to Jim Dixon <jim@lambdatel.com> for his help in 
+testing and fixing the implementation.

--- a/4
+++ b/4
@@ -1,10 +1,8 @@
 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/compat.h
+++ b/compat.h
@@ -0,0 +1,10 @@
+#ifndef __COMPAT_H
+#define __COMPAT_H
+
+#ifdef SOLARIS
+typedef	unsigned char	u_int8_t;
+typedef	unsigned short	u_int16_t;
+typedef	unsigned int	u_int32_t;
+#endif
+
+#endif
--- a/compiler.h
+++ b/compiler.h
@@ -0,0 +1,19 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Compiler-specific macros and other items
+ *
+ * Copyright (C) 2005, Digium, Inc.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#ifndef _ASTERISK_COMPILER_H
+#define _ASTERISK_COMPILER_H
+
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#define __builtin_expect(exp, c) (exp)
+#endif
+
+#endif /* _ASTERISK_COMPILER_H */
--- a/copy_string.c
+++ b/copy_string.c
@@ -0,0 +1,42 @@
+/*
+ * libpri: An implementation of Primary Rate ISDN
+ *
+ * Written by Mark Spencer <markster@digium.com>
+ *
+ * Copyright (C) 2005, Digium
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+ 
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "compiler.h"
+#include "libpri.h"
+#include "pri_internal.h"
+
+void libpri_copy_string(char *dst, const char *src, size_t size)
+{
+	while (*src && size) {
+		*dst++ = *src++;
+		size--;
+	}
+	if (__builtin_expect(!size, 0))
+		dst--;
+	*dst = '\0';
+}
--- a/libpri.h
+++ b/libpri.h
@@ -37,6 +37,8 @@
 #define PRI_DEBUG_Q931_DUMP		(1 << 5)	/* Show interpreted Q.931 frames */
 #define PRI_DEBUG_Q931_STATE	(1 << 6)	/* Debug Q.931 state machine changes */
 #define	PRI_DEBUG_Q931_ANOMALY 	(1 << 7)	/* Show unexpected events */
+#define PRI_DEBUG_APDU			(1 << 8)	/* Debug of APDU components such as ROSE */
+#define PRI_DEBUG_AOC			(1 << 9)	/* Debug of Advice of Charge ROSE Messages */

 #define PRI_DEBUG_ALL			(0xffff)	/* Everything */

@@ -46,31 +48,53 @@
 #define PRI_SWITCH_DMS100		2	/* DMS 100 */
 #define PRI_SWITCH_LUCENT5E		3	/* Lucent 5E */
 #define PRI_SWITCH_ATT4ESS		4	/* AT&T 4ESS */
-#define PRI_SWITCH_EUROISDN_E1	5	/* Standard EuroISDN (CTR4, ETSI 300-102) */
-#define PRI_SWITCH_EUROISDN_T1	6	/* T1 EuroISDN variant (ETSI 300-102) */
+#define PRI_SWITCH_EUROISDN_E1		5	/* Standard EuroISDN (CTR4, ETSI 300-102) */
+#define PRI_SWITCH_EUROISDN_T1		6	/* T1 EuroISDN variant (ETSI 300-102) */
 #define PRI_SWITCH_NI1			7	/* National ISDN 1 */
+#define PRI_SWITCH_GR303_EOC		8	/* GR-303 Embedded Operations Channel */
+#define PRI_SWITCH_GR303_TMC		9	/* GR-303 Timeslot Management Channel */
+#define PRI_SWITCH_QSIG			10	/* QSIG Switch */
+/* Switchtypes 11 - 20 are reserved for internal use */
+

 /* PRI D-Channel Events */
-#define PRI_EVENT_DCHAN_UP	 	1	/* D-channel is up */
-#define PRI_EVENT_DCHAN_DOWN 	2	/* D-channel is down */
-#define PRI_EVENT_RESTART	 	3	/* B-channel is restarted */
-#define PRI_EVENT_CONFIG_ERR 	4	/* Configuration Error Detected */
-#define PRI_EVENT_RING		 	5	/* Incoming call */
-#define PRI_EVENT_HANGUP	 	6	/* Call got hung up */
-#define PRI_EVENT_RINGING	 	7	/* Call is ringing (alerting) */
-#define PRI_EVENT_ANSWER	 	8	/* Call has been answered */
-#define PRI_EVENT_HANGUP_ACK	9	/* Call hangup has been acknowledged */
+#define PRI_EVENT_DCHAN_UP		 1	/* D-channel is up */
+#define PRI_EVENT_DCHAN_DOWN 	 2	/* D-channel is down */
+#define PRI_EVENT_RESTART		 3	/* B-channel is restarted */
+#define PRI_EVENT_CONFIG_ERR 	 4	/* Configuration Error Detected */
+#define PRI_EVENT_RING			 5	/* Incoming call */
+#define PRI_EVENT_HANGUP		 6	/* Call got hung up */
+#define PRI_EVENT_RINGING		 7	/* Call is ringing (alerting) */
+#define PRI_EVENT_ANSWER		 8	/* Call has been answered */
+#define PRI_EVENT_HANGUP_ACK	 9	/* Call hangup has been acknowledged */
 #define PRI_EVENT_RESTART_ACK	10	/* Restart complete on a given channel */
-#define PRI_EVENT_FACNAME	11	/* Caller*ID Name received on Facility */
+#define PRI_EVENT_FACNAME		11	/* Caller*ID Name received on Facility */
 #define PRI_EVENT_INFO_RECEIVED 12	/* Additional info (keypad) received */
 #define PRI_EVENT_PROCEEDING	13	/* When we get CALL_PROCEEDING or PROGRESS */
-#define PRI_EVENT_SETUP_ACK	14	/* When we get SETUP_ACKNOWLEDGE */
+#define PRI_EVENT_SETUP_ACK		14	/* When we get SETUP_ACKNOWLEDGE */
 #define PRI_EVENT_HANGUP_REQ	15	/* Requesting the higher layer to hangup */
+#define PRI_EVENT_NOTIFY		16	/* Notification received */
+#define PRI_EVENT_PROGRESS		17	/* When we get CALL_PROCEEDING or PROGRESS */
+#define PRI_EVENT_KEYPAD_DIGIT		18	/* When we receive during ACTIVE state */

 /* Simple states */
 #define PRI_STATE_DOWN		0
 #define PRI_STATE_UP		1

+#define PRI_PROGRESS_MASK
+
+/* Progress indicator values */
+#define PRI_PROG_CALL_NOT_E2E_ISDN						(1 << 0)
+#define PRI_PROG_CALLED_NOT_ISDN						(1 << 1)
+#define PRI_PROG_CALLER_NOT_ISDN						(1 << 2)
+#define PRI_PROG_INBAND_AVAILABLE						(1 << 3)
+#define PRI_PROG_DELAY_AT_INTERF						(1 << 4)
+#define PRI_PROG_INTERWORKING_WITH_PUBLIC				(1 << 5)
+#define PRI_PROG_INTERWORKING_NO_RELEASE				(1 << 6)
+#define PRI_PROG_INTERWORKING_NO_RELEASE_PRE_ANSWER		(1 << 7)
+#define PRI_PROG_INTERWORKING_NO_RELEASE_POST_ANSWER	(1 << 8)
+#define PRI_PROG_CALLER_RETURNED_TO_ISDN					(1 << 9)
+
 /* Numbering plan identifier */
 #define PRI_NPI_UNKNOWN					0x0
 #define PRI_NPI_E163_E164				0x1
@@ -118,10 +142,10 @@

 /* Causes for disconnection */
 #define PRI_CAUSE_UNALLOCATED					1
-#define PRI_CAUSE_NO_ROUTE_TRANSIT_NET			2
+#define PRI_CAUSE_NO_ROUTE_TRANSIT_NET			2	/* !Q.SIG */
 #define PRI_CAUSE_NO_ROUTE_DESTINATION			3
 #define PRI_CAUSE_CHANNEL_UNACCEPTABLE			6
-#define PRI_CAUSE_CALL_AWARDED_DELIVERED		7
+#define PRI_CAUSE_CALL_AWARDED_DELIVERED		7	/* !Q.SIG */
 #define PRI_CAUSE_NORMAL_CLEARING				16
 #define PRI_CAUSE_USER_BUSY						17
 #define PRI_CAUSE_NO_USER_RESPONSE				18
@@ -130,27 +154,29 @@
 #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
+#define PRI_CAUSE_FACILITY_REJECTED				29	/* !Q.SIG */
 #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
+#define PRI_CAUSE_NETWORK_OUT_OF_ORDER			38	/* !Q.SIG */
 #define PRI_CAUSE_NORMAL_TEMPORARY_FAILURE		41
-#define PRI_CAUSE_SWITCH_CONGESTION				42
-#define PRI_CAUSE_ACCESS_INFO_DISCARDED			43
+#define PRI_CAUSE_SWITCH_CONGESTION				42	/* !Q.SIG */
+#define PRI_CAUSE_ACCESS_INFO_DISCARDED			43	/* !Q.SIG */
 #define PRI_CAUSE_REQUESTED_CHAN_UNAVAIL		44
-#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_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_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
-#define PRI_CAUSE_FACILITY_NOT_IMPLEMENTED      69
+#define PRI_CAUSE_CHAN_NOT_IMPLEMENTED     		66	/* !Q.SIG */
+#define PRI_CAUSE_FACILITY_NOT_IMPLEMENTED      69	/* !Q.SIG */
 #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
+#define PRI_CAUSE_INVALID_MSG_UNSPECIFIED  		95	/* !Q.SIG */
 #define PRI_CAUSE_MANDATORY_IE_MISSING			96
 #define PRI_CAUSE_MESSAGE_TYPE_NONEXIST			97
 #define PRI_CAUSE_WRONG_MESSAGE					98
@@ -158,16 +184,17 @@
 #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
+#define PRI_CAUSE_MANDATORY_IE_LENGTH_ERROR		103	/* !Q.SIG */
 #define PRI_CAUSE_PROTOCOL_ERROR				111
-#define PRI_CAUSE_INTERWORKING					127
+#define PRI_CAUSE_INTERWORKING					127	/* !Q.SIG */

 /* Transmit capabilities */
 #define PRI_TRANS_CAP_SPEECH					0x0
 #define PRI_TRANS_CAP_DIGITAL					0x08
 #define PRI_TRANS_CAP_RESTRICTED_DIGITAL		0x09
 #define PRI_TRANS_CAP_3_1K_AUDIO				0x10
-#define PRI_TRANS_CAP_7K_AUDIO					0x11
+#define PRI_TRANS_CAP_7K_AUDIO					0x11	/* Depriciated ITU Q.931 (05/1998)*/
+#define PRI_TRANS_CAP_DIGITAL_W_TONES			0x11
 #define PRI_TRANS_CAP_VIDEO						0x18

 #define PRI_LAYER_1_ITU_RATE_ADAPT	0x21
@@ -180,8 +207,51 @@
 #define PRI_LAYER_1_V120_RATE_ADAPT	0x28
 #define PRI_LAYER_1_X31_RATE_ADAPT	0x29

+/* Notifications */
+#define PRI_NOTIFY_USER_SUSPENDED		0x00	/* User suspended */
+#define PRI_NOTIFY_USER_RESUMED			0x01	/* User resumed */
+#define PRI_NOTIFY_BEARER_CHANGE		0x02	/* Bearer service change (DSS1) */
+#define PRI_NOTIFY_ASN1_COMPONENT		0x03	/* ASN.1 encoded component (DSS1) */
+#define PRI_NOTIFY_COMPLETION_DELAY		0x04	/* Call completion delay */
+#define PRI_NOTIFY_CONF_ESTABLISHED		0x42	/* Conference established */
+#define PRI_NOTIFY_CONF_DISCONNECTED		0x43	/* Conference disconnected */
+#define PRI_NOTIFY_CONF_PARTY_ADDED		0x44	/* Other party added */
+#define PRI_NOTIFY_CONF_ISOLATED		0x45	/* Isolated */
+#define PRI_NOTIFY_CONF_REATTACHED		0x46	/* Reattached */
+#define PRI_NOTIFY_CONF_OTHER_ISOLATED		0x47	/* Other party isolated */
+#define PRI_NOTIFY_CONF_OTHER_REATTACHED	0x48	/* Other party reattached */
+#define PRI_NOTIFY_CONF_OTHER_SPLIT		0x49	/* Other party split */
+#define PRI_NOTIFY_CONF_OTHER_DISCONNECTED	0x4a	/* Other party disconnected */
+#define PRI_NOTIFY_CONF_FLOATING		0x4b	/* Conference floating */
+#define PRI_NOTIFY_WAITING_CALL			0x60	/* Call is waiting call */
+#define PRI_NOTIFY_DIVERSION_ACTIVATED		0x68	/* Diversion activated (DSS1) */
+#define PRI_NOTIFY_TRANSFER_ALERTING		0x69	/* Call transfer, alerting */
+#define PRI_NOTIFY_TRANSFER_ACTIVE		0x6a	/* Call transfer, active */
+#define PRI_NOTIFY_REMOTE_HOLD			0x79	/* Remote hold */
+#define PRI_NOTIFY_REMOTE_RETRIEVAL		0x7a	/* Remote retrieval */
+#define PRI_NOTIFY_CALL_DIVERTING		0x7b	/* Call is diverting */
+
 #define PRI_COPY_DIGITS_CALLED_NUMBER

+/* Network Specific Facilities (AT&T) */
+#define PRI_NSF_NONE                   -1
+#define PRI_NSF_SID_PREFERRED          0xB1
+#define PRI_NSF_ANI_PREFERRED          0xB2
+#define PRI_NSF_SID_ONLY               0xB3
+#define PRI_NSF_ANI_ONLY               0xB4
+#define PRI_NSF_CALL_ASSOC_TSC         0xB9
+#define PRI_NSF_NOTIF_CATSC_CLEARING   0xBA
+#define PRI_NSF_OPERATOR               0xB5
+#define PRI_NSF_PCCO                   0xB6
+#define PRI_NSF_SDN                    0xE1
+#define PRI_NSF_TOLL_FREE_MEGACOM      0xE2
+#define PRI_NSF_MEGACOM                        0xE3
+#define PRI_NSF_ACCUNET                        0xE6
+#define PRI_NSF_LONG_DISTANCE_SERVICE  0xE7
+#define PRI_NSF_INTERNATIONAL_TOLL_FREE        0xE8
+#define PRI_NSF_ATT_MULTIQUEST         0xF0
+#define PRI_NSF_CALL_REDIRECTION_SERVICE       0xF7
+
 typedef struct q931_call q931_call;

 typedef struct pri_event_generic {
@@ -203,14 +273,20 @@ typedef struct pri_event_ringing {
 	int e;
 	int channel;
 	int cref;
+	int progress;
+	int progressmask;
 	q931_call *call;
+	char useruserinfo[260];		/* User->User info */
 } pri_event_ringing;

 typedef struct pri_event_answer {
 	int e;
 	int channel;
 	int cref;
+	int progress;
+	int progressmask;
 	q931_call *call;
+	char useruserinfo[260];		/* User->User info */
 } pri_event_answer;

 typedef struct pri_event_facname {
@@ -222,23 +298,38 @@ typedef struct pri_event_facname {
 	q931_call *call;
 } pri_event_facname;

+#define PRI_CALLINGPLANANI
+#define PRI_CALLINGPLANRDNIS
 typedef struct pri_event_ring {
 	int e;
 	int channel;				/* Channel requested */
 	int callingpres;			/* Presentation of Calling CallerID */
+	int callingplanani;			/* Dialing plan of Calling entity ANI */
 	int callingplan;			/* Dialing plan of Calling entity */
+	char callingani[256];		/* Calling ANI */
 	char callingnum[256];		/* Calling number */
 	char callingname[256];		/* Calling name (if provided) */
 	int calledplan;				/* Dialing plan of Called number */
+	int ani2;                   /* ANI II */
 	char callednum[256];		/* Called number */
-	char redirectingnum[256];		/* Redirecting number */
-	char useruserinfo[256];			/* User->User info */
+	char redirectingnum[256];	/* Redirecting number */
+	char redirectingname[256];	/* Redirecting name */
+	int redirectingreason;		/* Reason for redirect */
+	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 layer1;					/* User layer 1 */
 	int complete;				/* Have we seen "Complete" i.e. no more number? */
 	q931_call *call;			/* Opaque call pointer */
+	char callingsubaddr[256];	/* Calling parties subaddress */
+	int progress;
+	int progressmask;
+	char origcalledname[256];
+	char origcallednum[256];
+	int callingplanorigcalled;		/* Dialing plan of Originally Called Number */
+	int origredirectingreason;
 } pri_event_ring;

 typedef struct pri_event_hangup {
@@ -247,6 +338,8 @@ typedef struct pri_event_hangup {
 	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 */
 } pri_event_hangup;	

 typedef struct pri_event_restart_ack {
@@ -254,16 +347,36 @@ typedef struct pri_event_restart_ack {
 	int channel;
 } pri_event_restart_ack;

+#define PRI_PROGRESS_CAUSE
 typedef struct pri_event_proceeding {
 	int e;
 	int channel;
+	int cref;
+	int progress;
+	int progressmask;
+	int cause;
+	q931_call *call;
 } pri_event_proceeding;
 
 typedef struct pri_event_setup_ack {
 	int e;
 	int channel;
+	q931_call *call;
 } pri_event_setup_ack;

+typedef struct pri_event_notify {
+	int e;
+	int channel;
+	int info;
+} pri_event_notify;
+
+typedef struct pri_event_keypad_digit {
+	int e;
+	int channel;
+	q931_call *call;
+	char digits[64];
+} pri_event_keypad_digit;
+
 typedef union {
 	int e;
 	pri_event_generic gen;		/* Generic view */
@@ -277,10 +390,16 @@ typedef union {
 	pri_event_restart_ack restartack;	/* Restart Acknowledge */
 	pri_event_proceeding  proceeding;	/* Call proceeding & Progress */
 	pri_event_setup_ack   setup_ack;	/* SETUP_ACKNOWLEDGE structure */
+	pri_event_notify notify;		/* Notification */
+	pri_event_keypad_digit digit;			/* Digits that come during a call */
 } pri_event;

 struct pri;
+struct pri_sr;

+#define PRI_IO_FUNCS
+/* Type declaration for callbacks to read or write a HDLC frame as below */
+typedef int (*pri_io_cb)(struct pri *pri, void *buf, int buflen);

 /* Create a D-channel on a given file descriptor.  The file descriptor must be a
   channel operating in HDLC mode with FCS computed by the fd's driver.  Also it
@@ -288,9 +407,28 @@ struct pri;
   must be one of PRI_NETWORK or PRI_CPE.  switchtype should be PRI_SWITCH_* */
 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 */
+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 */
+extern void *pri_get_userdata(struct pri *pri);
+
+/* Set the user data associated with the D channel */
+extern void pri_set_userdata(struct pri *pri, void *userdata);
+
+/* Set Network Specific Facility for PRI */
+extern void pri_set_nsf(struct pri *pri, int nsf);
+
 /* Set debug parameters on PRI -- see above debug definitions */
 extern void pri_set_debug(struct pri *pri, int debug);

+/* Get debug parameters on PRI -- see above debug definitions */
+extern int pri_get_debug(struct pri *pri);
+
+#define PRI_FACILITY_ENABLE
+/* Enable transmission support of Facility IEs on the 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 */
@@ -302,7 +440,7 @@ pri_event *pri_check_event(struct pri *pri);
 /* Give a name to a given event ID */
 extern char *pri_event2str(int id);

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

 /* Give a name to a switch type */
@@ -311,9 +449,6 @@ extern char *pri_switch2str(int id);
 /* Print an event */
 extern void pri_dump_event(struct pri *pri, pri_event *e);

-/* Turn an event ID into a string */
-extern char *pri_event2str(int e);
-
 /* Turn presentation into a string */
 extern char *pri_pres2str(int pres);

@@ -330,6 +465,10 @@ extern int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int in
 /* Send a digit in overlap mode */
 extern int pri_information(struct pri *pri, q931_call *call, char digit);

+#define PRI_KEYPAD_FACILITY_TX
+/* Send a keypad facility string of digits */
+extern int pri_keypad_facility(struct pri *pri, q931_call *call, char *digits);
+
 /* 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 */
 extern int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn);
@@ -338,14 +477,8 @@ extern int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int
   Set non-isdn to non-zero if you are not connecting to ISDN equipment */
 extern int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn);

-#if 0
-/* deprecated routines, use pri_hangup */
-/* Release/Reject a call */
-extern int pri_release(struct pri *pri, q931_call *call, int cause);
+/* Set CRV reference for GR-303 calls */

-/* Hangup / Disconnect a call */
-extern int pri_disconnect(struct pri *pri, q931_call *call, int cause);
-#endif

 #undef pri_release
 #undef pri_disconnect
@@ -364,11 +497,20 @@ extern int pri_hangup(struct pri *pri, q931_call *call, int cause);
 #define PRI_DESTROYCALL
 extern void pri_destroycall(struct pri *pri, q931_call *call);

+#define PRI_RESTART
+extern int pri_restart(struct pri *pri);
+
 extern int pri_reset(struct pri *pri, int channel);

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

+/* Retrieve CRV reference for GR-303 calls.  Returns >0 on success. */
+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 */
+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 */
 extern struct timeval *pri_schedule_next(struct pri *pri);

@@ -378,19 +520,112 @@ extern pri_event *pri_schedule_run(struct pri *pri);
 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);
-	 
+
+extern struct pri_sr *pri_sr_new(void);
+extern void pri_sr_free(struct pri_sr *sr);
+
+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 */
+extern void pri_sr_set_useruser(struct pri_sr *sr, const char *userchars);
+
+extern void pri_call_set_useruser(q931_call *sr, const char *userchars);
+
+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) */
+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 */
+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 */
+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
+ * suscribed.  Sometimes called 2 bchannel transfer (2BCT) */
+int pri_channel_bridge(q931_call *call1, q931_call *call2);
+
 /* Override message and error stuff */
-extern void pri_set_message(void (*__pri_error)(char *));
-extern void pri_set_error(void (*__pri_error)(char *));
+#define PRI_NEW_SET_API
+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
 extern void pri_set_overlapdial(struct pri *pri,int state);

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

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

+#define PRI_PROGRESS
+/* Send call proceeding */
+extern int pri_progress(struct pri *pri, q931_call *c, int channel, int info);
+
+#define PRI_PROCEEDING_FULL
+/* Send call proceeding */
+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) */
+extern void pri_enslave(struct pri *master, struct pri *slave);
+
+#define PRI_GR303_SUPPORT
+#define PRI_ENSLAVE_SUPPORT
+#define PRI_SETUP_CALL
+#define PRI_RECEIVE_SUBADDR
+#define PRI_REDIRECTING_REASON
+#define PRI_AOC_UNITS
+#define PRI_ANI
+
+/* Send notification */
+extern int pri_notify(struct pri *pri, q931_call *c, int channel, int info);
+
+/* Get/Set PRI Timers  */
+#define PRI_GETSET_TIMERS
+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_T200	4	/* time between SABME's */
+#define PRI_TIMER_T201	5	/* minimum time between retransmissions of the TEI Identity check messages */
+#define PRI_TIMER_T202	6	/* minimum time between transmission of TEI Identity request messages */
+#define PRI_TIMER_T203	7	/* maxiumum time without exchanging packets */
+
+#define PRI_TIMER_T300	8	
+#define PRI_TIMER_T301	9	/* maximum time to respond to an ALERT */
+#define PRI_TIMER_T302	10
+#define PRI_TIMER_T303	11	/* maximum time to wait after sending a SETUP without a response */
+#define PRI_TIMER_T304	12
+#define PRI_TIMER_T305	13
+#define PRI_TIMER_T306	14
+#define PRI_TIMER_T307	15
+#define PRI_TIMER_T308	16
+#define PRI_TIMER_T309	17
+#define PRI_TIMER_T310	18	/* maximum time between receiving a CALLPROCEEDING and receiving a ALERT/CONNECT/DISCONNECT/PROGRESS */
+#define PRI_TIMER_T313	19
+#define PRI_TIMER_T314	20
+#define PRI_TIMER_T316	21	/* maximum time between transmitting a RESTART and receiving a RESTART ACK */
+#define PRI_TIMER_T317	22
+#define PRI_TIMER_T318	23
+#define PRI_TIMER_T319	24
+#define PRI_TIMER_T320	25
+#define PRI_TIMER_T321	26
+#define PRI_TIMER_T322	27
+
 #endif
--- a/22
+++ b/22
@@ -82,9 +82,9 @@ umask $um
 trap 'rm -rf $DTMP ; trap 2 ; kill -2 $$' 1 2 3 13 15

 if [ x$pflag = x ]; then
-	${CC:-cc} -M "$@" | sed -e 's; \./; ;g' > $TMP
+	${CC:-cc} -M "$@" 2>/dev/null | sed -e 's; \./; ;g' > $TMP
 else
-	${CC:-cc} -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
+	${CC:-cc} -M "$@" 2>/dev/null | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
 fi

 if [ $? != 0 ]; then
@@ -100,10 +100,22 @@ if [ $append = 1 ]; then
 		rm -rf $DTMP
 		exit 1
 	fi
-else
-	mv $TMP $D
+	cat $TMP | sed -e 's/\.o:/.lo:/g' >>$D
 	if [ $? != 0 ]; then
-		echo 'mkdep: rename failed.'
+		echo 'mkdep: append failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+else
+	cat $TMP > $D
+	if [ $? != 0 ]; then
+		echo 'mkdep: overwrite failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+	cat $TMP | sed -e 's/\.o:/.lo:/g' >>$D
+	if [ $? != 0 ]; then
+		echo 'mkdep: append failed.'
 		rm -rf $DTMP
 		exit 1
 	fi
--- a/pri.c
+++ b/pri.c
@@ -1,13 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-suppot.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * This program is confidential
- *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
 */

 #include <unistd.h>
@@ -19,10 +31,13 @@
 #include <stdlib.h>
 #include <sys/select.h>
 #include <stdarg.h>
+#include "compat.h"
 #include "libpri.h"
 #include "pri_internal.h"
+#include "pri_facility.h"
 #include "pri_q921.h"
 #include "pri_q931.h"
+#include "pri_timers.h"

 char *pri_node2str(int node)
 {
@@ -53,33 +68,237 @@ char *pri_switch2str(int sw)
 		return "National ISDN 1";
 	case PRI_SWITCH_EUROISDN_E1:
 		return "EuroISDN";
+	case PRI_SWITCH_GR303_EOC:
+		return "GR303 EOC";
+	case PRI_SWITCH_GR303_TMC:
+		return "GR303 TMC";
+	case PRI_SWITCH_QSIG:
+		return "Q.SIG switch";
 	default:
 		return "Unknown switchtype";
 	}
 }

-struct pri *pri_new(int fd, int node, int switchtype)
+static void pri_default_timers(struct pri *pri, int switchtype)
+{
+	int defaulttimers[20][PRI_MAX_TIMERS] = PRI_TIMERS_ALL;
+	int x;
+
+	for (x = 0; x<PRI_MAX_TIMERS; x++) {
+		pri->timers[x] = defaulttimers[switchtype][x];
+	}
+}
+
+int pri_set_timer(struct pri *pri, int timer, int value)
+{
+	if (timer < 0 || timer > PRI_MAX_TIMERS || value < 0)
+		return -1;
+
+	pri->timers[timer] = value;
+	return 0;
+}
+
+int pri_get_timer(struct pri *pri, int timer)
+{
+	if (timer < 0 || timer > PRI_MAX_TIMERS)
+		return -1;
+	return pri->timers[timer];
+}
+
+int pri_timer2idx(char *timer)
+{
+	if (!strcasecmp(timer, "N200"))
+		return PRI_TIMER_N200;
+	else if (!strcasecmp(timer, "N201"))
+		return PRI_TIMER_N201;
+	else if (!strcasecmp(timer, "N202"))
+		return PRI_TIMER_N202;
+	else if (!strcasecmp(timer, "K"))
+		return PRI_TIMER_K;
+	else if (!strcasecmp(timer, "T200"))
+		return PRI_TIMER_T200;
+	else if (!strcasecmp(timer, "T202"))
+		return PRI_TIMER_T202;
+	else if (!strcasecmp(timer, "T203"))
+		return PRI_TIMER_T203;
+	else if (!strcasecmp(timer, "T300"))
+		return PRI_TIMER_T300;
+	else if (!strcasecmp(timer, "T301"))
+		return PRI_TIMER_T301;
+	else if (!strcasecmp(timer, "T302"))
+		return PRI_TIMER_T302;
+	else if (!strcasecmp(timer, "T303"))
+		return PRI_TIMER_T303;
+	else if (!strcasecmp(timer, "T304"))
+		return PRI_TIMER_T304;
+	else if (!strcasecmp(timer, "T305"))
+		return PRI_TIMER_T305;
+	else if (!strcasecmp(timer, "T306"))
+		return PRI_TIMER_T306;
+	else if (!strcasecmp(timer, "T307"))
+		return PRI_TIMER_T307;
+	else if (!strcasecmp(timer, "T308"))
+		return PRI_TIMER_T308;
+	else if (!strcasecmp(timer, "T309"))
+		return PRI_TIMER_T309;
+	else if (!strcasecmp(timer, "T310"))
+		return PRI_TIMER_T310;
+	else if (!strcasecmp(timer, "T313"))
+		return PRI_TIMER_T313;
+	else if (!strcasecmp(timer, "T314"))
+		return PRI_TIMER_T314;
+	else if (!strcasecmp(timer, "T316"))
+		return PRI_TIMER_T316;
+	else if (!strcasecmp(timer, "T317"))
+		return PRI_TIMER_T317;
+	else if (!strcasecmp(timer, "T318"))
+		return PRI_TIMER_T318;
+	else if (!strcasecmp(timer, "T319"))
+		return PRI_TIMER_T319;
+	else if (!strcasecmp(timer, "T320"))
+		return PRI_TIMER_T320;
+	else if (!strcasecmp(timer, "T321"))
+		return PRI_TIMER_T321;
+	else if (!strcasecmp(timer, "T322"))
+		return PRI_TIMER_T322;
+	else
+		return -1;
+}
+
+static int __pri_read(struct pri *pri, void *buf, int buflen)
+{
+	int res = read(pri->fd, buf, buflen);
+	if (res < 0) {
+		if (errno != EAGAIN)
+			pri_error(pri, "Read on %d failed: %s\n", pri->fd, strerror(errno));
+		return 0;
+	}
+	return res;
+}
+
+static int __pri_write(struct pri *pri, void *buf, int buflen)
+{
+	int res = write(pri->fd, buf, buflen);
+	if (res < 0) {
+		if (errno != EAGAIN)
+			pri_error(pri, "Write to %d failed: %s\n", pri->fd, strerror(errno));
+		return 0;
+	}
+	return res;
+}
+
+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;
 	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;
 #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(-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;
+		}
 		/* Start Q.921 layer, Wait if we're the network */
-		q921_start(p, p->localtype == PRI_CPE);
+		if (p)
+			q921_start(p, p->localtype == PRI_CPE);
 	}
 	return p;
 }

+void pri_call_set_useruser(q931_call *c, const 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)
+{
+	sr->useruserinfo = userchars;
+}
+
+int pri_restart(struct pri *pri)
+{
+	/* Restart Q.921 layer */
+	if (pri) {
+		q921_reset(pri);
+		q921_start(pri, pri->localtype == PRI_CPE);	
+	}
+	return 0;
+}
+
+struct pri *pri_new(int fd, int nodetype, int switchtype)
+{
+	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)
+{
+	if (!io_read)
+		io_read = __pri_read;
+	if (!io_write)
+		io_write = __pri_write;
+	return __pri_new(fd, nodetype, switchtype, NULL, io_read, io_write, userdata);
+}
+
+void *pri_get_userdata(struct pri *pri)
+{
+	return pri ? pri->userdata : NULL;
+}
+
+void pri_set_userdata(struct pri *pri, void *userdata)
+{
+	if (pri)
+		pri->userdata = userdata;
+}
+
+void pri_set_nsf(struct pri *pri, int nsf)
+{
+	if (pri)
+		pri->nsf = nsf;
+}
+
 char *pri_event2str(int id)
 {
 	switch(id) {
@@ -91,6 +310,30 @@ char *pri_event2str(int id)
 		return "Restart channel";
 	case PRI_EVENT_RING:
 		return "Ring";
+	case PRI_EVENT_HANGUP:
+		return "Hangup";
+	case PRI_EVENT_RINGING:
+		return "Ringing";
+	case PRI_EVENT_ANSWER:
+		return "Answer";
+	case PRI_EVENT_HANGUP_ACK:
+		return "Hangup ACK";
+	case PRI_EVENT_RESTART_ACK:
+		return "Restart ACK";
+	case PRI_EVENT_FACNAME:
+		return "FacName";
+	case PRI_EVENT_INFO_RECEIVED:
+		return "Info Received";
+	case PRI_EVENT_PROCEEDING:
+		return "Proceeding";
+	case PRI_EVENT_SETUP_ACK:
+		return "Setup ACK";
+	case PRI_EVENT_HANGUP_REQ:
+		return "Hangup Req";
+	case PRI_EVENT_NOTIFY:
+		return "Notify";
+	case PRI_EVENT_PROGRESS:
+		return "Progress";
 	case PRI_EVENT_CONFIG_ERR:
 		return "Configuration Error";
 	default:
@@ -103,12 +346,7 @@ pri_event *pri_check_event(struct pri *pri)
 	char buf[1024];
 	int res;
 	pri_event *e;
-	res = read(pri->fd, buf, sizeof(buf));
-	if (res < 0) {
-		if (errno != EAGAIN)
-			pri_error("Read on %d failed: %s\n", pri->fd, strerror(errno));
-		return NULL;
-	}
+	res = pri->read_func ? pri->read_func(pri, buf, sizeof(buf)) : 0;
 	if (!res)
 		return NULL;
 	/* Receive the q921 packet */
@@ -147,7 +385,7 @@ pri_event *pri_mkerror(struct pri *pri, char *errstr)
 {
 	/* Return a configuration error */
 	pri->ev.err.e = PRI_EVENT_CONFIG_ERR;
-	strncpy(pri->ev.err.err, errstr, sizeof(pri->ev.err.err) - 1);
+	libpri_copy_string(pri->ev.err.err, errstr, sizeof(pri->ev.err.err));
 	return &pri->ev;
 }

@@ -182,6 +420,27 @@ void pri_set_debug(struct pri *pri, int debug)
 	if (!pri)
 		return;
 	pri->debug = debug;
+	if (pri->subchannel)
+		pri_set_debug(pri->subchannel, debug);
+}
+
+int pri_get_debug(struct pri *pri)
+{
+	if (!pri)
+		return -1;
+	if (pri->subchannel)
+		return pri_get_debug(pri->subchannel);
+	return pri->debug;
+}
+
+void pri_facility_enable(struct pri *pri)
+{
+	if (!pri)
+		return;
+	pri->sendfacility = 1;
+	if (pri->subchannel)
+		pri_facility_enable(pri->subchannel);
+	return;
 }

 int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int info)
@@ -191,6 +450,20 @@ int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int info)
 	return q931_alerting(pri, call, channel, info);
 }

+int pri_proceeding(struct pri *pri, q931_call *call, int channel, int info)
+{
+	if (!pri || !call)
+		return -1;
+	return q931_call_proceeding(pri, call, channel, info);
+}
+
+int pri_progress(struct pri *pri, q931_call *call, int channel, int info)
+{
+	if (!pri || !call)
+		return -1;
+	return q931_call_progress(pri, call, channel, info);
+}
+
 int pri_information(struct pri *pri, q931_call *call, char digit)
 {
 	if (!pri || !call)
@@ -198,6 +471,21 @@ 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)
+		return -1;
+	return q931_notify(pri, call, channel, info);
+}
+
 void pri_destroycall(struct pri *pri, q931_call *call)
 {
 	if (pri && call)
@@ -236,6 +524,29 @@ int pri_disconnect(struct pri *pri, q931_call *call, int cause)
 }
 #endif

+int pri_channel_bridge(q931_call *call1, q931_call *call2)
+{
+	if (!call1 || !call2)
+		return -1;
+
+	/* Check for bearer capability */
+	if (call1->transcapability != call2->transcapability)
+		return -1;
+	/* 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;
+	
+	if (call1->pri->switchtype == PRI_SWITCH_LUCENT5E)
+		return eect_initiate_transfer(call1->pri, call1, call2);
+
+	if (call1->pri->switchtype == PRI_SWITCH_DMS100)
+		return rlt_initiate_transfer(call1->pri, call1, call2);
+
+	return -1;
+}
+
 int pri_hangup(struct pri *pri, q931_call *call, int cause)
 {
 	if (!pri || !call)
@@ -264,52 +575,139 @@ void pri_dump_event(struct pri *pri, pri_event *e)
 {
 	if (!pri || !e)
 		return;
-	pri_message("Event type: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+	pri_message(pri, "Event type: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
 	switch(e->gen.e) {
 	case PRI_EVENT_DCHAN_UP:
 	case PRI_EVENT_DCHAN_DOWN:
 		break;
 	case PRI_EVENT_CONFIG_ERR:
-		pri_message("Error: %s", e->err.err);
+		pri_message(pri, "Error: %s", e->err.err);
 		break;
 	case PRI_EVENT_RESTART:
-		pri_message("Restart on channel %d\n", e->restart.channel);
+		pri_message(pri, "Restart on channel %d\n", e->restart.channel);
 	case PRI_EVENT_RING:
-		pri_message("Calling number: %s (%s, %s)\n", e->ring.callingnum, pri_plan2str(e->ring.callingplan), pri_pres2str(e->ring.callingpres));
-		pri_message("Called number: %s (%s)\n", e->ring.callednum, pri_plan2str(e->ring.calledplan));
-		pri_message("Channel: %d (%s) Reference number: %d\n", e->ring.channel, e->ring.flexible ? "Flexible" : "Not Flexible", e->ring.cref);
+		pri_message(pri, "Calling number: %s (%s, %s)\n", e->ring.callingnum, pri_plan2str(e->ring.callingplan), pri_pres2str(e->ring.callingpres));
+		pri_message(pri, "Called number: %s (%s)\n", e->ring.callednum, pri_plan2str(e->ring.calledplan));
+		pri_message(pri, "Channel: %d (%s) Reference number: %d\n", e->ring.channel, e->ring.flexible ? "Flexible" : "Not Flexible", e->ring.cref);
 		break;
 	case PRI_EVENT_HANGUP:
-		pri_message("Hangup, reference number: %d, reason: %s\n", e->hangup.cref, pri_cause2str(e->hangup.cause));
+		pri_message(pri, "Hangup, reference number: %d, reason: %s\n", e->hangup.cref, pri_cause2str(e->hangup.cause));
 		break;
 	default:
-		pri_message("Don't know how to dump events of type %d\n", e->gen.e);
+		pri_message(pri, "Don't know how to dump events of type %d\n", e->gen.e);
 	}
 }

+static void pri_sr_init(struct pri_sr *req)
+{
+	memset(req, 0, sizeof(struct pri_sr));
+	
+}
+
+int pri_sr_set_connection_call_independent(struct pri_sr *req)
+{
+	if (!req)
+		return -1;
+
+	req->justsignalling = 1; /* have to set justsignalling for all those pesky IEs we need to setup */
+	return 0;
+}
+
+/* Don't call any other pri functions on this */
+int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called,
+					int calledplan)
+{
+	struct pri_sr req;
+	if (!pri || !c)
+		return -1;
+
+	pri_sr_init(&req);
+	pri_sr_set_connection_call_independent(&req);
+
+	req.caller = caller;
+	req.callerplan = callerplan;
+	req.callername = callername;
+	req.callerpres = callerpres;
+	req.called = called;
+	req.calledplan = calledplan;
+
+	if (mwi_message_send(pri, c, &req, 1) < 0) {
+		pri_message(pri, "Unable to send MWI activate message\n");
+		return -1;
+	}
+	/* Do more stuff when we figure out that the CISC stuff works */
+	return q931_setup(pri, c, &req);
+}
+
+int pri_mwi_deactivate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called,
+					int calledplan)
+{
+	struct pri_sr req;
+	if (!pri || !c)
+		return -1;
+
+	pri_sr_init(&req);
+	pri_sr_set_connection_call_independent(&req);
+
+	req.caller = caller;
+	req.callerplan = callerplan;
+	req.callername = callername;
+	req.callerpres = callerpres;
+	req.called = called;
+	req.calledplan = calledplan;
+
+	if(mwi_message_send(pri, c, &req, 0) < 0) {
+		pri_message(pri, "Unable to send MWI deactivate message\n");
+		return -1;
+	}
+
+	return q931_setup(pri, c, &req);
+}
+	
+int pri_setup(struct pri *pri, q931_call *c, struct pri_sr *req)
+{
+	if (!pri || !c)
+		return -1;
+
+	return q931_setup(pri, c, req);
+}
+
 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 req;
 	if (!pri || !c)
 		return -1;
-	return q931_setup(pri, c, transmode, channel, exclusive, nonisdn, caller, callerplan, callername, callerpres, called, calledplan, ulayer1);
+	pri_sr_init(&req);
+	req.transmode = transmode;
+	req.channel = channel;
+	req.exclusive = exclusive;
+	req.nonisdn =  nonisdn;
+	req.caller = caller;
+	req.callerplan = callerplan;
+	req.callername = callername;
+	req.callerpres = callerpres;
+	req.called = called;
+	req.calledplan = calledplan;
+	req.userl1 = ulayer1;
+	return q931_setup(pri, c, &req);
 }	

-static void (*__pri_error)(char *stuff);
-static void (*__pri_message)(char *stuff);
+static void (*__pri_error)(struct pri *pri, char *stuff);
+static void (*__pri_message)(struct pri *pri, char *stuff);

-void pri_set_message(void (*func)(char *stuff))
+void pri_set_message(void (*func)(struct pri *pri, char *stuff))
 {
 	__pri_message = func;
 }

-void pri_set_error(void (*func)(char *stuff))
+void pri_set_error(void (*func)(struct pri *pri, char *stuff))
 {
 	__pri_error = func;
 }

-void pri_message(char *fmt, ...)
+void pri_message(struct pri *pri, char *fmt, ...)
 {
 	char tmp[1024];
 	va_list ap;
@@ -317,12 +715,12 @@ void pri_message(char *fmt, ...)
 	vsnprintf(tmp, sizeof(tmp), fmt, ap);
 	va_end(ap);
 	if (__pri_message)
-		__pri_message(tmp);
+		__pri_message(pri, tmp);
 	else
-		fprintf(stdout, tmp);
+		fputs(tmp, stdout);
 }

-void pri_error(char *fmt, ...)
+void pri_error(struct pri *pri, char *fmt, ...)
 {
 	char tmp[1024];
 	va_list ap;
@@ -330,10 +728,11 @@ void pri_error(char *fmt, ...)
 	vsnprintf(tmp, sizeof(tmp), fmt, ap);
 	va_end(ap);
 	if (__pri_error)
-		__pri_error(tmp);
+		__pri_error(pri, tmp);
 	else
-		fprintf(stderr, tmp);
+		fputs(tmp, stderr);
 }
+
 /* Set overlap mode */
 void pri_set_overlapdial(struct pri *pri,int state)
 {
@@ -345,36 +744,117 @@ int pri_fd(struct pri *pri)
 	return pri->fd;
 }

-void pri_dump_info(struct pri *pri)
+char *pri_dump_info_str(struct pri *pri)
 {
+	char buf[4096];
+	int len = 0;
 #ifdef LIBPRI_COUNTERS
 	struct q921_frame *f;
 	int q921outstanding = 0;
 #endif
 	if (!pri)
-		return;
+		return NULL;

 	/* Might be nice to format these a little better */
-	pri_message("Switchtype: %s\n", pri_switch2str(pri->switchtype));
-	pri_message("Type: %s\n", pri_node2str(pri->localtype));
+	len += sprintf(buf + len, "Switchtype: %s\n", pri_switch2str(pri->switchtype));
+	len += sprintf(buf + len, "Type: %s\n", pri_node2str(pri->localtype));
 #ifdef LIBPRI_COUNTERS
 	/* Remember that Q921 Counters include Q931 packets (and any retransmissions) */
-	pri_message("Q931 RX: %d\n", pri->q931_rxcount);
-	pri_message("Q931 TX: %d\n", pri->q931_txcount);
-	pri_message("Q921 RX: %d\n", pri->q921_rxcount);
-	pri_message("Q921 TX: %d\n", pri->q921_txcount);
+	len += sprintf(buf + len, "Q931 RX: %d\n", pri->q931_rxcount);
+	len += sprintf(buf + len, "Q931 TX: %d\n", pri->q931_txcount);
+	len += sprintf(buf + len, "Q921 RX: %d\n", pri->q921_rxcount);
+	len += sprintf(buf + len, "Q921 TX: %d\n", pri->q921_txcount);
 	f = pri->txqueue;
 	while (f) {
 		q921outstanding++;
 		f = f->next;
 	}
-	pri_message("Q921 Outstanding: %d\n", q921outstanding);
+	len += sprintf(buf + len, "Q921 Outstanding: %d\n", q921outstanding);
 #endif
-	pri_message("Window Length: %d/%d\n", pri->windowlen, pri->window);
-	pri_message("Sentrej: %d\n", pri->sentrej);
-	pri_message("SolicitFbit: %d\n", pri->solicitfbit);
-	pri_message("Retrans: %d\n", pri->retrans);
-	pri_message("Busy: %d\n", pri->busy);
-	pri_message("Overlap Dial: %d\n", pri->overlapdial);
+	len += sprintf(buf + len, "Window Length: %d/%d\n", pri->windowlen, pri->window);
+	len += sprintf(buf + len, "Sentrej: %d\n", pri->sentrej);
+	len += sprintf(buf + len, "SolicitFbit: %d\n", pri->solicitfbit);
+	len += sprintf(buf + len, "Retrans: %d\n", pri->retrans);
+	len += sprintf(buf + len, "Busy: %d\n", pri->busy);
+	len += sprintf(buf + len, "Overlap Dial: %d\n", pri->overlapdial);
+	len += sprintf(buf + len, "T200 Timer: %d\n", pri->timers[PRI_TIMER_T200]);
+	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]);
+
+	return strdup(buf);
 }

+int pri_get_crv(struct pri *pri, q931_call *call, int *callmode)
+{
+	return q931_call_getcrv(pri, call, callmode);
+}
+
+int pri_set_crv(struct pri *pri, q931_call *call, int crv, int callmode)
+{
+	return q931_call_setcrv(pri, call, crv, callmode);
+}
+
+void pri_enslave(struct pri *master, struct pri *slave)
+{
+	if (master && slave)
+		slave->callpool = &master->localpool;
+}
+
+struct pri_sr *pri_sr_new(void)
+{
+	struct pri_sr *req;
+	req = malloc(sizeof(struct pri_sr));
+	if (req) 
+		pri_sr_init(req);
+	return req;
+}
+
+void pri_sr_free(struct pri_sr *sr)
+{
+	free(sr);
+}
+
+int pri_sr_set_channel(struct pri_sr *sr, int channel, int exclusive, int nonisdn)
+{
+	sr->channel = channel;
+	sr->exclusive = exclusive;
+	sr->nonisdn = nonisdn;
+	return 0;
+}
+
+int pri_sr_set_bearer(struct pri_sr *sr, int transmode, int userl1)
+{
+	sr->transmode = transmode;
+	sr->userl1 = userl1;
+	return 0;
+}
+
+int pri_sr_set_called(struct pri_sr *sr, char *called, int calledplan, int numcomplete)
+{
+	sr->called = called;
+	sr->calledplan = calledplan;
+	sr->numcomplete = numcomplete;
+	return 0;
+}
+
+int pri_sr_set_caller(struct pri_sr *sr, char *caller, char *callername, int callerplan, int callerpres)
+{
+	sr->caller = caller;
+	sr->callername = callername;
+	sr->callerplan = callerplan;
+	sr->callerpres = callerpres;
+	return 0;
+}
+
+int pri_sr_set_redirecting(struct pri_sr *sr, char *num, int plan, int pres, int reason)
+{
+	sr->redirectingnum = num;
+	sr->redirectingplan = plan;
+	sr->redirectingpres = pres;
+	sr->redirectingreason = reason;
+	return 0;
+}
--- a/pri_facility.c
+++ b/pri_facility.c
--- a/pri_facility.h
+++ b/pri_facility.h
@@ -0,0 +1,282 @@
+/*
+   This file contains all data structures and definitions associated
+   with facility message usage and the ROSE components included
+   within those messages.
+
+   by Matthew Fredrickson <creslin@digium.com>
+   Copyright (C) Digium, Inc. 2004-2005
+*/
+
+#ifndef _PRI_FACILITY_H
+#define _PRI_FACILITY_H
+
+/* Protocol Profile field */
+#define Q932_PROTOCOL_ROSE			0x11	/* X.219 & X.229 */
+#define Q932_PROTOCOL_CMIP			0x12	/* Q.941 */
+#define Q932_PROTOCOL_ACSE			0x13	/* X.217 & X.227 */
+#define Q932_PROTOCOL_GAT			0x16
+#define Q932_PROTOCOL_EXTENSIONS	0x1F
+
+/* Argument values */
+#define ROSE_NAME_PRESENTATION_ALLOWED_SIMPLE	0x80
+#define ROSE_NAME_PRESENTATION_RESTRICTED_NULL	0x87
+#define ROSE_NAME_NOT_AVAIL						0x84
+
+/* Component types */
+#define COMP_TYPE_INTERPRETATION			0x8B
+#define COMP_TYPE_NETWORK_PROTOCOL_PROFILE	0x92
+#define COMP_TYPE_INVOKE					0xA1
+#define COMP_TYPE_RETURN_RESULT				0xA2
+#define COMP_TYPE_RETURN_ERROR				0xA3
+#define COMP_TYPE_REJECT					0xA4
+#define COMP_TYPE_NFE						0xAA
+
+/* Operation ID values */
+/* Q.952 ROSE operations (Diverting) */
+#define ROSE_DIVERTING_LEG_INFORMATION1		18
+#define ROSE_DIVERTING_LEG_INFORMATION2		0x15
+#define ROSE_DIVERTING_LEG_INFORMATION3		19
+/* Q.956 ROSE operations (Advice Of Charge) */
+#define ROSE_AOC_NO_CHARGING_INFO_AVAILABLE	26
+#define ROSE_AOC_CHARGING_REQUEST			30
+#define ROSE_AOC_AOCS_CURRENCY				31
+#define ROSE_AOC_AOCS_SPECIAL_ARR			32
+#define ROSE_AOC_AOCD_CURRENCY				33
+#define ROSE_AOC_AOCD_CHARGING_UNIT			34
+#define ROSE_AOC_AOCE_CURRENCY				35
+#define ROSE_AOC_AOCE_CHARGING_UNIT			36
+#define ROSE_AOC_IDENTIFICATION_OF_CHARGE	37
+/* Q.SIG operations */
+#define SS_CNID_CALLINGNAME					0
+#define SS_DIVERTING_LEG_INFORMATION2		21
+#define SS_MWI_ACTIVATE						80
+#define SS_MWI_DEACTIVATE					81
+#define SS_MWI_INTERROGATE					82
+
+/* ROSE definitions and data structures */
+#define INVOKE_IDENTIFIER			0x02
+#define INVOKE_LINKED_IDENTIFIER	0x80
+#define INVOKE_NULL_IDENTIFIER		__USE_ASN1_NULL
+
+/* ASN.1 Identifier Octet - Data types */
+#define ASN1_TYPE_MASK			0x1f
+#define ASN1_BOOLEAN			0x01
+#define ASN1_INTEGER			0x02
+#define ASN1_BITSTRING			0x03
+#define ASN1_OCTETSTRING		0x04
+#define ASN1_NULL				0x05
+#define ASN1_OBJECTIDENTIFIER	0x06
+#define ASN1_OBJECTDESCRIPTOR	0x07
+#define ASN1_EXTERN				0x08
+#define ASN1_REAL				0x09
+#define ASN1_ENUMERATED			0x0a
+#define ASN1_EMBEDDEDPDV		0x0b
+#define ASN1_UTF8STRING			0x0c
+#define ASN1_RELATIVEOBJECTID	0x0d
+/* 0x0e & 0x0f are reserved for future ASN.1 editions */
+#define ASN1_SEQUENCE			0x10
+#define ASN1_SET				0x11
+#define ASN1_NUMERICSTRING		0x12
+#define ASN1_PRINTABLESTRING	0x13
+#define ASN1_TELETEXSTRING		0x14
+#define ASN1_IA5STRING			0x16
+#define ASN1_UTCTIME			0x17
+#define ASN1_GENERALIZEDTIME	0x18
+
+/* ASN.1 Identifier Octet - Tags */
+#define ASN1_TAG_0				0x00
+#define ASN1_TAG_1				0x01
+#define ASN1_TAG_2				0x02
+#define ASN1_TAG_3				0x03
+#define ASN1_TAG_4				0x04
+#define ASN1_TAG_5				0x05
+#define ASN1_TAG_6				0x06
+#define ASN1_TAG_7				0x07
+#define ASN1_TAG_8				0x08
+#define ASN1_TAG_9				0x09
+
+/* ASN.1 Identifier Octet - Primitive/Constructor Bit */
+#define ASN1_PC_MASK			0x20
+#define ASN1_PRIMITIVE			0x00
+#define ASN1_CONSTRUCTOR		0x20
+
+/* ASN.1 Identifier Octet - Clan Bits */
+#define ASN1_CLAN_MASK			0xc0
+#define ASN1_UNIVERSAL			0x00
+#define ASN1_APPLICATION		0x40
+#define ASN1_CONTEXT_SPECIFIC		0x80
+#define ASN1_PRIVATE			0xc0
+
+/* ASN.1 Length masks */
+#define ASN1_LEN_INDEF			0x80
+
+
+#define INVOKE_OPERATION_INT	__USE_ASN1_INTEGER
+#define INVOKE_OBJECT_ID		__USE_ASN1_OBJECTIDENTIFIER
+
+/* Q.952 Divert cause */
+#define Q952_DIVERT_REASON_UNKNOWN		0x00
+#define Q952_DIVERT_REASON_CFU			0x01
+#define Q952_DIVERT_REASON_CFB			0x02
+#define Q952_DIVERT_REASON_CFNR			0x03
+#define Q952_DIVERT_REASON_CD			0x04
+#define Q952_DIVERT_REASON_IMMEDIATE	0x05
+/* Q.SIG Divert cause. Listed in ECMA-174 */
+#define QSIG_DIVERT_REASON_UNKNOWN		0x00	/* Call forward unknown reason */
+#define QSIG_DIVERT_REASON_CFU			0x01	/* Call Forward Unconditional (other reason) */
+#define QSIG_DIVERT_REASON_CFB			0x02	/* Call Forward Busy */
+#define QSIG_DIVERT_REASON_CFNR			0x03	/* Call Forward No Reply */
+
+/* Q.932 Type of number */
+#define Q932_TON_UNKNOWN				0x00
+#define Q932_TON_INTERNATIONAL			0x01
+#define Q932_TON_NATIONAL				0x02
+#define Q932_TON_NET_SPECIFIC			0x03
+#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];
+};
+
+#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); \
+	}
+/*
+	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("XX  Data:"); \
+		for (zzz = 0; zzz < (component)->len; ++zzz) \
+			pri_message(" %02X", (component)->data[zzz]); \
+		pri_message("\n"); \
+	}
+*/
+
+#define NEXT_COMPONENT(component, idx) \
+	(idx) += (component)->len + 2
+
+#define SUB_COMPONENT(component, idx) \
+	(idx) += 2
+
+#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; \
+	}
+	
+#define ASN1_GET_INTEGER(component, variable) \
+	do { \
+		int comp_idx; \
+		(variable) = 0; \
+		for (comp_idx = 0; comp_idx < (component)->len; ++comp_idx) \
+			(variable) = ((variable) << 8) | (component)->data[comp_idx]; \
+	} while (0)
+
+#define ASN1_FIXUP_LEN(component, size) \
+	do { \
+		if ((component)->len == ASN1_LEN_INDEF) \
+			size += 2; \
+	} while (0)
+
+#define ASN1_ADD_SIMPLE(component, comptype, ptr, idx) \
+	do { \
+		(component) = (struct rose_component *)&((ptr)[(idx)]); \
+		(component)->type = (comptype); \
+		(component)->len = 0; \
+		(idx) += 2; \
+	} while (0)
+
+#define ASN1_ADD_BYTECOMP(component, comptype, ptr, idx, value) \
+	do { \
+		(component) = (struct rose_component *)&((ptr)[(idx)]); \
+		(component)->type = (comptype); \
+		(component)->len = 1; \
+		(component)->data[0] = (value); \
+		(idx) += 3; \
+	} while (0)
+
+#define ASN1_ADD_WORDCOMP(component, comptype, ptr, idx, value) \
+	do { \
+		int __val = (value); \
+		int __i = 0; \
+		(component) = (struct rose_component *)&((ptr)[(idx)]); \
+		(component)->type = (comptype); \
+		if ((__val >> 24)) \
+			(component)->data[__i++] = (__val >> 24) & 0xff; \
+		if ((__val >> 16)) \
+			(component)->data[__i++] = (__val >> 16) & 0xff; \
+		if ((__val >> 8)) \
+			(component)->data[__i++] = (__val >> 8) & 0xff; \
+		(component)->data[__i++] = __val & 0xff; \
+		(component)->len = __i; \
+		(idx) += 2 + __i; \
+	} while (0)
+
+#define ASN1_PUSH(stack, stackpointer, component) \
+	(stack)[(stackpointer)++] = (component)
+
+#define ASN1_FIXUP(stack, stackpointer, data, idx) \
+	do { \
+		--(stackpointer); \
+		(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, unsigned char *data, int len);
+
+/* Decoder for the return result ROSE component */
+int rose_return_result_decode(struct pri *pri, struct q931_call *call, unsigned char *data, int len);
+
+/* Decoder for the return error ROSE component */
+int rose_return_error_decode(struct pri *pri, struct q931_call *call, unsigned char *data, int len);
+
+/* Decoder for the reject ROSE component */
+int rose_reject_decode(struct pri *pri, struct q931_call *call, 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);
+
+/* Get Name types from ASN.1 */
+int asn1_name_decode(void * data, int len, char *namebuf, int buflen);
+
+int typeofnumber_from_q931(struct pri *pri, int ton);
+
+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);
+
+/* starts a 2BCT */
+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);
+
+/* Use this function to queue a facility-IE born APDU 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);
+
+/* Used by q931.c to cleanup the apdu queue upon destruction of a call */
+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);
+
+#endif /* _PRI_FACILITY_H */
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -27,6 +27,9 @@

 #include <sys/time.h>

+#define DBGHEAD __FILE__ ":%d %s: "
+#define DBGINFO __LINE__,__PRETTY_FUNCTION__
+
 struct pri_sched {
 	struct timeval when;
 	void (*callback)(void *data);
@@ -40,14 +43,26 @@ enum q931_mode;
 /* No more than 128 scheduled events */
 #define MAX_SCHED 128

+#define MAX_TIMERS 32
+
 struct pri {
 	int fd;				/* File descriptor for D-Channel */
+	pri_io_cb read_func;		/* Read data callback */
+	pri_io_cb write_func;		/* Write data callback */
+	void *userdata;
+	struct pri *subchannel;	/* Sub-channel if appropriate */
+	struct pri *master;		/* Master channel if appropriate */
 	struct pri_sched pri_sched[MAX_SCHED];	/* Scheduled events */
 	int debug;			/* Debug stuff */
 	int state;			/* State of D-channel */
 	int switchtype;		/* Switch type */
+	int nsf;		/* Network-Specific Facility (if any) */
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */
+
+	int sapi;
+	int tei;
+	int protodisc;
 	
 	/* Q.921 State */
 	int q921_state;	
@@ -69,7 +84,9 @@ struct pri {
 	int sabme_timer;	/* SABME retransmit */
 	int t203_timer;		/* Max idle time */
 	int t200_timer;		/* T-200 retransmission timer */
-	
+	/* All ISDN Timer values */
+	int timers[MAX_TIMERS];
+
 	/* Used by scheduler */
 	struct timeval tv;
 	int schedev;
@@ -79,7 +96,8 @@ struct pri {
 	struct q921_frame *txqueue;
 	
 	/* Q.931 calls */
-	q931_call *calls;
+	q931_call **callpool;
+	q931_call *localpool;

 	/* do we do overlap dialing */
 	int overlapdial;
@@ -91,6 +109,143 @@ struct pri {
 	unsigned int q931_txcount;
 	unsigned int q931_rxcount;
 #endif
+
+	unsigned char last_invoke;	/* Last ROSE invoke ID */
+	unsigned char sendfacility;
+};
+
+struct pri_sr {
+	int transmode;
+	int channel;
+	int exclusive;
+	int nonisdn;
+	char *caller;
+	int callerplan;
+	char *callername;
+	int callerpres;
+	char *called;
+	int calledplan;
+	int userl1;
+	int numcomplete;
+	char *redirectingnum;
+	int redirectingplan;
+	int redirectingpres;
+	int redirectingreason;
+	int justsignalling;
+	const char *useruserinfo;
+	int transferable;
+};
+
+/* Internal switch types */
+#define PRI_SWITCH_GR303_EOC_PATH	19
+#define PRI_SWITCH_GR303_TMC_SWITCHING	20
+
+struct apdu_event {
+	int message;			/* What message to send the ADPU in */
+	void (*callback)(void *data);	/* Callback function for when response is received */
+	void *data;			/* Data to callback */
+	unsigned char apdu[255];			/* ADPU to send */
+	int apdu_len; 			/* Length of ADPU */
+	int sent;  			/* Have we been sent already? */
+	struct apdu_event *next;	/* Linked list pointer */
+};
+
+/* q931_call datastructure */
+
+struct q931_call {
+	struct pri *pri;	/* PRI */
+	int cr;				/* Call Reference */
+	int forceinvert;	/* Force inversion of call number even if 0 */
+	q931_call *next;
+	/* Slotmap specified (bitmap of channels 31/24-1) (Channel Identifier IE) (-1 means not specified) */
+	int slotmap;
+	/* An explicit channel (Channel Identifier IE) (-1 means not specified) */
+	int channelno;
+	/* An explicit DS1 (-1 means not specified) */
+	int ds1no;
+	/* Whether or not the ds1 is explicitly identified or implicit.  If implicit
+	   the bchan is on the same span as the current active dchan (NFAS) */
+	int ds1explicit;
+	/* Channel flags (0 means none retrieved) */
+	int chanflags;
+	
+	int alive;			/* Whether or not the call is alive */
+	int acked;			/* Whether setup has been acked or not */
+	int sendhangupack;	/* Whether or not to send a hangup ack */
+	int proc;			/* Whether we've sent a call proceeding / alerting */
+	
+	int ri;				/* Restart Indicator (Restart Indicator IE) */
+
+	/* Bearer Capability */
+	int transcapability;
+	int transmoderate;
+	int transmultiple;
+	int userl1;
+	int userl2;
+	int userl3;
+	int rateadaption;
+	
+	int sentchannel;
+	int justsignalling;		/* for a signalling-only connection */
+
+	int progcode;			/* Progress coding */
+	int progloc;			/* Progress Location */	
+	int progress;			/* Progress indicator */
+	int progressmask;		/* Progress Indicator bitmask */
+	
+	int notify;				/* Notification */
+	
+	int causecode;			/* Cause Coding */
+	int causeloc;			/* Cause Location */
+	int cause;				/* Cause of clearing */
+	
+	int peercallstate;		/* Call state of peer as reported */
+	int ourcallstate;		/* Our call state */
+	int sugcallstate;		/* Status call state */
+	
+	int callerplan;
+	int callerplanani;
+	int callerpres;			/* Caller presentation */
+	char callerani[256];	/* Caller */
+	char callernum[256];
+	char callername[256];
+
+	char keypad_digits[64];		/* Buffer for digits that come in KEYPAD_FACILITY */
+
+	int ani2;               /* ANI II */
+	
+	int calledplan;
+	int nonisdn;
+	char callednum[256];	/* Called Number */
+	int complete;			/* no more digits coming */
+	int newcall;			/* if the received message has a new call reference value */
+
+	int retranstimer;		/* Timer for retransmitting DISC */
+	int t308_timedout;		/* Whether t308 timed out once */
+
+	int redirectingplan;
+	int redirectingpres;
+	int redirectingreason;	      
+	char redirectingnum[256];	/* Number of redirecting party */
+	char redirectingname[256];	/* Name of redirecting party */
+
+	/* Filled in cases of multiple diversions */
+	int origcalledplan;
+	int origcalledpres;
+	int origredirectingreason;	/* Original reason for redirect (in cases of multiple redirects) */
+	char origcalledname[256];	/* Original name of person being called */
+	char origcallednum[256];	/* Orignal number of person being called */
+
+	int useruserprotocoldisc;
+	char useruserinfo[256];
+	char callingsubaddr[256];	/* Calling parties sub address */
+	
+	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 */
 };

 extern int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), void *data);
@@ -101,8 +256,10 @@ extern void pri_schedule_del(struct pri *pri, int ev);

 extern pri_event *pri_mkerror(struct pri *pri, char *errstr);

-extern void pri_message(char *fmt, ...);
+extern void pri_message(struct pri *pri, char *fmt, ...);

-extern void pri_error(char *fmt, ...);
+extern void pri_error(struct pri *pri, char *fmt, ...);
+
+void libpri_copy_string(char *dst, const char *src, size_t size);

 #endif
--- a/pri_q921.h
+++ b/pri_q921.h
@@ -26,15 +26,19 @@
 #define _PRI_Q921_H

 #include <sys/types.h>
+#if defined(__linux__)
 #include <endian.h>
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define __BYTE_ORDER _BYTE_ORDER
+#define __BIG_ENDIAN _BIG_ENDIAN
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#endif

 /* Timer values */

 #define T_WAIT_MIN	2000
 #define T_WAIT_MAX	10000
-#define T_200		1000		/* 1 second between SABME's */
-#define T_203		10000		/* 10 seconds with no packets max */
-#define N_200		3		/* 3 retries */

 #define Q921_FRAMETYPE_MASK	0x3

@@ -43,8 +47,17 @@
 #define Q921_FRAMETYPE_S	0x1

 #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_CALLPROC		0
+
+#define Q921_SAPI_CALL_CTRL		0
+#define Q921_SAPI_GR303_EOC		1
+#define Q921_SAPI_GR303_TMC_SWITCHING	1
+#define Q921_SAPI_GR303_TMC_CALLPROC	0
+

-#define Q921_SAPI_CALL_CTRL			0
 #define Q921_SAPI_PACKET_MODE		1
 #define Q921_SAPI_X25_LAYER3      	16
 #define Q921_SAPI_LAYER2_MANAGEMENT	63
@@ -65,7 +78,7 @@ typedef struct q921_header {
 	u_int8_t	tei:7;		/* Terminal Endpoint Identifier (0) */
 #endif
 	u_int8_t	data[0];	/* Further data */
-} q921_header;
+} __attribute__ ((packed)) q921_header;

 /* A Supervisory Format frame */
 typedef struct q921_s {
@@ -85,7 +98,7 @@ typedef struct q921_s {
 #endif
 	u_int8_t data[0];		/* Any further data */
 	u_int8_t fcs[2];		/* At least an FCS */
-} q921_s;
+} __attribute__ ((packed)) q921_s;

 /* An Unnumbered Format frame */
 typedef struct q921_u {
@@ -103,7 +116,7 @@ typedef struct q921_u {
 #endif
 	u_int8_t data[0];		/* Any further data */
 	u_int8_t fcs[2];		/* At least an FCS */
-} q921_u;
+} __attribute__ ((packed)) q921_u;

 /* An Information frame */
 typedef struct q921_i {
@@ -148,7 +161,7 @@ typedef enum q921_state {
 } q921_state;

 /* Dumps a *known good* Q.921 packet */
-extern void q921_dump(q921_h *h, int len, int showraw, int txrx);
+extern void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx);

 /* Bring up the D-channel */
 extern void q921_start(struct pri *pri, int now);
--- a/pri_q931.h
+++ b/pri_q931.h
@@ -81,7 +81,7 @@ typedef struct q931_h {
 #endif
 	u_int8_t contents[0];
 	u_int8_t crv[3];
-} q931_h;
+} __attribute__ ((packed)) q931_h;


 /* Message type header */
@@ -94,25 +94,20 @@ typedef struct q931_mh {
 	u_int8_t f:1;
 #endif
 	u_int8_t data[0];
-} q931_mh;
+} __attribute__ ((packed)) q931_mh;

 /* Information element format */
 typedef struct q931_ie {
-#if __BYTE_ORDER == __BIG_ENDIAN
-	u_int8_t f:1;
-	u_int8_t ie:7;
-#else
-	u_int8_t ie:7;
-	u_int8_t f:1;
-#endif
+	u_int8_t ie;
 	u_int8_t len;
 	u_int8_t data[0];
-} q931_ie;
+} __attribute__ ((packed)) q931_ie;

 #define Q931_RES_HAVEEVENT (1 << 0)
 #define Q931_RES_INERRROR  (1 << 1)

 #define Q931_PROTOCOL_DISCRIMINATOR 0x08
+#define GR303_PROTOCOL_DISCRIMINATOR 0x4f

 /* Q.931 / National ISDN Message Types */

@@ -165,6 +160,7 @@ typedef struct q931_ie {

 /* Q.931 / National ISDN Information Elements */
 #define Q931_LOCKING_SHIFT			0x90
+#define Q931_NON_LOCKING_SHIFT		0x98
 #define Q931_BEARER_CAPABILITY		0x04
 #define Q931_CAUSE					0x08
 #define Q931_CALL_STATE				0x14
@@ -190,10 +186,17 @@ typedef struct q931_ie {
 #define Q931_LOW_LAYER_COMPAT		0x7c
 #define Q931_HIGH_LAYER_COMPAT		0x7d

+#define Q931_CODESET(x)			((x) << 8)
+#define Q931_IE_CODESET(x)		((x) >> 8)
+#define Q931_IE_IE(x)			((x) & 0xff)
+#define Q931_FULL_IE(codeset, ie)	(((codeset) << 8) | ((ie) & 0xff))
+
 #define Q931_DISPLAY					0x28
 #define Q931_IE_SEGMENTED_MSG			0x00
 #define Q931_IE_CHANGE_STATUS			0x01
-#define Q931_IE_CONNECTED_NUM			0x0C
+#define Q931_IE_ORIGINATING_LINE_INFO		(0x01 | Q931_CODESET(6))
+#define Q931_IE_CONNECTED_ADDR			0x0C
+#define Q931_IE_CONNECTED_NUM			0x4C
 #define Q931_IE_CALL_IDENTITY			0x10
 #define Q931_IE_FACILITY				0x1c
 #define Q931_IE_ENDPOINT_ID				0x26
@@ -205,6 +208,7 @@ typedef struct q931_ie {
 #define Q931_IE_INFO_REQUEST            0x32
 #define Q931_IE_SIGNAL					0x34
 #define Q931_IE_SWITCHHOOK				0x36
+#define Q931_IE_GENERIC_DIGITS			(0x37 | Q931_CODESET(6))
 #define Q931_IE_FEATURE_ACTIVATE		0x38
 #define Q931_IE_FEATURE_IND				0x39
 #define Q931_IE_ORIGINAL_CALLED_NUMBER 	0x73
@@ -237,18 +241,28 @@ typedef struct q931_ie {


 /* EuroISDN  */
-#define Q931_SENDING_COMPLETE		0x21
+#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);

-extern int q931_call_proceeding(struct pri *pri, q931_call *call);
+extern int q931_call_progress(struct pri *pri, q931_call *call, int channel, int info);
+
+extern int q931_notify(struct pri *pri, q931_call *call, int channel, int info);
+
+extern int q931_call_proceeding(struct pri *pri, q931_call *call, int channel, int info);

 extern int q931_setup_ack(struct pri *pri, q931_call *call, int channel, int nonisdn);

 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);
@@ -259,13 +273,19 @@ extern int q931_hangup(struct pri *pri, q931_call *call, int cause);

 extern int q931_restart(struct pri *pri, int channel);

+extern int q931_facility(struct pri *pri, q931_call *call);
+
+extern int q931_call_getcrv(struct pri *pri, q931_call *call, int *callmode);
+
+extern int q931_call_setcrv(struct pri *pri, q931_call *call, int crv, int callmode);
+
 extern q931_call *q931_new_call(struct pri *pri);

-extern int q931_setup(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 ulay1);
-extern void q931_dump(q931_h *h, int len, int txrx);
+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
@@ -0,0 +1,89 @@
+/*
+ * libpri: An implementation of Primary Rate ISDN
+ *
+ * Written by Mark Spencer <markster@linux-support.net>
+ *
+ * Copyright (C) 2001, Linux Support Services, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+ 
+#ifndef _PRI_TIMERS_H
+#define _PRI_TIMERS_H
+
+/* -1 means we dont currently support the timer/counter */
+#define PRI_TIMERS_DEFAULT {	3,	/* N200 */ \
+				-1,	/* N201 */ \
+				-1,	/* N202 */ \
+				7,	/* K */ \
+				1000,	/* T200 */ \
+				-1,	/* T201 */ \
+				-1,	/* T202 */ \
+				10000,	/* T203 */ \
+				-1,	/* T300 */ \
+				-1,	/* T301 */ \
+				-1,	/* T302 */ \
+				-1,	/* T303 */ \
+				-1,	/* T304 */ \
+				30000,	/* T305 */ \
+				-1,	/* T306 */ \
+				-1,	/* T307 */ \
+				4000,	/* T308 */ \
+				-1,	/* T309 */ \
+				-1,	/* T310 */ \
+				4000,	/* T313 */ \
+				-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 */
+#define PRI_TIMERS_UNKNOWN PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_NI2 PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_DMS100 PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_LUCENT5E PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_ATT4ESS PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_EUROISDN_E1 PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_EUROISDN_T1 PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_NI1 PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_GR303_EOC PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_GR303_TMC PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_QSIG PRI_TIMERS_DEFAULT
+#define __PRI_TIMERS_GR303_EOC_INT PRI_TIMERS_DEFAULT
+#define __PRI_TIMERS_GR303_TMC_INT PRI_TIMERS_DEFAULT
+
+#define PRI_TIMERS_ALL {	PRI_TIMERS_UNKNOWN, \
+				PRI_TIMERS_NI2, \
+				PRI_TIMERS_DMS100, \
+				PRI_TIMERS_LUCENT5E, \
+				PRI_TIMERS_ATT4ESS, \
+				PRI_TIMERS_EUROISDN_E1, \
+				PRI_TIMERS_EUROISDN_T1, \
+				PRI_TIMERS_NI1, \
+				PRI_TIMERS_QSIG, \
+				PRI_TIMERS_GR303_EOC, \
+				PRI_TIMERS_GR303_TMC, \
+				__PRI_TIMERS_GR303_EOC_INT, \
+				__PRI_TIMERS_GR303_TMC_INT, \
+			}
+
+#endif
--- a/pridump.c
+++ b/pridump.c
@@ -1,9 +1,9 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-support.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,8 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
-#include <linux/zaptel.h>
+#include <sys/types.h>
+#include <zaptel/zaptel.h>
 #include "libpri.h"
 #include "pri_q921.h"
 #include "pri_q931.h"
@@ -62,12 +63,12 @@ static int pri_open(char *dev)
 	return dfd;
 }

-static void dump_packet(char *buf, int len, int txrx)
+static void dump_packet(struct pri *pri, char *buf, int len, int txrx)
 {
 	q921_h *h = (q921_h *)buf;
-	q921_dump(h, len, 1, txrx);
+	q921_dump(pri, h, len, 1, txrx);
 	if (!((h->h.data[0] & Q921_FRAMETYPE_MASK) & 0x3)) {
-		q931_dump((q931_h *)(h->i.data), len - 4, txrx);
+		q931_dump(pri, (q931_h *)(h->i.data), len - 4 - 2 /* FCS */, txrx);
 	}
 	fflush(stdout);
 	fflush(stderr);
@@ -98,18 +99,28 @@ static int pri_bridge(int d1, int d2)
 		if (FD_ISSET(d1, &fds)) {
 			/* Copy from d1 to d2 */
 			res = read(d1, buf, sizeof(buf));
-			dump_packet(buf, res, 1);
+			dump_packet((struct pri *)NULL, buf, res, 1);
 			res = write(d2, buf, res);
 		}
 		if (FD_ISSET(d2, &fds)) {
 			/* Copy from d2 to d1 */
 			res = read(d2, buf, sizeof(buf));
-			dump_packet(buf, res, 0);
+			dump_packet((struct pri *)NULL, buf, res, 0);
 			res = write(d1, buf, res);
 		}
 	}
 }

+static void my_pri_message(struct pri *pri, char *stuff)
+{
+	fprintf(stdout, "%s", stuff);
+}
+
+static void my_pri_error(struct pri *pri, char *stuff)
+{
+	fprintf(stderr, "%s", stuff);
+}
+
 int main(int argc, char *argv[])
 {
 	int d1, d2;
@@ -119,6 +130,9 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 	
+	pri_set_message(my_pri_message);
+	pri_set_error(my_pri_error);
+	
 	d1 = pri_open(argv[1]);
 	if (d1 < 0)
 		exit(1);
--- a/prisched.c
+++ b/prisched.c
@@ -1,9 +1,9 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-support.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -22,9 +22,10 @@
 *
 */

+#include <stdio.h>
+
 #include "libpri.h"
 #include "pri_internal.h"
-#include <stdio.h>


 static int maxsched = 0;
@@ -38,7 +39,7 @@ int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), vo
 		if (!pri->pri_sched[x].callback)
 			break;
 	if (x == MAX_SCHED) {
-		pri_error("No more room in scheduler\n");
+		pri_error(pri, "No more room in scheduler\n");
 		return -1;
 	}
 	if (x > maxsched)
@@ -60,6 +61,9 @@ struct timeval *pri_schedule_next(struct pri *pri)
 {
 	struct timeval *closest = NULL;
 	int x;
+	/* Check subchannels */
+	if (pri->subchannel)
+		closest = pri_schedule_next(pri->subchannel);
 	for (x=1;x<MAX_SCHED;x++) {
 		if (pri->pri_sched[x].callback && 
 			(!closest || (closest->tv_sec > pri->pri_sched[x].when.tv_sec) ||
@@ -70,19 +74,23 @@ struct timeval *pri_schedule_next(struct pri *pri)
 	return closest;
 }

-pri_event *pri_schedule_run(struct pri *pri)
+static pri_event *__pri_schedule_run(struct pri *pri, struct timeval *tv)
 {
-	struct timeval tv;
 	int x;
 	void (*callback)(void *);
 	void *data;
-	gettimeofday(&tv, NULL);
+	pri_event *e;
+	if (pri->subchannel) {
+		if ((e = __pri_schedule_run(pri->subchannel, tv))) {
+			return e;
+		}
+	}
 	for (x=1;x<MAX_SCHED;x++) {
 		if (pri->pri_sched[x].callback &&
-			((pri->pri_sched[x].when.tv_sec < tv.tv_sec) ||
-			 ((pri->pri_sched[x].when.tv_sec == tv.tv_sec) &&
-			  (pri->pri_sched[x].when.tv_usec <= tv.tv_usec)))) {
-            pri->schedev = 0;
+			((pri->pri_sched[x].when.tv_sec < tv->tv_sec) ||
+			 ((pri->pri_sched[x].when.tv_sec == tv->tv_sec) &&
+			  (pri->pri_sched[x].when.tv_usec <= tv->tv_usec)))) {
+			        pri->schedev = 0;
 			  	callback = pri->pri_sched[x].callback;
 				data = pri->pri_sched[x].data;
 				pri->pri_sched[x].callback = NULL;
@@ -90,14 +98,22 @@ pri_event *pri_schedule_run(struct pri *pri)
 				callback(data);
            if (pri->schedev)
                  return &pri->ev;
-		}
+	    }
 	}
 	return NULL;
 }

+pri_event *pri_schedule_run(struct pri *pri)
+{
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	return __pri_schedule_run(pri, &tv);
+}
+
+
 void pri_schedule_del(struct pri *pri,int id)
 {
 	if ((id >= MAX_SCHED) || (id < 0)) 
-		pri_error("Asked to delete sched id %d???\n", id);
+		pri_error(pri, "Asked to delete sched id %d???\n", id);
 	pri->pri_sched[id].callback = NULL;
 }
--- a/pritest.c
+++ b/pritest.c
@@ -1,9 +1,9 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-support.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/time.h>
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
 #include <zap.h>
 #include "libpri.h"

@@ -116,6 +116,10 @@ static int str2switch(char *swtype)
 		return PRI_SWITCH_ATT4ESS;
 	if (!strcasecmp(swtype, "euroisdn"))
 		return PRI_SWITCH_EUROISDN_E1;
+	if (!strcasecmp(swtype, "gr303eoc"))
+		return PRI_SWITCH_GR303_EOC;
+	if (!strcasecmp(swtype, "gr303tmc"))
+		return PRI_SWITCH_GR303_TMC;
 	return -1;
 }

@@ -295,6 +299,7 @@ static int run_pri(int dfd, int swtype, int node)
 		fprintf(stderr, "Unable to create PRI\n");
 		return -1;
 	}
+	pri_set_debug(pri, -1);
 	for (;;) {
 		
 		/* Run the D-Channel */
--- a/q921.c
+++ b/q921.c
@@ -1,9 +1,9 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-support.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -21,12 +21,13 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
 *
 */
- 
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include "compat.h"
 #include "libpri.h"
 #include "pri_internal.h"
 #include "pri_q921.h" 
@@ -41,12 +42,12 @@
 #define RANDOM_DROPS
 */

-#define Q921_INIT(hf) do { \
+#define Q921_INIT(pri, hf) do { \
 	memset(&(hf),0,sizeof(hf)); \
-	(hf).h.sapi = 0; \
+	(hf).h.sapi = (pri)->sapi; \
 	(hf).h.ea1 = 0; \
 	(hf).h.ea2 = 1; \
-	(hf).h.tei = 0; \
+	(hf).h.tei = (pri)->tei; \
 } while(0)

 static void reschedule_t203(struct pri *pri);
@@ -67,9 +68,11 @@ static void q921_discard_retransmissions(struct pri *pri)
 static int q921_transmit(struct pri *pri, q921_h *h, int len) 
 {
 	int res;
+	if (pri->master)
+		return q921_transmit(pri->master, h, len);
 #ifdef RANDOM_DROPS
   if (!(random() % 3)) {
-         pri_message(" === Dropping Packet ===\n");
+         pri_message(pri, " === Dropping Packet ===\n");
         return 0;
   }
 #endif   
@@ -77,12 +80,12 @@ 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)
-		q921_dump(h, len, pri->debug & PRI_DEBUG_Q921_RAW, 1);
+	if (pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
+		q921_dump(pri, h, len, pri->debug & PRI_DEBUG_Q921_RAW, 1);
 	/* Write an extra two bytes for the FCS */
-	res = write(pri->fd, h, len + 2);
+	res = pri->write_func ? pri->write_func(pri, h, len + 2) : 0;
 	if (res != (len + 2)) {
-		pri_error("Short write: %d/%d (%s)\n", res, len + 2, strerror(errno));
+		pri_error(pri, "Short write: %d/%d (%s)\n", res, len + 2, strerror(errno));
 		return -1;
 	}
 	reschedule_t203(pri);
@@ -92,7 +95,7 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
 static void q921_send_ua(struct pri *pri, int pfbit)
 {
 	q921_h h;
-	Q921_INIT(h);
+	Q921_INIT(pri, h);
 	h.u.m3 = 3;		/* M3 = 3 */
 	h.u.m2 = 0;		/* M2 = 0 */
 	h.u.p_f = pfbit;	/* Final bit on */
@@ -105,11 +108,11 @@ static void q921_send_ua(struct pri *pri, int pfbit)
 		h.h.c_r = 1;
 		break;
 	default:
-		pri_error("Don't know how to U/A on a type %d node\n", pri->localtype);
+		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_message("Sending Unnumbered Acknowledgement\n");
+	if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+		pri_message(pri, "Sending Unnumbered Acknowledgement\n");
 	q921_transmit(pri, &h, 3);
 }

@@ -121,10 +124,10 @@ static void q921_send_sabme(void *vpri, int now)
 	q921_h h;
 	pri_schedule_del(pri, pri->sabme_timer);
 	pri->sabme_timer = 0;
-	pri->sabme_timer = pri_schedule_event(pri, T_200, q921_send_sabme_now, pri);
+	pri->sabme_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], q921_send_sabme_now, pri);
 	if (!now)
 		return;
-	Q921_INIT(h);
+	Q921_INIT(pri, h);
 	h.u.m3 = 3;	/* M3 = 3 */
 	h.u.m2 = 3;	/* M2 = 3 */
 	h.u.p_f = 1;	/* Poll bit set */
@@ -137,12 +140,14 @@ static void q921_send_sabme(void *vpri, int now)
 		h.h.c_r = 0;
 		break;
 	default:
-		pri_error("Don't know how to U/A on a type %d node\n", pri->localtype);
+		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_message("Sending Set Asynchronous Balanced Mode Extended\n");
+	if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+		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;
 }

@@ -163,8 +168,8 @@ 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_STATE)
-				pri_message("-- ACKing packet %d, new txqueue is %d (-1 means empty)\n", f->h.n_s, pri->txqueue ? pri->txqueue->h.n_s : -1);
+			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+				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;
 			free(f);
@@ -177,10 +182,11 @@ static int q921_ack_packet(struct pri *pri, int num)
 			while(f) {
 				if (!f->transmitted) {
 					/* Send it now... */
-					if (pri->debug & PRI_DEBUG_Q921_STATE)
-						pri_message("-- Finally transmitting %d, since window opened up\n", f->h.n_s);
+					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+						pri_message(pri, "-- Finally transmitting %d, since window opened up\n", f->h.n_s);
 					f->transmitted++;
 					pri->windowlen++;
+					f->h.n_r = pri->v_r;
 					q921_transmit(pri, (q921_h *)(&f->h), f->len);
 					break;
 				}
@@ -202,10 +208,10 @@ static void reschedule_t203(struct pri *pri)
 {
 	if (pri->t203_timer) {
 		pri_schedule_del(pri, pri->t203_timer);
-		if (pri->debug &  PRI_DEBUG_Q921_STATE)
-			pri_message("-- Restarting T203 counter\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			pri_message(pri, "-- Restarting T203 counter\n");
 		/* Nothing to transmit, start the T203 counter instead */
-		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+		pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
 	}
 }

@@ -218,41 +224,41 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack)
 	for (x=pri->v_a; (x != pri->v_s) && (x != ack); Q921_INC(x));
 	if (x != ack) {
 		/* ACK was outside of our window --- ignore */
-		pri_error("ACK received outside of window, restarting\n");
+		pri_error(pri, "ACK received for '%d' outside of window of '%d' to '%d', restarting\n", ack, pri->v_a, pri->v_s);
 		ev = q921_dchannel_down(pri);
 		q921_start(pri, 1);
 		pri->schedev = 1;
 		return ev;
 	}
 	/* Cancel each packet as necessary */
-	if (pri->debug & PRI_DEBUG_Q921_STATE)
-		pri_message("-- ACKing all packets from %d to (but not including) %d\n", pri->v_a, ack);
+	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		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_STATE)
-			pri_message("-- Since there was nothing left, stopping T200 counter\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			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_STATE)
-			pri_message("-- Stopping T203 counter since we got an ACK\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			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_STATE)
-			pri_message("-- Something left to transmit (%d), restarting T200 counter\n", pri->txqueue->h.n_s);
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			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, T_200, t200_expire, pri);
+			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 	} else {
-		if (pri->debug &  PRI_DEBUG_Q921_STATE)
-			pri_message("-- Nothing left, starting T203 counter\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			pri_message(pri, "-- Nothing left, starting T203 counter\n");
 		/* Nothing to transmit, start the T203 counter instead */
-		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+		pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
 	}
 	return NULL;
 }
@@ -260,7 +266,7 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack)
 static void q921_reject(struct pri *pri, int pf)
 {
 	q921_h h;
-	Q921_INIT(h);
+	Q921_INIT(pri, h);
 	h.s.x0 = 0;	/* Always 0 */
 	h.s.ss = 2;	/* Reject */
 	h.s.ft = 1;	/* Frametype (01) */
@@ -274,18 +280,18 @@ static void q921_reject(struct pri *pri, int pf)
 		h.h.c_r = 1;
 		break;
 	default:
-		pri_error("Don't know how to U/A on a type %d node\n", pri->localtype);
+		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_message("Sending Reject (%d)\n", pri->v_r);
+	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		pri_message(pri, "Sending Reject (%d)\n", pri->v_r);
 	pri->sentrej = 1;
 	q921_transmit(pri, &h, 4);
 }

 static void q921_rr(struct pri *pri, int pbit, int cmd) {
 	q921_h h;
-	Q921_INIT(h);
+	Q921_INIT(pri, h);
 	h.s.x0 = 0;	/* Always 0 */
 	h.s.ss = 0; /* Receive Ready */
 	h.s.ft = 1;	/* Frametype (01) */
@@ -305,12 +311,12 @@ static void q921_rr(struct pri *pri, int pbit, int cmd) {
 			h.h.c_r = 1;
 		break;
 	default:
-		pri_error("Don't know how to U/A on a type %d node\n", pri->localtype);
+		pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
 		return;
 	}
 	pri->v_na = pri->v_r;	/* Make a note that we've already acked this */
-	if (pri->debug & PRI_DEBUG_Q921_STATE)
-		pri_message("Sending Receiver Ready (%d)\n", pri->v_r);
+	if (pri->debug & PRI_DEBUG_Q921_DUMP)
+		pri_message(pri, "Sending Receiver Ready (%d)\n", pri->v_r);
 	q921_transmit(pri, &h, 4);
 }

@@ -319,8 +325,8 @@ 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_STATE)
-			pri_message("-- T200 counter expired, What to do...\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			pri_message(pri, "-- T200 counter expired, What to do...\n");
 		/* Force Poll bit */
 		pri->txqueue->h.p_f = 1;	
 		/* Update nr */
@@ -329,32 +335,53 @@ static void t200_expire(void *vpri)
 		pri->solicitfbit = 1;
 		pri->retrans++;
      /* Up to three retransmissions */
-      if (pri->retrans < N_200) {
+      if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
         /* Reschedule t200_timer */
-         if (pri->debug & PRI_DEBUG_Q921_STATE)
-            pri_message("-- Retransmitting %d bytes\n", pri->txqueue->len);
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+            pri_message(pri, "-- Retransmitting %d bytes\n", pri->txqueue->len);
 		if (pri->busy) 
-			q921_rr(pri, 1, 0);
+			q921_rr(pri, 1, 1);
 		else {
 			if (!pri->txqueue->transmitted) 
-				pri_error("!! Not good - head of queue has not been transmitted yet\n");
+				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_STATE) 
-               pri_message("-- Rescheduling retransmission (%d)\n", pri->retrans);
-         pri->t200_timer = pri_schedule_event(pri, T_200, t200_expire, pri);
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+               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) 
-               pri_message("-- Timeout occured, restarting PRI\n");
+         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);
         q921_start(pri, 1);
         pri->schedev = 1;
      }
+	} else if (pri->solicitfbit) {
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+            pri_message(pri, "-- Retrying poll with f-bit\n");
+		pri->retrans++;
+		if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
+			pri->solicitfbit = 1;
+			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)
+				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);
+			q921_start(pri, 1);
+			pri->schedev = 1;
+		}
 	} else {
-		pri_error("T200 counter expired, nothing to send...\n");
-   	pri->t200_timer = 0;
+		pri_error(pri, "T200 counter expired, nothing to send...\n");
+	   	pri->t200_timer = 0;
 	}
 }

@@ -363,9 +390,9 @@ 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 = malloc(sizeof(q921_frame) + len + 2);
-	memset(f,0,sizeof(q921_frame) + len + 2);
 	if (f) {
-		Q921_INIT(f->h);
+		memset(f,0,sizeof(q921_frame) + len + 2);
+		Q921_INIT(pri, f->h);
 		switch(pri->localtype) {
 		case PRI_NETWORK:
 			if (cr)
@@ -402,27 +429,27 @@ 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_STATE)
-					pri_message("Delaying transmission of %d, window is %d/%d long\n", 
+				if (pri->debug & PRI_DEBUG_Q921_DUMP)
+					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_STATE)
-				pri_message("Stopping T_203 timer\n");
+			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+				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_STATE)
-				pri_message("Starting T_200 timer\n");
-			pri->t200_timer = pri_schedule_event(pri, T_200, t200_expire, pri);
+			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+				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_STATE)
-				pri_message("T_200 timer already going (%d)\n", pri->t200_timer);
+			if (pri->debug & PRI_DEBUG_Q921_DUMP)
+				pri_message(pri, "T_200 timer already going (%d)\n", pri->t200_timer);
 		
 	} else {
-		pri_error("!! Out of memory for Q.921 transmit\n");
+		pri_error(pri, "!! Out of memory for Q.921 transmit\n");
 		return -1;
 	}
 	return 0;
@@ -432,16 +459,17 @@ static void t203_expire(void *vpri)
 {
 	struct pri *pri = vpri;
 	if (pri->q921_state == Q921_LINK_CONNECTION_ESTABLISHED) {
-		if (pri->debug &  PRI_DEBUG_Q921_STATE)
-			pri_message("T203 counter expired, sending RR and scheduling T203 again\n");
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			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;
+		pri->retrans = 0;
 		q921_rr(pri, 1, 1);
-		/* Restart ourselves */
-		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+		/* 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_STATE)
-			pri_message("T203 counter expired in weird statd %d\n", pri->q921_state);
+		if (pri->debug & PRI_DEBUG_Q921_DUMP)
+			pri_message(pri, "T203 counter expired in weird state %d\n", pri->q921_state);
 		pri->t203_timer = 0;
 	}
 }
@@ -486,7 +514,7 @@ static pri_event *q921_handle_iframe(struct pri *pri, q921_i *i, int len)
 	return NULL;
 }

-void q921_dump(q921_h *h, int len, int showraw, int txrx)
+void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
 {
 	int x;
        char *type;
@@ -499,7 +527,7 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 		if (buf) {
 			for (x=0;x<len;x++) 
 				buflen += sprintf(buf + buflen, "%02x ", h->raw[x]);
-			pri_message("\n%c [ %s]\n", direction_tag, buf);
+			pri_message(pri, "\n%c [ %s]\n", direction_tag, buf);
 			free(buf);
 		}
 	}
@@ -507,17 +535,17 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 	switch (h->h.data[0] & Q921_FRAMETYPE_MASK) {
 	case 0:
 	case 2:
-		pri_message("\n%c Informational frame:\n", direction_tag);
+		pri_message(pri, "\n%c Informational frame:\n", direction_tag);
 		break;
 	case 1:
-		pri_message("\n%c Supervisory frame:\n", direction_tag);
+		pri_message(pri, "\n%c Supervisory frame:\n", direction_tag);
 		break;
 	case 3:
-		pri_message("\n%c Unnumbered frame:\n", direction_tag);
+		pri_message(pri, "\n%c Unnumbered frame:\n", direction_tag);
 		break;
 	}
 	
-	pri_message(
+	pri_message(pri, 
 "%c SAPI: %02d  C/R: %d EA: %d\n"
 "%c  TEI: %03d        EA: %d\n", 
    	direction_tag,
@@ -531,7 +559,7 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 	case 0:
 	case 2:
 		/* Informational frame */
-		pri_message(
+		pri_message(pri, 
 "%c N(S): %03d   0: %d\n"
 "%c N(R): %03d   P: %d\n"
 "%c %d bytes of data\n",
@@ -558,7 +586,7 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 			type = "REJ (reject)";
 			break;
 		}
-		pri_message(
+		pri_message(pri, 
 "%c Zero: %d     S: %d 01: %d  [ %s ]\n"
 "%c N(R): %03d P/F: %d\n"
 "%c %d bytes of data\n",
@@ -604,7 +632,7 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 				break;
 			}
 		}
-		pri_message(
+		pri_message(pri, 
 "%c   M3: %d   P/F: %d M2: %d 11: %d  [ %s ]\n"
 "%c %d bytes of data\n",
 	direction_tag,
@@ -632,11 +660,16 @@ static pri_event *q921_dchannel_up(struct pri *pri)
 	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, T_203, t203_expire, pri);
+	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;
@@ -647,6 +680,9 @@ 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;
@@ -659,7 +695,7 @@ void q921_reset(struct pri *pri)
 	pri->v_a = 0;
 	pri->v_r = 0;
 	pri->v_na = 0;
-	pri->window = 7;
+	pri->window = pri->timers[PRI_TIMER_K];
 	pri->windowlen = 0;
 	pri_schedule_del(pri, pri->sabme_timer);
 	pri_schedule_del(pri, pri->t203_timer);
@@ -669,6 +705,8 @@ void q921_reset(struct pri *pri)
 	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;
@@ -677,50 +715,33 @@ void q921_reset(struct pri *pri)
 	q921_discard_retransmissions(pri);
 }

-static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
+static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 {
 	q921_frame *f;
 	pri_event *ev;
 	int sendnow;
-	/* Discard FCS */
-	len -= 2;
-	
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
-		q921_dump(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;
-
-	/* Check for broadcasts - not yet handled */
-	if (h->h.tei == Q921_TEI_GROUP)
-		return NULL;
-	
-	/* Check for SAPIs we don't yet handle */
-	if (h->h.sapi != Q921_SAPI_CALL_CTRL)
-		return NULL;

 	switch(h->h.data[0] & Q921_FRAMETYPE_MASK) {
 	case 0:
 	case 2:
 		if (pri->q921_state != Q921_LINK_CONNECTION_ESTABLISHED) {
-			pri_error("!! Got I-frame while link state %d\n", pri->q921_state);
+			pri_error(pri, "!! Got I-frame while link state %d\n", pri->q921_state);
 			return NULL;
 		}
 		/* Informational frame */
 		if (len < 4) {
-			pri_error("!! Received short I-frame (expected 4, got %d)\n", len);
+			pri_error(pri, "!! Received short I-frame (expected 4, got %d)\n", len);
 			break;
 		}
 		return q921_handle_iframe(pri, &h->i, len);	
 		break;
 	case 1:
 		if (pri->q921_state != Q921_LINK_CONNECTION_ESTABLISHED) {
-			pri_error("!! Got S-frame while link down\n");
+			pri_error(pri, "!! Got S-frame while link down\n");
 			return NULL;
 		}
 		if (len < 4) {
-			pri_error("!! Received short S-frame (expected 4, got %d)\n", len);
+			pri_error(pri, "!! Received short S-frame (expected 4, got %d)\n", len);
 			break;
 		}
 		switch(h->s.ss) {
@@ -734,11 +755,11 @@ static pri_event *__q921_receive(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_STATE) 
-						pri_message("-- Got RR response to our frame\n");
+					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+						pri_message(pri, "-- Got RR response to our frame\n");
 				} else {
-					if (pri->debug & PRI_DEBUG_Q921_STATE) 
-						pri_message("-- Unsolicited RR with P/F bit, responding\n");
+					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+						pri_message(pri, "-- Unsolicited RR with P/F bit, responding\n");
 						q921_rr(pri, 1, 0);
 				}
 				pri->solicitfbit = 0;
@@ -746,8 +767,8 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 			break;
      case 1:
         /* Receiver not ready */
-         if (pri->debug & PRI_DEBUG_Q921_STATE)
-            pri_message("-- Got receiver not ready\n");
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+            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);
@@ -756,8 +777,8 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
         break;   
      case 2:
         /* Just retransmit */
-         if (pri->debug & PRI_DEBUG_Q921_STATE)
-            pri_message("-- Got reject requesting packet %d...  Retransmitting.\n", h->s.n_r);
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+            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);
@@ -769,7 +790,7 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
                     /* Matches the request, or follows in our window, and has
 					    already been transmitted. */
 					 sendnow = 1;
-					 pri_error("!! Got reject for frame %d, retransmitting frame %d now, updating n_r!\n", h->s.n_r, f->h.n_s);
+					 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);
               }
@@ -778,11 +799,11 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
               if (pri->txqueue) {
                     /* This should never happen */
 		     if (!h->s.p_f || h->s.n_r) {
-			pri_error("!! Got reject for frame %d, but we only have others!\n", 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("!! Got reject for frame %d, but we have nothing -- resetting!\n", h->s.n_r);
+				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 */
@@ -793,18 +814,18 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
                     /* Reset and restart t203 timer */
                     if (pri->t203_timer)
                           pri_schedule_del(pri, pri->t203_timer);
-                     pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+                     pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
               }
         }
         break;
 		default:
-			pri_error("!! 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_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);
 		}
 		break;
 	case 3:
 		if (len < 3) {
-			pri_error("!! Received short unnumbered frame\n");
+			pri_error(pri, "!! Received short unnumbered frame\n");
 			break;
 		}
 		switch(h->u.m3) {
@@ -813,16 +834,16 @@ static pri_event *__q921_receive(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_message("-- Got DM Mode from peer.\n");
+					if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+						pri_message(pri, "-- Got DM Mode from peer.\n");
 					/* Disconnected mode, try again after T200 */
 					ev = q921_dchannel_down(pri);
 					q921_start(pri, 0);
 					return ev;
 						
 				} else {
-					if (pri->debug & PRI_DEBUG_Q921_STATE)
-						pri_message("-- Ignoring unsolicited DM with p/f set to 0\n");
+					if (pri->debug & PRI_DEBUG_Q921_DUMP)
+						pri_message(pri, "-- Ignoring unsolicited DM with p/f set to 0\n");
 #if 0
 					/* Requesting that we start */
 					q921_start(pri, 0);
@@ -830,12 +851,12 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 				}
 				break;
 			} else if (!h->u.m2) {
-				pri_message("XXX Unnumbered Information not implemented XXX\n");
+				pri_message(pri, "XXX Unnumbered Information not implemented XXX\n");
 			}
 			break;
 		case 2:
-			if (pri->debug &  PRI_DEBUG_Q921_STATE)
-				pri_message("-- Got Disconnect from peer.\n");
+			if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP))
+				pri_message(pri, "-- Got Disconnect from peer.\n");
 			/* Acknowledge */
 			q921_send_ua(pri, h->u.p_f);
 			ev = q921_dchannel_down(pri);
@@ -844,8 +865,8 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 		case 3:
 			if (h->u.m2 == 3) {
 				/* SABME */
-				if (pri->debug & PRI_DEBUG_Q921_STATE) {
-					pri_message("-- Got SABME from %s peer.\n", h->h.c_r ? "network" : "cpe");
+				if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP)) {
+					pri_message(pri, "-- Got SABME from %s peer.\n", h->h.c_r ? "network" : "cpe");
 				}
 				if (h->h.c_r) {
 					pri->remotetype = PRI_NETWORK;
@@ -866,23 +887,23 @@ static pri_event *__q921_receive(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_message("-- Got UA from %s peer  Link up.\n", h->h.c_r ? "cpe" : "network");
+					if (pri->debug & (PRI_DEBUG_Q921_STATE | PRI_DEBUG_Q921_DUMP)) {
+						pri_message(pri, "-- Got UA from %s peer  Link up.\n", h->h.c_r ? "cpe" : "network");
 					}
 					return q921_dchannel_up(pri);
 				} else 
-					pri_error("!! Got a UA, but i'm in state %d\n", pri->q921_state);
+					pri_error(pri, "!! Got a UA, but i'm in state %d\n", pri->q921_state);
 			} else 
-				pri_error("!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2);
+				pri_error(pri, "!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2);
 			break;
 		case 4:
-			pri_error("!! Frame got rejected!\n");
+			pri_error(pri, "!! Frame got rejected!\n");
 			break;
 		case 5:
-			pri_error("!! XID frames not supported\n");
+			pri_error(pri, "!! XID frames not supported\n");
 			break;
 		default:
-			pri_error("!! Don't know what to do with M3=%d u-frames\n", h->u.m3);
+			pri_error(pri, "!! Don't know what to do with M3=%d u-frames\n", h->u.m3);
 		}
 		break;
 				
@@ -890,11 +911,43 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 	return NULL;
 }

+static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
+{
+	pri_event *ev;
+	/* Discard FCS */
+	len -= 2;
+	
+	if (!pri->master && pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
+		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;
+
+	/* Check for broadcasts - not yet handled */
+	if (h->h.tei == Q921_TEI_GROUP)
+		return NULL;
+
+	/* 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 
+#endif
+			return NULL;
+
+	}
+	ev = __q921_receive_qualified(pri, h, len);
+	reschedule_t203(pri);
+	return ev;
+}
+
 pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 {
 	pri_event *e;
 	e = __q921_receive(pri, h, len);
-	reschedule_t203(pri);
 #ifdef LIBPRI_COUNTERS
 	pri->q921_rxcount++;
 #endif
@@ -904,7 +957,7 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 void q921_start(struct pri *pri, int now)
 {
 	if (pri->q921_state != Q921_LINK_CONNECTION_RELEASED) {
-		pri_error("!! q921_start: Not in 'Link Connection Released' state\n");
+		pri_error(pri, "!! q921_start: Not in 'Link Connection Released' state\n");
 		return;
 	}
 	/* Reset our interface */
--- a/q931.c
+++ b/q931.c
--- a/testprilib.c
+++ b/testprilib.c
@@ -1,9 +1,9 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@linux-support.net>
+ * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -42,11 +42,18 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <linux/zaptel.h>
+#include <zaptel/zaptel.h>
+#ifndef SOLARIS
 #include <zap.h>
+#endif
 #include <pthread.h>
 #include <sys/select.h>
 #include "libpri.h"
+#include "pri_q931.h"
+
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif

 #define DEBUG_LEVEL	PRI_DEBUG_ALL

@@ -74,14 +81,40 @@ static void event1(struct pri *pri, pri_event *e)
 			sprintf(dest, "60%02d", x + 1);
 			if (!(calls[x] = pri_new_call(pri))) {
 				perror("pri_new_call");
-			} else if (pri_call(pri, calls[x], PRI_TRANS_CAP_DIGITAL, x + 1, 1, 1, num, 
+				continue;
+			}
+#if 0
+			{
+				struct pri_sr *sr;
+				sr = pri_sr_new();
+				pri_sr_set_channel(sr, x+1, 0, 0);
+				pri_sr_set_bearer(sr, 0, PRI_LAYER_1_ULAW);
+				pri_sr_set_called(sr, dest, PRI_NATIONAL_ISDN, 1);
+				pri_sr_set_caller(sr, num, name, PRI_NATIONAL_ISDN, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN);
+				pri_sr_set_redirecting(sr, num, PRI_NATIONAL_ISDN, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);
+				if (pri_setup(pri, calls[x], sr))
+					perror("pri_setup");
+				pri_sr_free(sr);
+			}
+#else
+			if (pri_call(pri, calls[x], PRI_TRANS_CAP_DIGITAL, x + 1, 1, 1, num, 
 				PRI_NATIONAL_ISDN, name, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN,
 				dest, PRI_NATIONAL_ISDN, PRI_LAYER_1_ULAW)) {
 					perror("pri_call");
 			}
+#endif
 		}
 		printf("Setup %d calls!\n", TEST_CALLS);
 		break;
+	case PRI_EVENT_RINGING:
+		printf("PRI 1: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+		q931_facility(pri, e->ringing.call);
+		pri_answer(pri, e->ringing.call, e->ringing.channel, 0);
+		break;
+	case PRI_EVENT_HANGUP_REQ:
+		printf("PRI 1: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+		pri_hangup(pri, e->hangup.call, e->hangup.cause);
+		break;
 	default:
 		printf("PRI 1: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
 	}
@@ -91,13 +124,26 @@ static void event2(struct pri *pri, pri_event *e)
 {
 	/* CPE */
 	switch(e->gen.e) {
+	case PRI_EVENT_RING:
+		printf("PRI 2: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+		pri_proceeding(pri, e->ring.call, e->ring.channel, 0);
+		pri_acknowledge(pri, e->ring.call, e->ring.channel, 0);
+		break;
+	case PRI_EVENT_ANSWER:
+		printf("PRI 2: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+		pri_hangup(pri, e->answer.call, PRI_CAUSE_NORMAL_UNSPECIFIED);
+		break;
+	case PRI_EVENT_HANGUP:
+		printf("PRI 2: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+		pri_hangup(pri, e->hangup.call, e->hangup.cause);
+		break;
 	case PRI_EVENT_DCHAN_UP:
 	default:
 		printf("PRI 2: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
 	}
 }

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

-static void testerr(char *s)
+static void testerr(struct pri *pri, char *s)
 {
 	char *c;
 	static int keeplast = 0;
@@ -159,7 +205,7 @@ static void *dchan(void *data)
 	fd_set fds;
 	int res;
 	for(;;) {
-		if (next == pri_schedule_next(pri)) {
+		if ((next = pri_schedule_next(pri))) {
 			gettimeofday(&tv, NULL);
 			tv.tv_sec = next->tv_sec - tv.tv_sec;
 			tv.tv_usec = next->tv_usec - tv.tv_usec;
@@ -214,6 +260,7 @@ int main(int argc, char *argv[])
 	}
 	first = pri;
 	pri_set_debug(pri, DEBUG_LEVEL);
+	pri_facility_enable(pri);
 	if (pthread_create(&tmp, NULL, dchan, pri)) {
 		perror("thread(0)");
 		exit(1);
@@ -223,6 +270,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 	pri_set_debug(pri, DEBUG_LEVEL);
+	pri_facility_enable(pri);
 	if (pthread_create(&tmp, NULL, dchan, pri)) {
 		perror("thread(1)");
 		exit(1);