Importing files for 1.6.0-beta1 release

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.6.0-beta1@520 2fbb986a-6c06-0410-b554-c9c1f0a7f128
Creating tag for the release of libpri-1.6.0-beta1
2008-01-19 00:45:19 +00:00 · 2008-01-19 00:43:47 +00:00 · 2008-01-16 18:06:29 +00:00 · 2008-01-11 16:36:10 +00:00 · 2007-12-26 17:35:41 +00:00 · 2007-12-06 22:16:32 +00:00
22 changed files with 708 additions and 1656 deletions
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.9
+1.6.0-beta1
--- a/415
+++ b/415
@@ -1,178 +1,24 @@
-2009-01-09 Matthew Fredrickson <creslin@digium.com>
+2008-01-18  Russell Bryant  <russell@digium.com>

-	* libpri 1.4.9 released.
-
-2009-01-09 17:58 +0000 [r656]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Add additional case where T200 expires greater than N200
-	  times and we need to release and reacquire the TEI.
-
-2008-12-23 21:38 +0000 [r653]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c, q931.c: Add some additional debug for Q.921 MDL messages
-	  as well as fix a bug in RESTART messages on BRI
-
-2008-11-22 Matthew Fredrickson <creslin@digium.com>
-
-	* libpri 1.4.8 released.
-
-2008-11-22 00:34 +0000 [r645]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Fix a number of Q.921 bugs, found doing TBR4 compliance
-	  testing, thanks to Tzafrir, Xorcom, and co. (#12861). Thanks!
-
-2008-10-17 16:13 +0000 [r636]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri.c, pri_internal.h, pri_q931.h, q931.c, pri_facility.c,
-	  pri_facility.h, libpri.h: Merging in additional Q.SIG features in
-	  #13454. Includes Q.SIG physical/logical channel mapping support,
-	  extended coding of Q.SIG name operations (calling name), and call
-	  rerouting support via added dialplan application.
-
-2008-08-06 18:20 +0000 [r616]  Jason Parker <jparker@digium.com>
-
-	* Makefile: Make install paths use libdir, like libss7
-
-2008-08-05 Kevin P. Fleming <kpfleming@digium.com>
-
-	* libpri 1.4.7 released.
-
-2008-08-05 22:18 +0000 [r611]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pritest.c, pri.c, pri_internal.h, q921.c, q931.c, copy_string.c,
-	  prisched.c, pri_q921.h, pri_q931.h, pri_facility.c, /,
-	  compiler.h, pridump.c, testprilib.c, pri_timers.h,
-	  pri_facility.h, libpri.h: Merged revisions 610 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r610
-	  | kpfleming | 2008-08-05 17:16:58 -0500 (Tue, 05 Aug 2008) | 2
-	  lines clean up license headers, and explicitly grant additional
-	  permissions when used with Asterisk ........
-
-2008-07-30 15:43 +0000 [r606-607]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /: update ignore list
-
-	* Makefile, mkdep (removed): use better version.c creation process,
-	  and better dependency tracking process too
-
-2008-07-29 22:47 +0000 [r598-602]  Jason Parker <jparker@digium.com>
-
-	* build_tools/make_version: I believe this is what was meant. (it
-	  matches how Asterisk does it)
-
-	* build_tools/make_version: libpri is not libss7 :D
-
-2008-07-22 22:36 +0000 [r594]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pri_internal.h, libpri.h: correct comments to match code
-
-2008-07-22 Kevin P. Fleming <kpfleming@digium.com>
-
-	* Libpri 1.4.6 released.
-
-2008-07-22 19:43 +0000 [r589]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pri.c, pri_internal.h, q931.c, libpri.h: rename API call and
-	  option (nothing has been released to use it yet so this should be
-	  safe) to be more accurate in describing what it does (closes
-	  issue #13042)
-
-2008-07-11 Jason Parker <jparker@digium.com>
-
-	* Libpri 1.4.5 released.
-
-2008-07-11 16:44 +0000 [r574-579]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /: ignore generated files
-
-	* pri.c, pri_internal.h, q931.c, libpri.h: modify work done for
-	  issue #10552, making the support of inband audio after RELEASE a
-	  configurable option, since it is causing problems for a number of
-	  users (closes issue #13042)
-
-2008-06-04 17:02 +0000 [r562]  Dwayne M. Hubbard <dhubbard@digium.com>
-
-	* q931.c: While working on issue 3450 I noticed that the
-	  information channel selection field in the channel identification
-	  IE was displayed incorrectly when using 'pri intense debug'. I
-	  wanted another pair of eyes to look at the code because
-	  everything looked correct until Shaun Ruffell noticed the missing
-	  comma in the msg_chan_sel array.
-
-2008-05-07 19:51 +0000 [r557]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
-	  q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
-	  pri_facility.h, libpri.h: Moving trunk changes back into 1.4
-
-2008-05-07 Matthew Fredrickson <creslin@digium.com>
-
-	* Libpri 1.4.4 released.
-
-2008-05-06 16:43 +0000 [r553-555]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c, pri.c: Remove some unnecessary debug messages
-
-	* q931.c: We passed TBR3 layer 2 and layer 3 testing with this
-	  commit in for BRI-TE PTMP.
-
-	* q931.c: Final patch to pass certification
-
-2008-04-22 15:30 +0000 [r546]  Russell Bryant <russell@digium.com>
-
-	* Makefile: All versions of libpri have been installed as
-	  libpri.so.1.0, even though the API and ABI have changed over
-	  time. This patch changes the Makefile to install the library as
-	  libpri.so.1.4 to indicate that this is not compatible with
-	  previous versions. In the future, this should be changed as we
-	  make ABI changes. (closes issue #10376) Reported by: tzafrir
-	  Patches: libpri-soname.diff uploaded by tzafrir (license 46) --
-	  with very minor changes by me
-
-2008-03-15 19:57 +0000 [r541-543]  Matthew Fredrickson <creslin@digium.com>
-
-	* libpri.h, pri.c: Remove some useless event items
-
-	* q921.c, pri_internal.h: Make sure if we're a bri and in PTMP mode
-	  that we release the TEI and try to get a new one with the other
-	  end when we lose activity in multiframe mode
-
-	* q921.c, pri.c, pri_q921.h: When we recieve a UA in any TEI
-	  established state other than awaiting establishement make sure we
-	  drop the TEI and get a new one. For passing tests PC37.2 - PC41.2
-	  in Q.921
-
-2008-03-06 23:43 +0000 [r538-539]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Make sure we are sending as command not as response
-
-	* q921.c: Make sure C/R bit is correct
-
-2008-03-01 23:30 +0000 [r531-535]  Matthew Fredrickson <creslin@digium.com>
-
-	* q921.c: Remove some (currently) useless code
-
-	* q921.c, pri.c, pri_internal.h: Some more updates to add code for
-	  passing PC 27.1 in Q.921
-
-	* q921.c, pri.c: Various coding style cleanups as well as a bug fix
-	  for TEI removal
-
-	* q921.c, q931.c, pri.c, pri_internal.h: Initial checkin of code to
-	  pass Q.921 PC25 and PC26
-
-	* q921.c: Add support for responding to TEI requests (Q.921 PC23.x)
-
-2008-02-18 20:31 +0000 [r525]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, libpri.h: Improve transmission, receiving, and dumping of
-	  bearer capability IE (#11593)
+	* libpri 1.6.0-beta1 released.

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

 	* Makefile, /: Add logging for 'make update' command (also fixes
 	  updates in some places). Issue #11766, initial patch by jmls.

+2008-01-11 16:36 +0000 [r515]  Matthew Fredrickson <creslin@digium.com>
+
+	* q931.c, /: Merged revisions 514 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r514 | mattf | 2008-01-11 10:34:44 -0600 (Fri,
+	  11 Jan 2008) | 9 lines Merged revisions 513 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r513
+	  | mattf | 2008-01-11 10:33:52 -0600 (Fri, 11 Jan 2008) | 1 line
+	  We should not be parsing further into the bearer capability IE if
+	  the length does not confirm that there actually is data present
+	  ........ ................
+
 2007-12-26 17:35 +0000 [r505]  Russell Bryant <russell@digium.com>

 	* libpri.h: Remove unnecessary usage of the extern keyword.
@@ -211,15 +57,72 @@
 	* q921.c, q931.c, libpri.h, pri.c, pritest.c, pri_internal.h: Add
 	  BRI support to libpri

+2007-10-22 15:15 +0000 [r480]  Kevin P. Fleming <kpfleming@digium.com>
+
+	* /, pri_internal.h: Merged revisions 479 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r479 | kpfleming | 2007-10-22 10:10:06 -0500
+	  (Mon, 22 Oct 2007) | 11 lines Merged revisions 478 via svnmerge
+	  from https://origsvn.digium.com/svn/libpri/branches/1.2 ........
+	  r478 | kpfleming | 2007-10-22 10:09:27 -0500 (Mon, 22 Oct 2007) |
+	  3 lines we need to include stddef.h for 'size_t' ........
+	  ................
+
 2007-10-13 16:00 +0000 [r473]  Matthew Fredrickson <creslin@digium.com>

 	* q921.c: Make sure that we only output the message handling debug
 	  when we're actually debugging

+2007-10-05 16:46 +0000 [r471]  Jason Parker <jparker@digium.com>
+
+	* /, libpri.h: Merged revisions 470 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue
+	  #10832) ........ r470 | qwell | 2007-10-05 11:45:39 -0500 (Fri,
+	  05 Oct 2007) | 4 lines Fix an incorrect pri_event structure
+	  definition. Issue 10832, patch by flefoll ........
+
 2007-09-25 21:56 +0000 [r469]  Matthew Fredrickson <creslin@digium.com>

 	* q931.c: Fix user-user IE order in setup message (#10705)

+2007-09-14 21:34 +0000 [r466]  Matthew Fredrickson <creslin@digium.com>
+
+	* q931.c, /, libpri.h: Merged revisions 465 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r465
+	  | mattf | 2007-09-14 16:32:54 -0500 (Fri, 14 Sep 2007) | 1 line
+	  Fix for #10189. Make sure we properly report the user layer 1 for
+	  H.223 and H.245 ........
+
+2007-09-06 15:15 +0000 [r463]  Matthew Fredrickson <creslin@digium.com>
+
+	* pri_facility.c, /, pri.c: Merged revisions 462 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r462 | mattf | 2007-09-06 10:11:29 -0500 (Thu,
+	  06 Sep 2007) | 9 lines Merged revisions 460 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r460
+	  | mattf | 2007-09-06 10:06:42 -0500 (Thu, 06 Sep 2007) | 1 line
+	  TBCT now works. It should work for NI2, 4E, and 5E. This code was
+	  tested on NI2. ........ ................
+
+2007-08-27 19:22 +0000 [r447]  Jason Parker <jparker@digium.com>
+
+	* Makefile, /: Merged revisions 446 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r446 | qwell | 2007-08-27 14:21:08 -0500 (Mon,
+	  27 Aug 2007) | 10 lines Merged revisions 445 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r445
+	  | qwell | 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) | 2 lines
+	  Make sure we build both the static and shared modules with -fPIC.
+	  ........ ................
+
+2007-08-06 19:58 +0000 [r442]  Jason Parker <jparker@digium.com>
+
+	* Makefile, /: Merged revisions 441 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue
+	  #10253) ........ r441 | qwell | 2007-08-06 14:58:19 -0500 (Mon,
+	  06 Aug 2007) | 4 lines Allow setting CC to something with a
+	  space, such as `make CC="gcc -m32"` Issue 10253. ........
+
 2007-06-20 15:18 +0000 [r428-430]  Matthew Fredrickson <creslin@digium.com>

 	* Makefile: Revert that back to how it was
@@ -228,155 +131,81 @@
 	  libpri.h, pri.c, pri_internal.h, pri_q921.h: Patch to add PTMP
 	  mode (BRI support)

+	* q931.c, /: Merged revisions 427 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r427 | mattf | 2007-06-19 13:23:36 -0500 (Tue,
+	  19 Jun 2007) | 9 lines Merged revisions 426 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r426
+	  | mattf | 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) | 1 line
+	  Try to send pending facility messages if we receive alerting (for
+	  when we don't get proceeding) (#9651) ........ ................
+
 2007-06-06 21:59 +0000 [r417-425]  Matthew Fredrickson <creslin@digium.com>

+	* pri_facility.c, /: Merged revisions 424 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r424 | mattf | 2007-06-06 16:58:22 -0500 (Wed,
+	  06 Jun 2007) | 9 lines Merged revisions 423 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r423
+	  | mattf | 2007-06-06 16:57:15 -0500 (Wed, 06 Jun 2007) | 1 line
+	  Oops, that should not be on one line ........ ................
+
 	* q931.c, pri_facility.c, pri_facility.h, pri.c, pri_internal.h:
 	  Preliminary patch plus mods for Q.SIG Path Replacement (Q.SIG
 	  version of 2BCT) #7778

+	* pri_facility.c, /: Merged revisions 416 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r416 | mattf | 2007-06-06 08:22:15 -0500 (Wed,
+	  06 Jun 2007) | 10 lines Merged revisions 415 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r415
+	  | mattf | 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) | 2 lines
+	  Make sure we only send the NFE when we are talking QSIG ........
+	  ................
+
 2007-05-25 17:36 +0000 [r413]  Matthew Fredrickson <creslin@digium.com>

 	* q931.c, pri_facility.c, pri_facility.h, libpri.h: Commit path for
 	  ROSE-12 and ROSE-13 support (#9076)

-2006-11-03 18:16 +0000 [r382]  Matthew Fredrickson <creslin@digium.com>
+2007-01-23 22:02 +0000 [r391-393]  Matthew Fredrickson <creslin@digium.com>

-	* q921.c: Remove pointless recursion. (#8281)
-
-2008-05-07 19:51 +0000 [r557]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
-	  q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
-	  pri_facility.h, libpri.h: Moving trunk changes back into 1.4
-
-2008-05-02 20:21 +0000 [r552]  Brett Bryant <bbryant@digium.com>
-
-	* Makefile, build_tools (added), build_tools/make_version (added),
-	  build_tools/make_version_c (added), libpri.h: Add new API call
-	  (pri_get_version) to show the current version of the branch for
-	  support purposes.
-
-2008-04-16 00:21 +0000 [r544]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* q921.c: fix the indentation in this function so that it is
-	  actually possible to read it and understand the logic and flow
-
-2008-02-21 16:38 +0000 [r528]  Joshua Colp <jcolp@digium.com>
-
-	* q931.c: If inband audio is being provided with a disconnect
-	  message let the audio be heard before releasing the channel.
-	  (closes issue #10552) Reported by: paravoid Patches:
-	  disconnect-audio.diff uploaded by paravoid (license 200)
-
-2008-02-18 20:31 +0000 [r524]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, libpri.h: Improve transmission, receiving, and dumping of
-	  bearer capability IE (#11593)
-
-2008-01-11 16:34 +0000 [r514]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /: Merged revisions 513 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r513
-	  | mattf | 2008-01-11 10:33:52 -0600 (Fri, 11 Jan 2008) | 1 line
-	  We should not be parsing further into the bearer capability IE if
-	  the length does not confirm that there actually is data present
-	  ........
-
-2007-12-13  Russell Bryant  <russell@digium.com>
-
-	* libpri 1.4.3 released.
-
-2007-10-22 15:10 +0000 [r479]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pri_internal.h, /: Merged revisions 478 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r478
-	  | kpfleming | 2007-10-22 10:09:27 -0500 (Mon, 22 Oct 2007) | 3
-	  lines we need to include stddef.h for 'size_t' ........
-
-2007-10-16  Matthew Fredrickson  <creslin@digium.com>
-
-	* libpri 1.4.2 released.
-
-2007-10-05 16:45 +0000 [r470]  Jason Parker <jparker@digium.com>
-
-	* libpri.h: Fix an incorrect pri_event structure definition. Issue
-	  10832, patch by flefoll
-
-2007-09-25 21:37 +0000 [r468]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c: Fix user-user IE order in setup message (#10705)
-
-2007-09-14 21:32 +0000 [r465]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, libpri.h: Fix for #10189. Make sure we properly report
-	  the user layer 1 for H.223 and H.245
-
-2007-09-06 15:11 +0000 [r462]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri.c, pri_facility.c, /: Merged revisions 460 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r460
-	  | mattf | 2007-09-06 10:06:42 -0500 (Thu, 06 Sep 2007) | 1 line
-	  TBCT now works. It should work for NI2, 4E, and 5E. This code was
-	  tested on NI2. ........
-
-2007-08-27 19:21 +0000 [r446]  Jason Parker <jparker@digium.com>
-
-	* Makefile, /: Merged revisions 445 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r445
-	  | qwell | 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) | 2 lines
-	  Make sure we build both the static and shared modules with -fPIC.
-	  ........
-
-2007-08-06 19:58 +0000 [r441]  Jason Parker <jparker@digium.com>
-
-	* Makefile: Allow setting CC to something with a space, such as
-	  `make CC="gcc -m32"` Issue 10253.
-
-2007-07-09  Russell Bryant  <russell@digium.com>
-
-	* libpri 1.4.1 released.
-
-2007-06-19 18:23 +0000 [r427]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /: Merged revisions 426 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r426
-	  | mattf | 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) | 1 line
-	  Try to send pending facility messages if we receive alerting (for
-	  when we don't get proceeding) (#9651) ........
-
-2007-06-06 21:58 +0000 [r416-424]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri_facility.c, /: Merged revisions 423 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r423
-	  | mattf | 2007-06-06 16:57:15 -0500 (Wed, 06 Jun 2007) | 1 line
-	  Oops, that should not be on one line ........
-
-	* pri_facility.c, /: Merged revisions 415 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r415
-	  | mattf | 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) | 2 lines
-	  Make sure we only send the NFE when we are talking QSIG ........
-
-2007-01-22 22:29 +0000 [r390]  Matthew Fredrickson <creslin@digium.com>
-
-	* q931.c, /: Merged revisions 389 via svnmerge from
+	* q931.c, /: Merged revisions 390 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r390 | mattf | 2007-01-22 16:29:24 -0600 (Mon,
+	  22 Jan 2007) | 10 lines Merged revisions 389 via svnmerge from
 	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r389
 	  | mattf | 2007-01-22 16:20:59 -0600 (Mon, 22 Jan 2007) | 2 lines
 	  Make sure we send DISCONNECT if we reached the active state and a
 	  call is disconnected, regardless of cause code. ........
+	  ................

-2006-12-30 19:17 +0000 [r386]  Joshua Colp <jcolp@digium.com>
+	* /: Fix mess up in up-port

-	* Makefile, /: Merged revisions 385 via svnmerge from
+	* /: Merged revisions 389 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........
+	  ........
+
+2006-12-30 19:18 +0000 [r387]  Joshua Colp <jcolp@digium.com>
+
+	* Makefile, /: Merged revisions 386 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4
+	  ................ r386 | file | 2006-12-30 14:17:34 -0500 (Sat, 30
+	  Dec 2006) | 10 lines Merged revisions 385 via svnmerge from
 	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r385
 	  | file | 2006-12-30 14:16:17 -0500 (Sat, 30 Dec 2006) | 2 lines
 	  Specify full path to restorecon instead of assuming it will be
 	  available from what is in $PATH. (issue #8670 reported by djflux)
-	  ........
+	  ........ ................

-2006-12-23  Kevin P. Fleming  <kpfleming@digium.com>
+2006-11-03 18:16 +0000 [r382]  Matthew Fredrickson <creslin@digium.com>
+
+	* q921.c: Remove pointless recursion. (#8281)
+
+2006-09-20 21:00 +0000 [r374]  Kevin P. Fleming <kpfleming@digium.com>
+
+	* /: set up merge tracking from 1.4 branch

-	* libpri 1.4.0 released.
-	
 2006-09-20  Kevin P. Fleming  <kpfleming@digium.com>

 	* libpri 1.4.0-beta1 released.
--- a/81
+++ b/81
@@ -28,26 +28,18 @@
 #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS

 CC=gcc
-GREP=grep
-AWK=awk

 OSARCH=$(shell uname -s)
 PROC?=$(shell uname -m)

-# SONAME version; should be changed on every ABI change
-# please don't change it needlessly; it's perfectly fine to have a SONAME
-# of 1.2 and a version of 1.4.x
-SONAME:=1.4
-
 STATIC_LIBRARY=libpri.a
-DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
-STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
-DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+DYNAMIC_LIBRARY=libpri.so.1.0
+STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
+DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
 CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
-libdir?=$(INSTALL_BASE)/lib
-SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+SOFLAGS = -Wl,-hlibpri.so.1.0
 LDCONFIG = /sbin/ldconfig
 ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
 LDCONFIG_FLAGS=-n
@@ -62,13 +54,10 @@ 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

-export PRIVERSION
-
-PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
-
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 #This works for even old (2.96) versions of gcc and provides a small boost either way.
 #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
@@ -77,7 +66,7 @@ PROC=ultrasparc
 CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
 endif

-all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)

 update:
 	@if [ -d .svn ]; then \
@@ -97,27 +86,28 @@ update:
 	fi

 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-	mkdir -p $(INSTALL_PREFIX)$(libdir)
+	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)$(libdir)
-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
+	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+	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)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
+	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)$(libdir)/libpri.so.$(SONAME)
-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
+	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
@@ -132,13 +122,12 @@ testprilib: testprilib.o
 pridump: pridump.o
 	$(CC) -o pridump pridump.o -L. -lpri $(CFLAGS)

-MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+ifneq ($(wildcard .depend),)
+include .depend
+endif

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

 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
@@ -147,23 +136,17 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
 $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
-	ln -sf libpri.so.$(SONAME) libpri.so
-
-version.c: FORCE
-	@build_tools/make_version_c > $@.tmp
-	@cmp -s $@.tmp $@ || mv $@.tmp $@
-	@rm -f $@.tmp
+	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.$(SONAME)
+	rm -f *.o *.so *.lo *.so.1 *.so.1.0
 	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	rm -f pritest pridump
-	rm -f .*.d
+	rm -f .depend

-.PHONY:
+depend: .depend

-FORCE:
-
-ifneq ($(wildcard .*.d),)
-   include .*.d
-endif
+.depend: 
+	CC="$(CC)" ./mkdep ${CFLAGS} `ls *.c`
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-if [ -f ${1}/.version ]; then
-	cat ${1}/.version
-elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/libpri/::' | sed -e 's:/: :g'`
-    BRANCH=0
-    TEAM=0
-    TAG=0
-
-    REV=`svnversion -c ${1} | cut -d: -f2`
-
-    BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
-
-	if [ "${PARTS}" = "trunk" ] ; then
-	echo SVN-trunk-r${REV}
-	exit 0
-	fi
-
-    for PART in $PARTS ; do
-      if [ ${TAG} != 0 ] ; then
-	    if [ "${PART}" = "autotag_for_be" ] ; then
-	      continue
-	    fi
-	    if [ "${PART}" = "autotag_for_sx00i" ] ; then
-	      continue
-	    fi
-	    RESULT="${PART}"
-	    break
-      fi
-
-      if [ ${BRANCH} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
-          RESULT="${PART}"
-        else
-          RESULT="${RESULT}-${PART}"
-        fi
-	    break
-      fi
-
-      if [ ${TEAM} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
-           RESULT="${PART}"
-        else
-          RESULT="${RESULT}-${PART}"
-        fi
-        continue
-      fi
-
-      if [ "${PART}" = "branches" ] ; then
-        BRANCH=1
-        RESULT="branch"
-        continue
-      fi
-
-      if [ "${PART}" = "tags" ] ; then
-        TAG=1
-        continue
-      fi
-
-      if [ "${PART}" = "team" ] ; then
-        TEAM=1
-        continue
-      fi
-    done
-
-    if [ ${TAG} != 0 ] ; then
-	echo ${RESULT}
-    else
-	echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
-    fi
-fi
--- a/build_tools/make_version_c
+++ b/build_tools/make_version_c
@@ -1,24 +0,0 @@
-#!/bin/sh
-if [ ! -f ../.flavor ]; then
-    EXTRA=""
-else
-    aadkver=`cat ../.version`
-    aadkflavor=`cat ../.flavor`
-    EXTRA=" (${aadkflavor} ${aadkver})"
-fi
-cat << END
-/*
- * version.c
- * Automatically generated
- */
-
-#include "libpri.h"
-
-static const char pri_version[] = "${PRIVERSION}${EXTRA}";
-
-const char *pri_get_version(void)
-{
-	return pri_version;
-}
-
-END
--- a/compiler.h
+++ b/compiler.h
@@ -4,26 +4,9 @@
 * Compiler-specific macros and other items
 *
 * Copyright (C) 2005, Digium, Inc.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
 * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
- *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
+ * the GNU General Public License
 */

 #ifndef _ASTERISK_COMPILER_H
--- a/copy_string.c
+++ b/copy_string.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #include <string.h>
--- a/libpri.h
+++ b/libpri.h
@@ -1,30 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
 *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #ifndef _LIBPRI_H
@@ -212,52 +207,6 @@
 #define PRI_LAYER_1_V120_RATE_ADAPT	0x28
 #define PRI_LAYER_1_X31_RATE_ADAPT	0x29

-
-/* Intermediate rates for V.110 */
-#define PRI_INT_RATE_8K			1
-#define PRI_INT_RATE_16K		2
-#define PRI_INT_RATE_32K		3
-
-
-/* Rate adaption for bottom 5 bits of rateadaption */
-#define PRI_RATE_USER_RATE_MASK		0x1F
-#define PRI_RATE_ADAPT_UNSPEC		0x00
-#define PRI_RATE_ADAPT_0K6		0x01
-#define PRI_RATE_ADAPT_1K2		0x02
-#define PRI_RATE_ADAPT_2K4		0x03
-#define PRI_RATE_ADAPT_3K6		0x04
-#define PRI_RATE_ADAPT_4K8		0x05
-#define PRI_RATE_ADAPT_7K2		0x06
-#define PRI_RATE_ADAPT_8K		0x07
-#define PRI_RATE_ADAPT_9K6		0x08
-#define PRI_RATE_ADAPT_14K4		0x09
-#define PRI_RATE_ADAPT_16K		0x0A
-#define PRI_RATE_ADAPT_19K2		0x0B
-#define PRI_RATE_ADAPT_32K		0x0C
-#define PRI_RATE_ADAPT_38K4		0x0D
-#define PRI_RATE_ADAPT_48K		0x0E
-#define PRI_RATE_ADAPT_56K		0x0F
-#define PRI_RATE_ADAPT_57K6		0x12
-#define PRI_RATE_ADAPT_28K8		0x13
-#define PRI_RATE_ADAPT_24K		0x14
-#define PRI_RATE_ADAPT_0K1345		0x15
-#define PRI_RATE_ADAPT_0K1		0x16
-#define PRI_RATE_ADAPT_0K075_1K2	0x17
-#define PRI_RATE_ADAPT_1K2_0K075	0x18
-#define PRI_RATE_ADAPT_0K05		0x19
-#define PRI_RATE_ADAPT_0K075		0x1A
-#define PRI_RATE_ADAPT_0K110		0x1B
-#define PRI_RATE_ADAPT_0K150		0x1C
-#define PRI_RATE_ADAPT_0K200		0x1D
-#define PRI_RATE_ADAPT_0K300		0x1E
-#define PRI_RATE_ADAPT_12K		0x1F
-
-/* in-band negotiation flag for rateadaption bit 5 */
-#define PRI_RATE_ADAPT_NEGOTIATION_POSS	0x20
-
-/* async flag for rateadaption bit 6 */
-#define PRI_RATE_ADAPT_ASYNC		0x40
-
 /* Notifications */
 #define PRI_NOTIFY_USER_SUSPENDED		0x00	/* User suspended */
 #define PRI_NOTIFY_USER_RESUMED			0x01	/* User resumed */
@@ -308,20 +257,24 @@ typedef struct q931_call q931_call;
 typedef struct pri_event_generic {
 	/* Events with no additional information fall in this category */
 	int e;
+	struct pri *pri;
 } pri_event_generic;

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

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

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

 typedef struct pri_event_answer {
 	int e;
+	struct pri *pri;
 	int channel;
 	int cref;
 	int progress;
@@ -342,20 +296,23 @@ typedef struct pri_event_answer {

 typedef struct pri_event_facname {
 	int e;
+ 	struct pri *pri;
+	int callingpres;			/* Presentation of Calling CallerID */
+	int callingplan;			/* Dialing plan of Calling entity */
 	char callingname[256];
 	char callingnum[256];
 	int channel;
 	int cref;
 	q931_call *call;
-	int callingpres;			/* Presentation of Calling CallerID */
-	int callingplan;			/* Dialing plan of Calling entity */
 } pri_event_facname;

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

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

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

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

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

 typedef struct pri_event_keypad_digit {
 	int e;
+ 	struct pri *pri;
 	int channel;
 	q931_call *call;
 	char digits[64];
@@ -569,8 +531,7 @@ int pri_set_crv(struct pri *pri, q931_call *call, int crv, int callmode);
 struct timeval *pri_schedule_next(struct pri *pri);

 /* Run any pending schedule events */
-extern pri_event *pri_schedule_run(struct pri *pri);
-extern pri_event *pri_schedule_run_tv(struct pri *pri, const struct timeval *now);
+pri_event *pri_schedule_run(struct pri *pri);

 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,
@@ -615,10 +576,6 @@ void pri_set_error(void (*__pri_error)(struct pri *pri, char *));
 #define PRI_SET_OVERLAPDIAL
 void pri_set_overlapdial(struct pri *pri,int state);

-/* QSIG logical channel mapping option, do not skip channel 16 */
-#define PRI_SET_CHAN_MAPPING_LOGICAL
-void pri_set_chan_mapping_logical(struct pri *pri, int state);
-
 #define PRI_DUMP_INFO_STR
 char *pri_dump_info_str(struct pri *pri);

@@ -626,19 +583,13 @@ char *pri_dump_info_str(struct pri *pri);
 int pri_fd(struct pri *pri);

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

-/* Send progress with cause IE */
-int pri_progress_with_cause(struct pri *pri, q931_call *c, int channel, int info, int cause);
-
 #define PRI_PROCEEDING_FULL
 /* Send call proceeding */
 int pri_proceeding(struct pri *pri, q931_call *c, int channel, int info);

-/* Enable inband progress when a DISCONNECT is received */
-void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable);
-
 /* Enslave a PRI to another, so they share the same call list
   (and maybe some timers) */
 void pri_enslave(struct pri *master, struct pri *slave);
@@ -654,8 +605,6 @@ void pri_enslave(struct pri *master, struct pri *slave);
 /* Send notification */
 int pri_notify(struct pri *pri, q931_call *c, int channel, int info);

-int pri_callrerouting_facility(struct pri *pri, q931_call *call, const char *dest, const char* original, const char* reason);
-
 /* Get/Set PRI Timers  */
 #define PRI_GETSET_TIMERS
 int pri_set_timer(struct pri *pri, int timer, int value);
@@ -698,7 +647,4 @@ int pri_timer2idx(char *timer);
 #define PRI_TIMER_TM20	28	/* maximum time avaiting XID response */
 #define PRI_TIMER_NM20	29	/* number of XID retransmits */

-/* Get PRI version */
-const char *pri_get_version(void);
-
 #endif
--- a/125
+++ b/125
@@ -0,0 +1,125 @@
+#!/bin/sh -
+#
+#	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
+#	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
+#
+# Copyright (c) 1991, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
+#
+
+D=.depend			# default dependency file is .depend
+append=0
+pflag=
+
+while :
+	do case "$1" in
+		# -a appends to the depend file
+		-a)
+			append=1
+			shift ;;
+
+		# -f allows you to select a makefile name
+		-f)
+			D=$2
+			shift; shift ;;
+
+		# the -p flag produces "program: program.c" style dependencies
+		# so .o's don't get produced
+		-p)
+			pflag=p
+			shift ;;
+		*)
+			break ;;
+	esac
+done
+
+if [ $# = 0 ] ; then
+	echo 'usage: mkdep [-p] [-f depend_file] [cc_flags] file ...'
+	exit 1
+fi
+
+DTMP=/tmp/mkdep$$
+TMP=$DTMP/mkdep
+
+um=`umask`
+umask 022
+if ! mkdir $DTMP ; then
+	echo failed to create tmp dir $DTMP
+	exit 1
+fi
+
+umask $um
+trap 'rm -rf $DTMP ; trap 2 ; kill -2 $$' 1 2 3 13 15
+
+if [ x$pflag = x ]; then
+	${CC:-cc} -M "$@" 2>/dev/null | sed -e 's; \./; ;g' > $TMP
+else
+	${CC:-cc} -M "$@" 2>/dev/null | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
+fi
+
+if [ $? != 0 ]; then
+	echo 'mkdep: compile failed.'
+	rm -rf $DTMP
+	exit 1
+fi
+
+if [ $append = 1 ]; then
+	cat $TMP >> $D
+	if [ $? != 0 ]; then
+		echo 'mkdep: append 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
+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
+fi
+
+rm -rf $DTMP
+exit 0
--- a/pri.c
+++ b/pri.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 #include <unistd.h>
@@ -192,12 +187,6 @@ static int __pri_write(struct pri *pri, void *buf, int buflen)
 	return res;
 }

-/* Pass in the master for this function */
-void __pri_free_tei(struct pri * p)
-{
-	free (p);
-}
-
 struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master, pri_io_cb rd, pri_io_cb wr, void *userdata, int tei, int bri)
 {
 	struct pri *p;
@@ -219,6 +208,7 @@ struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master,
 	p->protodisc = Q931_PROTOCOL_DISCRIMINATOR;
 	p->master = master;
 	p->callpool = &p->localpool;
+	p->ev.gen.pri = p;
 	pri_default_timers(p, switchtype);
 	if (master) {
 		pri_set_debug(p, master->debug);
@@ -483,19 +473,10 @@ int pri_proceeding(struct pri *pri, q931_call *call, int channel, int info)
 	return q931_call_proceeding(pri, call, channel, info);
 }

-int pri_progress_with_cause(struct pri *pri, q931_call *call, int channel, int info, int cause)
-{
-	if (!pri || !call)
-		return -1;
-
-	return q931_call_progress_with_cause(pri, call, channel, info, cause);
-}
-
 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);
 }

@@ -514,15 +495,6 @@ int pri_keypad_facility(struct pri *pri, q931_call *call, char *digits)
 	return q931_keypad_facility(pri, call, digits);
 }

-
-int pri_callrerouting_facility(struct pri *pri, q931_call *call, const char *dest, const char* original, const char* reason)
-{
-	if (!pri || !call)
-		return -1;
-
-	return qsig_cf_callrerouting(pri, call, dest, original, reason);
-}
-
 int pri_notify(struct pri *pri, q931_call *call, int channel, int info)
 {
 	if (!pri || !call)
@@ -805,17 +777,6 @@ void pri_set_overlapdial(struct pri *pri,int state)
 	pri->overlapdial = state;
 }

-void pri_set_chan_mapping_logical(struct pri *pri, int state)
-{
-	if (pri->switchtype == PRI_SWITCH_QSIG)
-		pri->chan_mapping_logical = state;
-}
-
-void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable)
-{
-	pri->acceptinbanddisconnect = (enable != 0);
-}
-
 int pri_fd(struct pri *pri)
 {
 	return pri->fd;
@@ -854,7 +815,6 @@ char *pri_dump_info_str(struct pri *pri)
 	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, "Logical Channel Mapping: %d\n", pri->chan_mapping_logical);
 	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]);
--- a/pri_facility.c
+++ b/pri_facility.c
@@ -3,28 +3,23 @@
 *
 * Written by Matthew Fredrickson <creslin@digium.com>
 *
- * Copyright (C) 2004-2005, Digium, Inc.
+ * Copyright (C) 2004-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 #include "compat.h"
@@ -1186,198 +1181,6 @@ int eect_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
 }
 /* End EECT */

-/* QSIG CF CallRerouting */
-int qsig_cf_callrerouting(struct pri *pri, q931_call *c, const char* dest, const char* original, const char* reason)
-{
-/*CallRerouting ::= OPERATION
-    -- Sent from the Served User PINX to the Rerouting PINX
-    ARGUMENT SEQUENCE
-    { reroutingReason DiversionReason,
-    originalReroutingReason [0] IMPLICIT DiversionReason OPTIONAL,
-    calledAddress Address,
-    diversionCounter INTEGER (1..15),
-    pSS1InfoElement PSS1InformationElement,
-    -- The basic call information elements Bearer capability, High layer compatibility, Low
-    -- layer compatibity, Progress indicator and Party category can be embedded in the
-    -- pSS1InfoElement in accordance with 6.5.3.1.5
-    lastReroutingNr [1] PresentedNumberUnscreened,
-    subscriptionOption [2] IMPLICIT SubscriptionOption,
-
-    callingPartySubaddress [3] PartySubaddress OPTIONAL,
-
-    callingNumber [4] PresentedNumberScreened,
-
-    callingName [5] Name OPTIONAL,
-    originalCalledNr [6] PresentedNumberUnscreened OPTIONAL,
-    redirectingName [7] Name OPTIONAL,
-    originalCalledName [8] Name OPTIONAL,
-    extension CHOICE {
-      [9] IMPLICIT Extension ,
-      [10] IMPLICIT SEQUENCE OF Extension } OPTIONAL }
-*/
-
-	int i = 0, j;
-	int res = 0;
-	unsigned char buffer[255] = "";
-	int len = 253;
-	struct rose_component *comp = NULL, *compstk[10];
-	int compsp = 0;
-	static unsigned char op_tag[] = {
-		0x13,
-	};
-
-	buffer[i++] = (ASN1_CONTEXT_SPECIFIC | Q932_PROTOCOL_EXTENSIONS);
-	/* Interpretation component */
-
-	ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_0), buffer, i, 0);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	ASN1_ADD_BYTECOMP(comp, COMP_TYPE_INTERPRETATION, buffer, i, 2);    /* reject - to get feedback from QSIG switch */
-
-	ASN1_ADD_SIMPLE(comp, COMP_TYPE_INVOKE, buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	ASN1_ADD_BYTECOMP(comp, ASN1_INTEGER, buffer, i, get_invokeid(pri));
-
-	res = asn1_string_encode(ASN1_INTEGER, &buffer[i], sizeof(buffer)-i, sizeof(op_tag), op_tag, sizeof(op_tag));
-	if (res < 0)
-		return -1;
-	i += res;
-
-	/* call rerouting argument */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONSTRUCTOR | ASN1_SEQUENCE), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	/* reroutingReason DiversionReason */
-
-	if (reason) {
-		if (!strcasecmp(reason, "cfu"))
-			ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 1); /* cfu */
-		else if (!strcasecmp(reason, "cfb"))
-			 ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 2); /* cfb */
-		else if (!strcasecmp(reason, "cfnr"))
-			ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 3); /* cfnr */
-	} else {
-		ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 0); /* unknown */
-	}
-
-
-	/* calledAddress Address */
-	/* explicit sequence tag for Address */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONSTRUCTOR | ASN1_SEQUENCE), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	/* implicit choice public party number tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_1), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	/* type of public party number = unknown */
-	ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 0);
-	/* NumberDigits of public party number */
-	j = asn1_string_encode(ASN1_NUMERICSTRING, &buffer[i], len - i, 20, (char*)dest, strlen(dest));
-	if (j < 0)
-		return -1;
-
-	i += j;
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	/* diversionCounter INTEGER (1..15) */
-	ASN1_ADD_BYTECOMP(comp, ASN1_INTEGER, buffer, i, 1);
-
-	/* pSS1InfoElement */
-	ASN1_ADD_SIMPLE(comp, (ASN1_APPLICATION | ASN1_TAG_0 ), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	buffer[i++] = (0x04); /*  add BC */
-	buffer[i++] = (0x03);
-	buffer[i++] = (0x80);
-	buffer[i++] = (0x90);
-	buffer[i++] = (0xa3);
-	buffer[i++] = (0x95);
-	buffer[i++] = (0x32);
-	buffer[i++] = (0x01);
-	buffer[i++] = (0x81);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	/* lastReroutingNr [1]*/
-	/* implicit optional lastReroutingNr tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_1), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	/* implicit choice presented number unscreened tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_0), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	/* implicit choice public party number  tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_1), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	/* type of public party number = unknown */
-	ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 0);
-	j = asn1_string_encode(ASN1_NUMERICSTRING, &buffer[i], len - i, 20, original?(char*)original:c->callednum, original?strlen(original):strlen(c->callednum));
-	if (j < 0)
-		return -1;
-
-	i += j;
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	/* subscriptionOption [2]*/
-	/* implicit optional lastReroutingNr tag */
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);	 /* noNotification */
-
-	/* callingNumber [4]*/
-	/* implicit optional callingNumber tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_4), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	/* implicit choice presented number screened tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_0), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-
-	/* implicit choice presentationAllowedAddress tag */
-	ASN1_ADD_SIMPLE(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTOR | ASN1_TAG_1), buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	/* type of public party number = subscriber number */
-	ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 4);
-	j = asn1_string_encode(ASN1_NUMERICSTRING, &buffer[i], len - i, 20, c->callernum, strlen(c->callernum));
-	if (j < 0)
-		return -1;
-
-	i += j;
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	/* Screeening Indicator network provided */
-	ASN1_ADD_BYTECOMP(comp, ASN1_ENUMERATED, buffer, i, 3);
-
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	/**/
-
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
-
-	res = pri_call_apdu_queue(c, Q931_FACILITY, buffer, i, NULL, NULL);
-	if (res) {
-		pri_message(pri, "Could not queue ADPU in facility message\n");
-		return -1;
-	}
-
-	/* Remember that if we queue a facility IE for a facility message we
-	 * have to explicitly send the facility message ourselves */
-
-	res = q931_facility(c->pri, c);
-	if (res) {
-		pri_message(pri, "Could not schedule facility message for call %d\n", c->cr);
-		return -1;
-	}
-
-	return 0;
-}
-/* End QSIG CC-CallRerouting */
-
 static int anfpr_pathreplacement_respond(struct pri *pri, q931_call *call, q931_ie *ie)
 {
 	int res;
@@ -1407,7 +1210,7 @@ static int anfpr_pathreplacement_respond(struct pri *pri, q931_call *call, q931_
 	return 0;
 }
 /* AFN-PR */
-int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
+extern int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2)
 {
 	/* Did all the tests to see if we're on the same PRI and
 	 * are on a compatible switchtype */
@@ -1740,47 +1543,6 @@ static int aoc_aoce_charging_unit_encode(struct pri *pri, q931_call *c, long cha
 }
 /* End AOC */

-static int rose_calling_name_decode(struct pri *pri, q931_call *call, struct rose_component *choice, int len)
-{
-	int i = 0;
-	struct rose_component *comp = NULL;
-	unsigned char *vdata = choice->data;
-	int characterSet = 1;
-	switch (choice->type) {
-		case ROSE_NAME_PRESENTATION_ALLOWED_SIMPLE:
-			memcpy(call->callername, choice->data, choice->len);
-			call->callername[choice->len] = 0;
-			if (pri->debug & PRI_DEBUG_APDU)
-				pri_message(pri, "    Received simple calling name '%s'\n", call->callername);
-			return 0;
-
-		case ROSE_NAME_PRESENTATION_ALLOWED_EXTENDED:
-			do {
-				GET_COMPONENT(comp, i, vdata, len);
-				CHECK_COMPONENT(comp, ASN1_OCTETSTRING, "Don't know what to do if nameData is of type 0x%x\n");
-				memcpy(call->callername, comp->data, comp->len);
-				call->callername[comp->len] = 0;
-				NEXT_COMPONENT(comp, i);
-
-				GET_COMPONENT(comp, i, vdata, len);
-				CHECK_COMPONENT(comp, ASN1_INTEGER, "Don't know what to do if CharacterSet is of type 0x%x\n");
-				ASN1_GET_INTEGER(comp, characterSet);
-			}
-			while (0);
-
-			if (pri->debug & PRI_DEBUG_APDU)
-				pri_message(pri, "    Received extended calling name '%s', characterset %d\n", call->callername, characterSet);
-			return 0;
-		case ROSE_NAME_PRESENTATION_RESTRICTED_SIMPLE:
-		case ROSE_NAME_PRESENTATION_RESTRICTED_EXTENDED:
-		case ROSE_NAME_PRESENTATION_RESTRICTED_NULL:
-		case ROSE_NAME_NOT_AVAIL:
-		default:
-			if (pri->debug & PRI_DEBUG_APDU)
-				pri_message(pri, "Do not handle argument of type 0x%X\n", choice->type);
-			return -1;
-	}
-}
 /* ===== Call Transfer Supplementary Service (ECMA-178) ===== */

 static int rose_party_number_decode(struct pri *pri, q931_call *call, unsigned char *data, int len, struct addressingdataelements_presentednumberunscreened *value)
@@ -2391,12 +2153,6 @@ int rose_return_result_decode(struct pri *pri, q931_call *call, q931_ie *ie, uns
 				pri_message(pri, "Could not parse invoke of type 0x%x!\n", invokeidvalue);
 				return -1;
 			}
-		} else if (pri->switchtype == PRI_SWITCH_QSIG) {
-			switch (invokeidvalue) {
-			case 0x13:
-				if (pri->debug & PRI_DEBUG_APDU) pri_message(pri, "Successfully completed QSIG CF callRerouting!\n");
-				return 0;
-			}
 		} else {
 			pri_message(pri, "Unable to handle return result on switchtype %d!\n", pri->switchtype);
 			return -1;
@@ -2448,7 +2204,19 @@ int rose_invoke_decode(struct pri *pri, q931_call *call, q931_ie *ie, unsigned c
 		case SS_CNID_CALLINGNAME:
 			if (pri->debug & PRI_DEBUG_APDU)
 				pri_message(pri, "  Handle Name display operation\n");
- 			return rose_calling_name_decode(pri, call, comp, len-i);
+			switch (comp->type) {
+				case ROSE_NAME_PRESENTATION_ALLOWED_SIMPLE:
+					memcpy(call->callername, comp->data, comp->len);
+					call->callername[comp->len] = 0;
+					if (pri->debug & PRI_DEBUG_APDU)
+						pri_message(pri, "    Received caller name '%s'\n", call->callername);
+					return 0;
+				default:
+					if (pri->debug & PRI_DEBUG_APDU)
+						pri_message(pri, "Do not handle argument of type 0x%X\n", comp->type);
+					return -1;
+			}
+			break;
 		case ROSE_CALL_TRANSFER_IDENTIFY:
 			if (pri->debug & PRI_DEBUG_APDU)
 				pri_message(pri, "ROSE %i:   CallTransferIdentify - not handled!\n", operation_tag);
@@ -2494,10 +2262,8 @@ int rose_invoke_decode(struct pri *pri, q931_call *call, q931_ie *ie, unsigned c
 			dump_apdu (pri, (u_int8_t *)comp, comp->len + 2);
 			return -1;
 		case ROSE_DIVERTING_LEG_INFORMATION2:
-			if (pri->debug & PRI_DEBUG_APDU) {
- 				pri_message(pri, "ROSE %i:   Handle CallingName\n", operation_tag);
- 				dump_apdu (pri, (u_int8_t *)comp, comp->len + 2);
-  			}
+			if (pri->debug & PRI_DEBUG_APDU)
+				pri_message(pri, "  Handle DivertingLegInformation2\n");
 			return rose_diverting_leg_information2_decode(pri, call, comp, len-i);
 		case ROSE_AOC_NO_CHARGING_INFO_AVAILABLE:
 			if (pri->debug & PRI_DEBUG_APDU) {
--- a/pri_facility.h
+++ b/pri_facility.h
@@ -7,26 +7,6 @@
   Copyright (C) Digium, Inc. 2004-2005
 */

-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
- *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
- */
-
 #ifndef _PRI_FACILITY_H
 #define _PRI_FACILITY_H
 #include "pri_q931.h"
@@ -41,10 +21,7 @@
 /* Argument values */
 #define ROSE_NAME_PRESENTATION_ALLOWED_SIMPLE	0x80
 #define ROSE_NAME_PRESENTATION_RESTRICTED_NULL	0x87
-#define ROSE_NAME_PRESENTATION_ALLOWED_EXTENDED    0xA1
-#define ROSE_NAME_PRESENTATION_RESTRICTED_SIMPLE   0xA2
-#define ROSE_NAME_PRESENTATION_RESTRICTED_EXTENDED 0xA3
-#define ROSE_NAME_NOT_AVAIL			0x84
+#define ROSE_NAME_NOT_AVAIL						0x84

 /* Component types */
 #define COMP_TYPE_INTERPRETATION			0x8B
@@ -309,10 +286,8 @@ 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);

-int qsig_cf_callrerouting(struct pri *pri, q931_call *c, const char* dest, const char* original, const char* reason);
-
 /* starts a QSIG Path Replacement */
-int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);
+extern int anfpr_initiate_transfer(struct pri *pri, q931_call *c1, q931_call *c2);

 /* Use this function to queue a facility-IE born APDU onto a call
 * call is the call to use, messagetype is any one of the Q931 messages,
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -1,30 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
 *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #ifndef _PRI_INTERNAL_H
@@ -66,11 +61,10 @@ struct pri {
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */

+	int bri;
 	int sapi;
 	int tei;
 	int protodisc;
-	unsigned int bri:1;
-	unsigned int acceptinbanddisconnect:1;	/* Should we allow inband progress after DISCONNECT? */
 	
 	/* Q.921 State */
 	int q921_state;	
@@ -90,7 +84,6 @@ struct pri {

 	/* Various timers */
 	int sabme_timer;	/* SABME retransmit */
-	int sabme_count;	/* SABME retransmit counter for BRI */
 	int t203_timer;		/* Max idle time */
 	int t202_timer;
 	int n202_counter;
@@ -114,9 +107,6 @@ struct pri {
 	/* do we do overlap dialing */
 	int overlapdial;

-	/* do not skip channel 16 */
-	int chan_mapping_logical;
-
 #ifdef LIBPRI_COUNTERS
 	/* q921/q931 packet counters */
 	unsigned int q921_txcount;
@@ -282,6 +272,4 @@ void libpri_copy_string(char *dst, const char *src, size_t size);

 struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master, pri_io_cb rd, pri_io_cb wr, void *userdata, int tei, int bri);

-void __pri_free_tei(struct pri *p);
-
 #endif
--- a/pri_q921.h
+++ b/pri_q921.h
@@ -1,30 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
 *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #ifndef _PRI_Q921_H
@@ -168,7 +163,7 @@ typedef struct q921_frame {
 #define Q921_INC(j) (j) = (((j) + 1) % 128)

 typedef enum q921_state {
-	Q921_DOWN = 0,
+	Q921_DOWN,
 	Q921_TEI_UNASSIGNED,
 	Q921_TEI_AWAITING_ESTABLISH,
 	Q921_TEI_AWAITING_ASSIGN,
--- a/pri_q931.h
+++ b/pri_q931.h
@@ -1,30 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
 *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #ifndef _PRI_Q931_H
@@ -256,8 +251,6 @@ 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_progress_with_cause(struct pri *pri, q931_call *call, int channel, int info, int cause);
-
 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);
--- a/pri_timers.h
+++ b/pri_timers.h
@@ -1,30 +1,25 @@
 /*
 * libpri: An implementation of Primary Rate ISDN
 *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
 *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */
 
 #ifndef _PRI_TIMERS_H
--- a/pridump.c
+++ b/pridump.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 /*
--- a/prisched.c
+++ b/prisched.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 #include <stdio.h>
--- a/pritest.c
+++ b/pritest.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 /*
--- a/q921.c
+++ b/q921.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 #include <stdio.h>
@@ -56,9 +51,7 @@
 } while(0)

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

 static void q921_discard_retransmissions(struct pri *pri)
 {
@@ -77,7 +70,7 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
 {
 	int res;

-	if (pri->master)
+	while (pri->master)
 		pri = pri->master;

 #ifdef RANDOM_DROPS
@@ -98,10 +91,11 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
 		pri_error(pri, "Short write: %d/%d (%s)\n", res, len + 2, strerror(errno));
 		return -1;
 	}
+	reschedule_t203(pri);
 	return 0;
 }

-static void q921_send_tei(struct pri *pri, int message, int ri, int ai, int iscommand)
+static void q921_send_tei(struct pri *pri, int message, int ri, int ai, int isreq)
 {
 	q921_u *f;

@@ -109,14 +103,14 @@ static void q921_send_tei(struct pri *pri, int message, int ri, int ai, int isco
 		return;

 	Q921_INIT(pri, *f);
-	f->h.c_r = (pri->localtype == PRI_NETWORK) ? iscommand : !iscommand;
+	f->h.c_r = isreq;
 	f->ft = Q921_FRAMETYPE_U;
 	f->data[0] = 0x0f;	/* Management entity */
 	f->data[1] = (ri >> 8) & 0xff;
 	f->data[2] = ri & 0xff;
 	f->data[3] = message;
 	f->data[4] = (ai << 1) | 1;
-	if (pri->debug & PRI_DEBUG_Q921_STATE)
+//	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message(pri, "Sending TEI management message %d, TEI=%d\n", message, ai);
 	q921_transmit(pri, (q921_h *)f, 8);
 	free(f);
@@ -195,15 +189,6 @@ static void q921_send_sabme(void *vpri, int now)
 		pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
 		return;
 	}
-	if (pri->bri && (pri->state == Q921_AWAITING_ESTABLISH)) {
-		if (pri->sabme_count >= pri->timers[PRI_TIMER_N200]) {
-			pri_schedule_del(pri, pri->sabme_timer);
-			pri->sabme_timer = 0;
-			q921_tei_release_and_reacquire(pri->master);
-		} else {
-			pri->sabme_count++;
-		}
-	}
 	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);
@@ -238,6 +223,21 @@ static int q921_ack_packet(struct pri *pri, int num)
 			pri->retrans = 0;
 			/* Decrement window size */
 			pri->windowlen--;
+			/* Search for something to send */
+			f = pri->txqueue;
+			while(f) {
+				if (!f->transmitted) {
+					/* Send it now... */
+					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;
+				}
+				f = f->next;
+			}
 			return 1;
 		}
 		prev = f;
@@ -250,30 +250,22 @@ static void t203_expire(void *);
 static void t200_expire(void *);
 static pri_event *q921_dchannel_down(struct pri *pri);

-static void reschedule_t200(struct pri *pri)
-{
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
-		pri_message(pri, "-- Restarting T200 timer\n");
-	if (pri->t200_timer)
-		pri_schedule_del(pri, pri->t200_timer);
-	pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
-}
-
 static void reschedule_t203(struct pri *pri)
 {
-	if (pri->debug & PRI_DEBUG_Q921_DUMP)
-		pri_message(pri, "-- Restarting T203 timer\n");
-	if (pri->t203_timer) 
+	if (pri->t203_timer) {
 		pri_schedule_del(pri, pri->t203_timer);
-	pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
+		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, pri->timers[PRI_TIMER_T203], t203_expire, pri);
+	}
 }

-static pri_event *q921_ack_rx(struct pri *pri, int ack, int send_untransmitted_frames)
+static pri_event *q921_ack_rx(struct pri *pri, int ack)
 {
 	int x;
 	int cnt=0;
 	pri_event *ev;
-	struct q921_frame *f;
 	/* Make sure the ACK was within our window */
 	for (x=pri->v_a; (x != pri->v_s) && (x != ack); Q921_INC(x));
 	if (x != ack) {
@@ -293,10 +285,8 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack, int send_untransmitted_f
 		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 */
-		if (pri->t200_timer) {
-			pri_schedule_del(pri, pri->t200_timer);
-			pri->t200_timer = 0;
-		}
+		pri_schedule_del(pri, pri->t200_timer);
+		pri->t200_timer = 0;
 	}
 	if (pri->t203_timer) {
 		if (pri->debug & PRI_DEBUG_Q921_DUMP)
@@ -306,27 +296,10 @@ static pri_event *q921_ack_rx(struct pri *pri, int ack, int send_untransmitted_f
 	}
 	if (pri->txqueue) {
 		/* Something left to transmit, Start the T200 counter again if we stopped it */
-		if (!pri->busy && send_untransmitted_frames) {
-			pri->retrans = 0;
-			/* Search for something to send */
-			f = pri->txqueue;
-			while(f && (pri->windowlen < pri->window)) {
-				if (!f->transmitted) {
-					/* Send it now... */
-					if (pri->debug & PRI_DEBUG_Q921_DUMP)
-						pri_message(pri, "-- Finally transmitting %d, since window opened up (%d)\n", f->h.n_s, pri->windowlen);
-					f->transmitted++;
-					pri->windowlen++;
-					f->h.n_r = pri->v_r;
-					f->h.p_f = 0;
-					q921_transmit(pri, (q921_h *)(&f->h), f->len);
-				}
-				f = f->next;
-			}
-		}
 		if (pri->debug & PRI_DEBUG_Q921_DUMP)
-			pri_message(pri, "-- Waiting for acknowledge, restarting T200 counter\n");		
-		reschedule_t200(pri);
+			pri_message(pri, "-- Something left to transmit (%d), restarting T200 counter\n", pri->txqueue->h.n_s);
+		if (!pri->t200_timer)
+			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 	} else {
 		if (pri->debug & PRI_DEBUG_Q921_DUMP)
 			pri_message(pri, "-- Nothing left, starting T203 counter\n");
@@ -396,62 +369,48 @@ static void q921_rr(struct pri *pri, int pbit, int cmd) {
 static void t200_expire(void *vpri)
 {
 	struct pri *pri = vpri;
-	q921_frame *f, *lastframe=NULL;
-
 	if (pri->txqueue) {
 		/* Retransmit first packet in the queue, setting the poll bit */
 		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 */
+		pri->txqueue->h.n_r = pri->v_r;
+		pri->v_na = pri->v_r;
 		pri->solicitfbit = 1;
-		/* Up to three retransmissions */
-		if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
-			pri->retrans++;
-			/* Reschedule t200_timer */
-			if (pri->debug & PRI_DEBUG_Q921_DUMP)
-				pri_message(pri, "-- Retransmitting %d bytes\n", pri->txqueue->len);
-			if (pri->busy) 
-				q921_rr(pri, 1, 1);
-			else {
-				if (!pri->txqueue->transmitted) 
-					pri_error(pri, "!! Not good - head of queue has not been transmitted yet\n");
-				/*Actually we need to retransmit the last transmitted packet, setting the poll bit */
-				for (f=pri->txqueue; f; f = f->next) {
-					if (f->transmitted)
-						lastframe = f;
-				}
-				if (lastframe) {
-					/* Force Poll bit */
-					lastframe->h.p_f = 1;
-					/* Update nr */
-					lastframe->h.n_r = pri->v_r;
-					pri->v_na = pri->v_r;
-					q921_transmit(pri, (q921_h *)&lastframe->h, lastframe->len);
-				}
-			}
-			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(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;
-			if (pri->bri && pri->master) {
-				q921_tei_release_and_reacquire(pri->master);
-				return;
-			} else {
-				q921_dchannel_down(pri);
-				q921_start(pri, 1);
-				pri->schedev = 1;
-			}
+		pri->retrans++;
+      /* Up to three retransmissions */
+      if (pri->retrans < pri->timers[PRI_TIMER_N200]) {
+         /* Reschedule t200_timer */
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+            pri_message(pri, "-- Retransmitting %d bytes\n", pri->txqueue->len);
+		if (pri->busy) 
+			q921_rr(pri, 1, 1);
+		else {
+			if (!pri->txqueue->transmitted) 
+				pri_error(pri, "!! Not good - head of queue has not been transmitted yet\n");
+			q921_transmit(pri, (q921_h *)&pri->txqueue->h, pri->txqueue->len);
 		}
+         if (pri->debug & PRI_DEBUG_Q921_DUMP)
+               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(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");
+         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->retrans++;
 			pri->solicitfbit = 1;
 			q921_rr(pri, 1, 1);
 			pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
@@ -462,14 +421,9 @@ static void t200_expire(void *vpri)
 				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;
-			if (pri->bri && pri->master) {
-				q921_tei_release_and_reacquire(pri->master);
-				return;
-			} else {
-				q921_dchannel_down(pri);
-				q921_start(pri, 1);
-				pri->schedev = 1;
-			}
+			q921_dchannel_down(pri);
+			q921_start(pri, 1);
+			pri->schedev = 1;
 		}
 	} else {
 		pri_error(pri, "T200 counter expired, nothing to send...\n");
@@ -532,9 +486,14 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 			pri_schedule_del(pri, pri->t203_timer);
 			pri->t203_timer = 0;
 		}
-		if (pri->debug & PRI_DEBUG_Q921_DUMP)
-			pri_message(pri, "Starting T_200 timer\n");
-		reschedule_t200(pri);		
+		if (!pri->t200_timer) {
+			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_DUMP)
+				pri_message(pri, "T_200 timer already going (%d)\n", pri->t200_timer);
+		
 	} else {
 		pri_error(pri, "!! Out of memory for Q.921 transmit\n");
 		return -1;
@@ -560,26 +519,25 @@ static void t203_expire(void *vpri)
 		pri->t203_timer = 0;
 	}
 }
+
 static pri_event *q921_handle_iframe(struct pri *pri, q921_i *i, int len)
 {
 	int res;
 	pri_event *ev;
-
-	pri->solicitfbit = 0;
 	/* Make sure this is a valid packet */
 	if (i->n_s == pri->v_r) {
 		/* Increment next expected I-frame */
 		Q921_INC(pri->v_r);
 		/* Handle their ACK */
 		pri->sentrej = 0;
-		ev = q921_ack_rx(pri, i->n_r, 0);
+		ev = q921_ack_rx(pri, i->n_r);
 		if (ev)
 			return ev;
 		if (i->p_f) {
 			/* If the Poll/Final bit is set, immediate send the RR */
 			q921_rr(pri, 1, 0);
-		} else if (pri->busy || pri->retrans) {
-			q921_rr(pri, 0, 0); 
+		} else if (pri->busy) {
+			q921_rr(pri, 0, 0);
 		}
 		/* Receive Q.931 data */
 		res = q931_receive(pri, (q931_h *)i->data, len - 4);
@@ -643,7 +601,6 @@ void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
    	direction_tag,
 	h->h.tei,
 	h->h.ea2);
-
 	switch (h->h.data[0] & Q921_FRAMETYPE_MASK) {
 	case 0:
 	case 2:
@@ -734,44 +691,6 @@ void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
 	len - 3);
 		break;
 	};
-
-	if ((h->u.ft == 3) && (h->u.m3 == 0) && (h->u.m2 == 0) && (h->u.data[0] == 0x0f)) {
-		int ri;
-		int tei;
-
-		ri = (h->u.data[1] << 8) | h->u.data[2];
-		tei = (h->u.data[4] >> 1);
-		/* TEI assignment related */
-		switch (h->u.data[3]) {
-		case Q921_TEI_IDENTITY_REQUEST:
-			type = "TEI Identity Request";
-			break;
-		case Q921_TEI_IDENTITY_ASSIGNED:
-			type = "TEI Identity Assigned";
-			break;
-		case Q921_TEI_IDENTITY_CHECK_REQUEST:
-			type = "TEI Identity Check Request";
-			break;
-		case Q921_TEI_IDENTITY_REMOVE:
-			type = "TEI Identity Remove";
-			break;
-		case Q921_TEI_IDENTITY_DENIED:
-			type = "TEI Identity Denied";
-			break;
-		case Q921_TEI_IDENTITY_CHECK_RESPONSE:
-			type = "TEI Identity Check Response";
-			break;
-		case Q921_TEI_IDENTITY_VERIFY:
-			type = "TEI Identity Verify";
-			break;
-		default:
-			type = "Unknown";
-			break;
-		}
-		pri_message(pri, "%c MDL Message: %s (%d)\n", direction_tag, type, h->u.data[3]);
-		pri_message(pri, "%c RI: %d\n", direction_tag, ri);
-		pri_message(pri, "%c Ai: %d E:%d\n", direction_tag, (h->u.data[4] >> 1) & 0x7f, h->u.data[4] & 1);
-	}
 }

 static pri_event *q921_dchannel_up(struct pri *pri)
@@ -833,7 +752,6 @@ void q921_reset(struct pri *pri)
 	if (pri->t200_timer)
 		pri_schedule_del(pri, pri->t200_timer);
 	pri->sabme_timer = 0;
-	pri->sabme_count = 0;
 	pri->t203_timer = 0;
 	pri->t200_timer = 0;
 	pri->busy = 0;
@@ -848,24 +766,12 @@ void q921_reset(struct pri *pri)
 	q921_discard_retransmissions(pri);
 }

-static void q921_tei_release_and_reacquire(struct pri *master)
-{
-	/* Make sure the master is passed into this function */
-	q921_dchannel_down(master->subchannel);
-	__pri_free_tei(master->subchannel);
-	master->subchannel = NULL;
-	master->ev.gen.e = PRI_EVENT_DCHAN_DOWN;
-	master->schedev = 1;
-	q921_start(master, master->localtype == PRI_CPE);
-}
-
 static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
 {
 	int ri;
 	struct pri *sub;
 	int tei;
-	if (pri->debug & PRI_DEBUG_Q921_STATE)
-		pri_message(pri, "Received MDL message\n");
+	pri_message(pri, "Received MDL message\n");
 	if (h->data[0] != 0x0f) {
 		pri_error(pri, "Received MDL with unsupported management entity %02x\n", h->data[0]);
 		return NULL;
@@ -880,7 +786,7 @@ static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
 	case Q921_TEI_IDENTITY_REQUEST:
 		if (tei != 127) {
 			pri_error(pri, "Received TEI identity request with invalid TEI %d\n", tei);
-			q921_send_tei(pri, Q921_TEI_IDENTITY_DENIED, ri, tei, 1);
+			q921_send_tei(pri, Q921_TEI_IDENTITY_DENIED, ri, tei, 0);
 		}
 		/* Go to master */
 		for (sub = pri; sub->master; sub = sub->master);
@@ -894,7 +800,7 @@ static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
 			pri_error(pri, "Unable to allocate D-channel for new TEI %d\n", tei);
 			return NULL;
 		}
-		q921_send_tei(pri, Q921_TEI_IDENTITY_ASSIGNED, ri, tei, 1);
+		q921_send_tei(pri, Q921_TEI_IDENTITY_ASSIGNED, ri, tei, 0);
 		break;
 	case Q921_TEI_IDENTITY_ASSIGNED:
 		if (ri != pri->ri) {
@@ -905,12 +811,9 @@ static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
 			pri_schedule_del(pri, pri->t202_timer);
 			pri->t202_timer = 0;
 		}
-		if (pri->subchannel && (pri->subchannel->tei == tei)) {
+		if (pri->subchannel) {
 			pri_error(pri, "TEI already assigned (new is %d, current is %d)\n", tei, pri->subchannel->tei);
-			q921_tei_release_and_reacquire(pri);
-			return NULL;
 		}
-
 		pri_message(pri, "TEI assiged to %d\n", tei);
 		pri->subchannel = __pri_new_tei(-1, pri->localtype, pri->switchtype, pri, NULL, NULL, NULL, tei, 1);
 		if (!pri->subchannel) {
@@ -919,42 +822,10 @@ static pri_event *q921_receive_MDL(struct pri *pri, q921_u *h, int len)
 		}
 		pri->q921_state = Q921_TEI_ASSIGNED;
 		break;
-	case Q921_TEI_IDENTITY_CHECK_REQUEST:
-		/* We're assuming one TEI per PRI in TE PTMP mode */
-
-		/* If no subchannel (TEI) ignore */
-		if (!pri->subchannel)
-			return NULL;
-
-		/* If it's addressed to the group TEI or to our TEI specifically, we respond */
-		if ((tei == Q921_TEI_GROUP) || (tei == pri->subchannel->tei))
-			q921_send_tei(pri, Q921_TEI_IDENTITY_CHECK_RESPONSE, random() % 65535, pri->subchannel->tei, 1);
-
-		break;
-	case Q921_TEI_IDENTITY_REMOVE:
-		/* XXX: Assuming multiframe mode has been disconnected already */
-		if (!pri->subchannel)
-			return NULL;
-
-		if ((tei == Q921_TEI_GROUP) || (tei == pri->subchannel->tei)) {
-			q921_tei_release_and_reacquire(pri);
-		}
 	}
 	return NULL;	/* Do we need to return something??? */
 }

-static int is_command(struct pri *pri, q921_h *h)
-{
-	int	command =0;
-	int c_r = h->s.h.c_r;
-
-	if ((pri->localtype == PRI_NETWORK && c_r == 0) ||
-		(pri->localtype == PRI_CPE && c_r == 1))
-		command = 1;
-
-	return( command );
-}
-
 static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 {
 	q921_frame *f;
@@ -989,98 +860,74 @@ static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 			/* Receiver Ready */
 			pri->busy = 0;
 			/* Acknowledge frames as necessary */
-			ev = q921_ack_rx(pri, h->s.n_r, 1);
+			ev = q921_ack_rx(pri, h->s.n_r);
 			if (ev)
 				return ev;
-			if (is_command(pri, h))
-				pri->solicitfbit = 0;
 			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 (!is_command(pri, h)) {
+				if (pri->solicitfbit) {
 					if (pri->debug & PRI_DEBUG_Q921_DUMP)
 						pri_message(pri, "-- Got RR response to our frame\n");
-					pri->retrans = 0;
 				} else {
 					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;
 			}
 			break;
 		case 1:
 			/* Receiver not ready */
 			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "-- Got receiver not ready\n");
+ 			if(h->s.p_f) {
+ 				/* Send RR if poll bit set */
+ 				q921_rr(pri, h->s.p_f, 0);
+ 			}
 			pri->busy = 1;
-			ev = q921_ack_rx(pri, h->s.n_r, 0);
-			if (ev)
-				return ev;
-			if (h->s.p_f && is_command(pri, h))
-				q921_rr(pri, 1, 0);
-			pri->solicitfbit = 1;
-			pri->retrans = 0;
-			if (pri->t203_timer) {
-				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->debug & PRI_DEBUG_Q921_DUMP)
-				pri_message(pri, "Restarting T_200 timer\n");
-			reschedule_t200(pri);			
 			break;   
 		case 2:
 			/* Just retransmit */
 			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message(pri, "-- Got reject requesting packet %d...  Retransmitting.\n", h->s.n_r);
-			if (pri->busy && !is_command(pri, h))
-				pri->solicitfbit = 0;
-			pri->busy = 0;
-			if (is_command(pri, h) && h->s.p_f)
-					q921_rr(pri, 1, 0);
-			q921_ack_rx(pri, h->s.n_r, 0);
-			/*Resend only if we are in the Multiple Frame Established state or when
-			  we are in the Time Recovery state and received responce with bit F=1*/
-			if ((pri->solicitfbit == 0) || (pri->solicitfbit && !is_command(pri, h) && h->s.p_f)) {
-				pri->solicitfbit = 0;
-				pri->retrans = 0;
-				sendnow = 0;
-				/* Resend I-frames starting from frame where f->h.n_s == h->s.n_r */
-				for (f = pri->txqueue; f && (f->h.n_s != h->s.n_r); f = f->next);
-				while (f) {
-					sendnow = 1;
-					if (f->transmitted || (!f->transmitted && (pri->windowlen < pri->window))) {
-			 			if (pri->debug & PRI_DEBUG_Q921_STATE)
-							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;
-						f->h.p_f = 0;
-						if (!f->transmitted && (pri->windowlen < pri->window))
-							pri->windowlen++;
-						q921_transmit(pri, (q921_h *)(&f->h), f->len);
-					}
-					f = f->next; 
-				} 
-				if (!sendnow) {
-					if (pri->txqueue) {
-						/* This should never happen */
-						if (!h->s.p_f || h->s.n_r) {
-							pri_error(pri, "!! Got reject for frame %d, but we only have others!\n", h->s.n_r);
-						}
-					} else {
-						/* Hrm, we have nothing to send, but have been REJ'd.  Reset v_a, v_s, etc */
-						pri_error(pri, "!! Got reject for frame %d, but we have nothing -- resetting!\n", h->s.n_r);
-						pri->v_a = h->s.n_r;
-						pri->v_s = h->s.n_r;
-					}
-				}
-				/* Reset t200 timer if it was somehow going */
-				if (pri->t200_timer) {
-					pri_schedule_del(pri, pri->t200_timer);
-					pri->t200_timer = 0;
-				}
-				/* Reset and restart t203 timer */
-				reschedule_t203(pri);
-			}
+ 			if (h->s.p_f) {
+ 				/* If it has the poll bit set, send an appropriate supervisory response */
+ 				q921_rr(pri, 1, 0);
+ 			}
+ 			sendnow = 0;
+ 			/* Resend the proper I-frame */
+ 			for(f=pri->txqueue;f;f=f->next) {
+ 				if ((sendnow || (f->h.n_s == h->s.n_r)) && f->transmitted) {
+ 					/* Matches the request, or follows in our window, and has
+ 					   already been transmitted. */
+ 					sendnow = 1;
+ 					pri_error(pri, "!! Got reject for frame %d, retransmitting frame %d now, updating n_r!\n", h->s.n_r, f->h.n_s);
+ 					f->h.n_r = pri->v_r;
+ 					q921_transmit(pri, (q921_h *)(&f->h), f->len);
+ 				}
+ 			}
+ 			if (!sendnow) {
+ 				if (pri->txqueue) {
+ 					/* This should never happen */
+ 					if (!h->s.p_f || h->s.n_r) {
+ 						pri_error(pri, "!! Got reject for frame %d, but we only have others!\n", h->s.n_r);
+ 					}
+ 				} else {
+ 					/* Hrm, we have nothing to send, but have been REJ'd.  Reset v_a, v_s, etc */
+ 					pri_error(pri, "!! Got reject for frame %d, but we have nothing -- resetting!\n", h->s.n_r);
+ 					pri->v_a = h->s.n_r;
+ 					pri->v_s = h->s.n_r;
+ 					/* Reset t200 timer if it was somehow going */
+ 					if (pri->t200_timer) {
+ 						pri_schedule_del(pri, pri->t200_timer);
+ 						pri->t200_timer = 0;
+ 					}
+ 					/* Reset and restart t203 timer */
+ 					if (pri->t203_timer)
+ 						pri_schedule_del(pri, pri->t203_timer);
+ 					pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
+ 				}
+ 			}
 			break;
 		default:
 			pri_error(pri, "!! XXX Unknown Supervisory frame ss=0x%02x,pf=%02xnr=%02x vs=%02x, va=%02x XXX\n", h->s.ss, h->s.p_f, h->s.n_r,
@@ -1166,17 +1013,8 @@ static pri_event *__q921_receive_qualified(struct pri *pri, q921_h *h, int len)
 						pri_message(pri, "-- Got UA from %s peer  Link up.\n", h->h.c_r ? "cpe" : "network");
 					}
 					return q921_dchannel_up(pri);
-				} else if ((pri->q921_state >= Q921_TEI_ASSIGNED) && pri->bri) {
-					/* Possible duplicate TEI assignment */
-					if (pri->master)
-						q921_tei_release_and_reacquire(pri->master);
-					else
-						pri_error(pri, "Huh!? no master found\n");
-				} else {
-					/* Since we're not in the AWAITING_ESTABLISH STATE, it's unsolicited */
+				} else 
 					pri_error(pri, "!! Got a UA, but i'm in state %d\n", pri->q921_state);
-
-				}
 			} else 
 				pri_error(pri, "!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2);
 			break;
@@ -1219,7 +1057,9 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 		/* If it's not us, try any subchannels we have */
 		if (pri->subchannel)
 			return q921_receive(pri->subchannel, h, len + 2);
-		else {
+		else 
+		{
+			pri_error(pri, "Message for SAPI/TEI=%d/%d IS NOT HANDLED\n", h->h.sapi, h->h.tei);
 			return NULL;
 		}

@@ -1257,10 +1097,12 @@ void q921_start(struct pri *pri, int isCPE)
 {
 	q921_reset(pri);
 	if ((pri->sapi == Q921_SAPI_LAYER2_MANAGEMENT) && (pri->tei == Q921_TEI_GROUP)) {
+		pri_message(pri, "Starting in BRI mode\n");
 		pri->q921_state = Q921_DOWN;
 		if (isCPE)
 			q921_tei_request(pri);
 	} else {
+		pri_message(pri, "Starting in PRI mode, isCPE=%d, SAPI/TEI=%d/%d\n", isCPE, pri->sapi, pri->tei);
 		q921_send_sabme(pri, isCPE);
 	}
 }
--- a/q931.c
+++ b/q931.c
@@ -3,28 +3,23 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

 #include "compat.h"
@@ -345,8 +340,6 @@ static FUNC_RECV(receive_channel_id)
 			pos++;
 			/* Only expect a particular channel */
 			call->channelno = ie->data[pos] & 0x7f;
-			if (pri->chan_mapping_logical && call->channelno > 15)
-				call->channelno++;
 			return 0;
 		}
 	} else
@@ -402,10 +395,7 @@ static FUNC_SEND(transmit_channel_id)
 		ie->data[pos++] = 0x83;
 		if (call->channelno > -1) {
 			/* Channel number specified */
-			if (pri->chan_mapping_logical && call->channelno > 16)
-				ie->data[pos++] = 0x80 | (call->channelno - 1);
-			else
-				ie->data[pos++] = 0x80 | call->channelno;
+			ie->data[pos++] = 0x80 | call->channelno;
 			return pos + 2;
 		}
 		/* We have to send a channel map */
@@ -431,7 +421,7 @@ static FUNC_DUMP(dump_channel_id)
 	int x;
 	int res = 0;
 	static const char*	msg_chan_sel[] = {
-		"No channel selected", "B1 channel", "B2 channel","Any channel selected",  
+		"No channel selected", "B1 channel", "B2 channel","Any channel selected" 
 		"No channel selected", "As indicated in following octets", "Reserved","Any channel selected"
 	};

@@ -560,12 +550,12 @@ static char *mode2str(int mode)
 static char *l12str(int proto)
 {
 	static struct msgtype protos[] = {
- 		{ PRI_LAYER_1_ITU_RATE_ADAPT, "V.110 Rate Adaption" },
+		{ PRI_LAYER_1_ITU_RATE_ADAPT, "ITU Rate Adaption" },
 		{ PRI_LAYER_1_ULAW, "u-Law" },
 		{ PRI_LAYER_1_ALAW, "A-Law" },
 		{ PRI_LAYER_1_G721, "G.721 ADPCM" },
 		{ PRI_LAYER_1_G722_G725, "G.722/G.725 7kHz Audio" },
- 		{ PRI_LAYER_1_H223_H245, "H.223/H.245 Multimedia" },
+		{ PRI_LAYER_1_H223_H245, "H.223 and H.245" },	/* Recommendation Q.931(05/98) page 60) */
 		{ PRI_LAYER_1_NON_ITU_ADAPT, "Non-ITU Rate Adaption" },
 		{ PRI_LAYER_1_V120_RATE_ADAPT, "V.120 Rate Adaption" },
 		{ PRI_LAYER_1_X31_RATE_ADAPT, "X.31 Rate Adaption" },
@@ -576,7 +566,7 @@ static char *l12str(int proto)
 static char *ra2str(int proto)
 {
 	static struct msgtype protos[] = {
-		{ PRI_RATE_ADAPT_9K6, "9.6 kbit/s" },
+		{ RATE_ADAPT_56K, "from 56kbps" },
 	};
 	return code2str(proto, protos, sizeof(protos) / sizeof(protos[0]));
 }
@@ -597,143 +587,32 @@ static char *l32str(int proto)
 	return code2str(proto, protos, sizeof(protos) / sizeof(protos[0]));
 }

-static char *int_rate2str(int proto)
-{
-    static struct msgtype protos[] = {
-		{ PRI_INT_RATE_8K, "8 kbit/s" },
-		{ PRI_INT_RATE_16K, "16 kbit/s" },
-		{ PRI_INT_RATE_32K, "32 kbit/s" },
-    };
-    return code2str(proto, protos, sizeof(protos) / sizeof(protos[0]));
-}
-
 static FUNC_DUMP(dump_bearer_capability)
 {
 	int pos=2;
 	pri_message(pri, "%c Bearer Capability (len=%2d) [ Ext: %d  Q.931 Std: %d  Info transfer capability: %s (%d)\n",
 		prefix, len, (ie->data[0] & 0x80 ) >> 7, (ie->data[0] & 0x60) >> 5, cap2str(ie->data[0] & 0x1f), (ie->data[0] & 0x1f));
 	pri_message(pri, "%c                              Ext: %d  Trans mode/rate: %s (%d)\n", prefix, (ie->data[1] & 0x80) >> 7, mode2str(ie->data[1] & 0x7f), ie->data[1] & 0x7f);
-
-	/* octet 4.1 exists iff mode/rate is multirate */
 	if ((ie->data[1] & 0x7f) == 0x18) {
 	    pri_message(pri, "%c                              Ext: %d  Transfer rate multiplier: %d x 64\n", prefix, (ie->data[2] & 0x80) >> 7, ie->data[2] & 0x7f);
 		pos++;
 	}
+	/* Stop here if no more */
+	if (pos >= len - 2)
+		return;

-	/* don't count the IE num and length as part of the data */
-	len -= 2;
-	
-	/* Look for octet 5; this is identified by bits 5,6 == 01 */
-     	if (pos < len &&
-		(ie->data[pos] & 0x60) == 0x20) {
-
-		/* although the layer1 is only the bottom 5 bits of the byte,
-		   previous versions of this library passed bits 5&6 through
-		   too, so we have to do the same for binary compatability */
-		u_int8_t layer1 = ie->data[pos] & 0x7f;
-
-		pri_message(pri, "%c                                User information layer 1: %s (%d)\n",
-		            prefix, l12str(layer1), layer1);
+	if ((ie->data[1] & 0x7f) != TRANS_MODE_PACKET) {
+		/* Look for octets 5 and 5.a if present */
+		pri_message(pri, "%c                              Ext: %d  User information layer 1: %s (%d)\n", prefix, (ie->data[pos] >> 7), l12str(ie->data[pos] & 0x7f), ie->data[pos] & 0x7f);
+		if ((ie->data[pos] & 0x7f) == PRI_LAYER_1_ITU_RATE_ADAPT)
+			pri_message(pri, "%c                                Ext: %d  Rate adaptatation: %s (%d)\n", prefix, ie->data[pos] >> 7, ra2str(ie->data[pos] & 0x7f), ie->data[pos] & 0x7f);
 		pos++;
-		
-		/* octet 5a? */
-		if (pos < len && !(ie->data[pos-1] & 0x80)) {
-			int ra = ie->data[pos] & 0x7f;
-
-			pri_message(pri, "%c                                Async: %d, Negotiation: %d, "
-				"User rate: %s (%#x)\n", 
-				prefix,
-				ra & PRI_RATE_ADAPT_ASYNC ? 1 : 0,
-				ra & PRI_RATE_ADAPT_NEGOTIATION_POSS ? 1 : 0,
-				ra2str(ra & PRI_RATE_USER_RATE_MASK),
-				ra & PRI_RATE_USER_RATE_MASK);
-			pos++;
-		}
-		
-		/* octet 5b? */
-		if (pos < len && !(ie->data[pos-1] & 0x80)) {
-			u_int8_t data = ie->data[pos];
-			if (layer1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
-				pri_message(pri, "%c                                Intermediate rate: %s (%d), "
-					"NIC on Tx: %d, NIC on Rx: %d, "
-					"Flow control on Tx: %d, "
-					"Flow control on Rx: %d\n",
-					prefix, int_rate2str((data & 0x60)>>5),
-					(data & 0x60)>>5,
-					(data & 0x10)?1:0,
-					(data & 0x08)?1:0,
-					(data & 0x04)?1:0,
-					(data & 0x02)?1:0);
-			} else if (layer1 == PRI_LAYER_1_V120_RATE_ADAPT) {
-				pri_message(pri, "%c                                Hdr: %d, Multiframe: %d, Mode: %d, "
-					"LLI negot: %d, Assignor: %d, "
-					"In-band neg: %d\n", prefix,
-					(data & 0x40)?1:0,
-					(data & 0x20)?1:0,
-					(data & 0x10)?1:0,
-					(data & 0x08)?1:0,
-					(data & 0x04)?1:0,
-					(data & 0x02)?1:0);
-			} else {
-				pri_message(pri, "%c                                Unknown octet 5b: 0x%x\n", data );
-			}
-			pos++;
-		}
-
-		/* octet 5c? */
-		if (pos < len && !(ie->data[pos-1] & 0x80)) {
-			u_int8_t data = ie->data[pos];
-			const char *stop_bits[] = {"?","1","1.5","2"};
-			const char *data_bits[] = {"?","5","7","8"};
-			const char *parity[] = {"Odd","?","Even","None",
-				       "zero","one","?","?"};
-	
-			pri_message(pri, "%c                                Stop bits: %s, data bits: %s, "
-			    "parity: %s\n", prefix,
-			    stop_bits[(data & 0x60) >> 5],
-			    data_bits[(data & 0x18) >> 3],
-			    parity[(data & 0x7)]);
-	
-			pos++;
-		}
-	
-			/* octet 5d? */
-		if (pos < len && !(ie->data[pos-1] & 0x80)) {
-			u_int8_t data = ie->data[pos];
-			pri_message(pri, "%c                                Duplex mode: %d, modem type: %d\n",
-				prefix, (data & 0x40) ? 1 : 0,data & 0x3F);
- 			pos++;
-		}
- 	}
-
-
-	/* Look for octet 6; this is identified by bits 5,6 == 10 */
-	if (pos < len && 
-		(ie->data[pos] & 0x60) == 0x40) {
-		pri_message(pri, "%c                                User information layer 2: %s (%d)\n",
-			prefix, l22str(ie->data[pos] & 0x1f),
-			ie->data[pos] & 0x1f);
+	} else {
+		/* Look for octets 6 and 7 but not 5 and 5.a */
+		pri_message(pri, "%c                              Ext: %d  User information layer 2: %s (%d)\n", prefix, ie->data[pos] >> 7, l22str(ie->data[pos] & 0x7f), ie->data[pos] & 0x7f);
 		pos++;
-	}
-
-	/* Look for octet 7; this is identified by bits 5,6 == 11 */
-	if (pos < len && (ie->data[pos] & 0x60) == 0x60) {
-		pri_message(pri, "%c                                User information layer 3: %s (%d)\n",
-			prefix, l32str(ie->data[pos] & 0x1f),
-			ie->data[pos] & 0x1f);
+		pri_message(pri, "%c                              Ext: %d  User information layer 3: %s (%d)\n", prefix, ie->data[pos] >> 7, l32str(ie->data[pos] & 0x7f), ie->data[pos] & 0x7f);
 		pos++;
-
-		/* octets 7a and 7b? */
-		if (pos + 1 < len && !(ie->data[pos-1] & 0x80) &&
-			!(ie->data[pos] & 0x80)) {
-			unsigned int proto;
-			proto = ((ie->data[pos] & 0xF) << 4 ) | 
-			         (ie->data[pos+1] & 0xF);
-
-			pri_message(pri, "%c                                Network layer: 0x%x\n", prefix,
-			            proto );
-			pos += 2;
-		}
 	}
 }

@@ -746,44 +625,22 @@ static FUNC_RECV(receive_bearer_capability)
 	}
 	call->transcapability = ie->data[0] & 0x1f;
 	call->transmoderate = ie->data[1] & 0x7f;
-   
-	/* octet 4.1 exists iff mode/rate is multirate */
-	if (call->transmoderate == TRANS_MODE_MULTIRATE) {
-		call->transmultiple = ie->data[pos++] & 0x7f;
-	}
+	if (call->transmoderate == PRI_TRANS_CAP_AUDIO_4ESS)
+		call->transmoderate = PRI_TRANS_CAP_3_1K_AUDIO;

-	/* Look for octet 5; this is identified by bits 5,6 == 01 */
-	if (pos < len && 
-	     (ie->data[pos] & 0x60) == 0x20 ) {
-		/* although the layer1 is only the bottom 5 bits of the byte,
-		   previous versions of this library passed bits 5&6 through
-		   too, so we have to do the same for binary compatability */
+	if (pos >= len - 2)
+		return 0;
+
+	if (call->transmoderate != TRANS_MODE_PACKET) {
 		call->userl1 = ie->data[pos] & 0x7f;
-		pos++;
-		
-		/* octet 5a? */
-		if (pos < len && !(ie->data[pos-1] & 0x80)) {
-			call->rateadaption = ie->data[pos] & 0x7f;
-			pos++;
- 		}
-		
-		/* octets 5b through 5d? */
-		while (pos < len && !(ie->data[pos-1] & 0x80)) {
-			pos++;
+		if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
+			call->rateadaption = ie->data[++pos] & 0x7f;
 		}
-		
-	}
-
-	/* Look for octet 6; this is identified by bits 5,6 == 10 */
-     	if (pos < len && 
-             (ie->data[pos] & 0x60) == 0x40) {
-		call->userl2 = ie->data[pos++] & 0x1f;
-	}
-
-	/* Look for octet 7; this is identified by bits 5,6 == 11 */
-     	if (pos < len && 
-             (ie->data[pos] & 0x60) == 0x60) {
-		call->userl3 = ie->data[pos++] & 0x1f;
+		pos++;
+	} else {
+		/* Get 6 and 7 */
+		call->userl2 = ie->data[pos++] & 0x7f;
+		call->userl3 = ie->data[pos] & 0x7f;
 	}
 	return 0;
 }
@@ -791,7 +648,6 @@ static FUNC_RECV(receive_bearer_capability)
 static FUNC_SEND(transmit_bearer_capability)
 {
 	int tc;
-	int pos;

 	/* We are ready to transmit single IE only */	
 	if(order > 1)
@@ -811,46 +667,34 @@ static FUNC_SEND(transmit_bearer_capability)
 		return 4;
 	}
 	
+	if (pri->switchtype == PRI_SWITCH_ATT4ESS) {
+		/* 4ESS uses a different trans capability for 3.1khz audio */
+		if (tc == PRI_TRANS_CAP_3_1K_AUDIO)
+			tc = PRI_TRANS_CAP_AUDIO_4ESS;
+	}
 	ie->data[0] = 0x80 | tc;
 	ie->data[1] = call->transmoderate | 0x80;
-
- 	pos = 2;
- 	/* octet 4.1 exists iff mode/rate is multirate */
- 	if (call->transmoderate == TRANS_MODE_MULTIRATE ) {
- 		ie->data[pos++] = call->transmultiple | 0x80;
-	}
-
-	if ((tc & PRI_TRANS_CAP_DIGITAL) && (pri->switchtype == PRI_SWITCH_EUROISDN_E1) &&
-		(call->transmoderate == TRANS_MODE_PACKET)) {
+	if ( (tc & PRI_TRANS_CAP_DIGITAL) && (pri->switchtype == PRI_SWITCH_EUROISDN_E1) &&
+		(call->transmoderate == TRANS_MODE_PACKET) ) {
 		/* Apparently EuroISDN switches don't seem to like user layer 2/3 */
 		return 4;
 	}
 	if (call->transmoderate != TRANS_MODE_PACKET) {
 		/* If you have an AT&T 4ESS, you don't send any more info */
 		if ((pri->switchtype != PRI_SWITCH_ATT4ESS) && (call->userl1 > -1)) {
-			ie->data[pos++] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
+			ie->data[2] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
 			if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
-				ie->data[pos++] = call->rateadaption | 0x80;
+				ie->data[3] = call->rateadaption | 0x80;
+				return 6;
 			}
-			return pos + 2;
- 		}
- 
- 		ie->data[pos++] = 0xa0 | (call->userl1 & 0x1f);
- 
- 		if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
- 		    ie->data[pos-1] &= ~0x80; /* clear EXT bit in octet 5 */
- 		    ie->data[pos++] = call->rateadaption | 0x80;
- 		}
- 	}
- 	
- 	
- 	if (call->userl2 != -1)
- 		ie->data[pos++] = 0xc0 | (call->userl2 & 0x1f);
- 
- 	if (call->userl3 != -1)
- 		ie->data[pos++] = 0xe0 | (call->userl3 & 0x1f);
- 
- 	return pos + 2;
+			return 5;
+		} else
+			return 4;
+	} else {
+		ie->data[2] = 0x80 | call->userl2;
+		ie->data[3] = 0x80 | call->userl3;
+		return 6;
+	}
 }

 char *pri_plan2str(int plan)
@@ -2336,10 +2180,7 @@ static q931_call *q931_getcall(struct pri *pri, int cr, int outboundnew)
 	struct pri *master;

 	/* Find the master  - He has the call pool */
-	if (pri->master)
-		master = pri->master;
-	else
-		master = pri;
+	for (master = pri; master->master; master = master->master);
 	
 	cur = *master->callpool;
 	prev = NULL;
@@ -2736,8 +2577,6 @@ int q931_notify(struct pri *pri, q931_call *c, int channel, int info)
 #ifdef ALERTING_NO_PROGRESS
 static int call_progress_ies[] = { -1 };
 #else
-static int call_progress_with_cause_ies[] = { Q931_PROGRESS_INDICATOR, Q931_CAUSE, -1 };
-
 static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
 #endif

@@ -2749,7 +2588,6 @@ int q931_call_progress(struct pri *pri, q931_call *c, int channel, int info)
 		channel &= 0xff;
 		c->channelno = channel;		
 	}
-
 	if (info) {
 		c->progloc = LOC_PRIV_NET_LOCAL_USER;
 		c->progcode = CODE_CCITT;
@@ -2759,38 +2597,10 @@ int q931_call_progress(struct pri *pri, q931_call *c, int channel, int info)
 		pri_error(pri, "XXX Progress message requested but no information is provided\n");
 		c->progressmask = 0;
 	}
-
 	c->alive = 1;
 	return send_message(pri, c, Q931_PROGRESS, call_progress_ies);
 }

-int q931_call_progress_with_cause(struct pri *pri, q931_call *c, int channel, int info, int cause)
-{
-	if (channel) { 
-		c->ds1no = (channel & 0xff00) >> 8;
-		c->ds1explicit = (channel & 0x10000) >> 16;
-		channel &= 0xff;
-		c->channelno = channel;		
-	}
-
-	if (info) {
-		c->progloc = LOC_PRIV_NET_LOCAL_USER;
-		c->progcode = CODE_CCITT;
-		c->progressmask = PRI_PROG_INBAND_AVAILABLE;
-	} else {
-		/* PI is mandatory IE for PROGRESS message - Q.931 3.1.8 */
-		pri_error(pri, "XXX Progress message requested but no information is provided\n");
-		c->progressmask = 0;
-	}
-
-	c->cause = cause;
-	c->causecode = CODE_CCITT;
-	c->causeloc = LOC_PRIV_NET_LOCAL_USER;
-
-	c->alive = 1;
-	return send_message(pri, c, Q931_PROGRESS, call_progress_with_cause_ies);
-}
-
 #ifdef ALERTING_NO_PROGRESS
 static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, -1 };
 #else
@@ -2985,7 +2795,7 @@ static int restart_ies[] = { Q931_CHANNEL_IDENT, Q931_RESTART_INDICATOR, -1 };
 int q931_restart(struct pri *pri, int channel)
 {
 	struct q931_call *c;
-	c = q931_getcall(pri, 0 | 0x8000, 1);
+	c = q931_getcall(pri, 0 | 0x8000, 0);
 	if (!c)
 		return -1;
 	if (!channel)
@@ -3040,8 +2850,6 @@ int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req)
 	if (!req->userl1)
 		req->userl1 = PRI_LAYER_1_ULAW;
 	c->userl1 = req->userl1;
-	c->userl2 = -1;
-	c->userl3 = -1;
 	c->ds1no = (req->channel & 0xff00) >> 8;
 	c->ds1explicit = (req->channel & 0x10000) >> 16;
 	req->channel &= 0xff;
@@ -3722,15 +3530,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		    (c->cause != PRI_CAUSE_INTERWORKING)) 
 			pri_error(pri, "Received unsolicited status: %s\n", pri_cause2str(c->cause));
 		/* Workaround for S-12 ver 7.3 - it responds for invalid/non-implemented IEs at SETUP with null call state */
-#if 0
 		if (!c->sugcallstate && (c->ourcallstate != Q931_CALL_STATE_CALL_INITIATED)) {
-#else
-		/* Remove "workaround" since it breaks certification testing.  If we receive a STATUS message of call state
-		 * NULL and we are not in the call state NULL we must clear resources and return to the call state to pass
-		 * testing.  See section 5.8.11 of Q.931 */
-
-		if (!c->sugcallstate) {
-#endif
 			pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
 			pri->ev.hangup.cause = c->cause;
 			pri->ev.hangup.cref = c->cr;
@@ -3820,12 +3620,6 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		UPDATE_OURCALLSTATE(pri, c, Q931_CALL_STATE_DISCONNECT_INDICATION);
 		c->peercallstate = Q931_CALL_STATE_DISCONNECT_REQUEST;
 		c->sendhangupack = 1;
-
-		/* wait for a RELEASE so that sufficient time has passed
-		   for the inband audio to be heard */
-		if (pri->acceptinbanddisconnect && (c->progressmask & PRI_PROG_INBAND_AVAILABLE))
-			break;
-
 		/* Return such an event */
 		pri->ev.e = PRI_EVENT_HANGUP_REQ;
 		pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
--- a/testprilib.c
+++ b/testprilib.c
@@ -3,31 +3,25 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
 * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
 *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
 *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
 */

-
 /*
 * This program tests libpri call reception using a zaptel interface.
 * Its state machines are setup for RECEIVING CALLS ONLY, so if you
Author	SHA1	Message	Date
Russell Bryant	92fc823114	Importing files for 1.6.0-beta1 release git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.6.0-beta1@520 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2008-01-19 00:45:19 +00:00
Russell Bryant	0671ab6798	Creating tag for the release of libpri-1.6.0-beta1 git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.6.0-beta1@519 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2008-01-19 00:43:47 +00:00
Jason Parker	682b914cd7	Add logging for 'make update' command (also fixes updates in some places). Issue #11766 , initial patch by jmls. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@518 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2008-01-16 18:06:29 +00:00
Matthew Fredrickson	1de0fae287	Merged revisions 514 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r514 \| mattf \| 2008-01-11 10:34:44 -0600 (Fri, 11 Jan 2008) \| 9 lines Merged revisions 513 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r513 \| mattf \| 2008-01-11 10:33:52 -0600 (Fri, 11 Jan 2008) \| 1 line We should not be parsing further into the bearer capability IE if the length does not confirm that there actually is data present ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@515 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2008-01-11 16:36:10 +00:00
Russell Bryant	a80635e804	Remove unnecessary usage of the extern keyword. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@505 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-26 17:35:41 +00:00
Russell Bryant	b288766b85	Change malloc+memset to calloc. Also, handle allocation failures early to reduce indentation. (closes issue #11469) Reported by: eliel Patches: pri.c.patch uploaded by eliel (license 64) q931.c.patch uploaded by eliel (license 64) q921.c.patch uploaded by eliel (license 64) pri_facility.c.patch uploaded by eliel (license 64) git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@496 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-06 22:16:32 +00:00
Russell Bryant	1ee4f8aa3f	Change a use of malloc+memset to calloc. Also, reduce indentation of a function by doing the check for memory allocation failure at the beginning. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@495 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-06 03:48:07 +00:00
Russell Bryant	414fe8f956	Change the table used to hold the default timers to be global and const, instead of allocating it on the stack each time the function is called. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@494 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-06 03:44:59 +00:00
Matthew Fredrickson	79bb2373f9	Improve the parameter name to better reflect its use git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@493 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-05 00:20:13 +00:00
Matthew Fredrickson	dd553ed543	More PTMP fixes. Stand by, more changes to come git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@492 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-05 00:12:54 +00:00
Matthew Fredrickson	813b2d1176	More magic to make BRI CPE PTMP work git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@491 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-12-04 18:01:51 +00:00
Matthew Fredrickson	581287c8dc	Make sure we loop BRI call references for one byte CREFs instead of two git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@487 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-11-21 22:30:09 +00:00
Matthew Fredrickson	3071a4da29	Add BRI support to libpri git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@486 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-11-21 21:49:30 +00:00
Kevin P. Fleming	9857425714	Merged revisions 479 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r479 \| kpfleming \| 2007-10-22 10:10:06 -0500 (Mon, 22 Oct 2007) \| 11 lines Merged revisions 478 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r478 \| kpfleming \| 2007-10-22 10:09:27 -0500 (Mon, 22 Oct 2007) \| 3 lines we need to include stddef.h for 'size_t' ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@480 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-10-22 15:15:31 +00:00
Matthew Fredrickson	ad076ee67b	Make sure that we only output the message handling debug when we're actually debugging git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@473 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-10-13 16:00:09 +00:00
Jason Parker	8bb0942f1a	Merged revisions 470 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue #10832) ........ r470 \| qwell \| 2007-10-05 11:45:39 -0500 (Fri, 05 Oct 2007) \| 4 lines Fix an incorrect pri_event structure definition. Issue 10832, patch by flefoll ........ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@471 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-10-05 16:46:18 +00:00
Matthew Fredrickson	9e05c336b1	Fix user-user IE order in setup message (#10705 ) git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@469 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-09-25 21:56:47 +00:00
Matthew Fredrickson	b4970d79e9	Merged revisions 465 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r465 \| mattf \| 2007-09-14 16:32:54 -0500 (Fri, 14 Sep 2007) \| 1 line Fix for #10189. Make sure we properly report the user layer 1 for H.223 and H.245 ........ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@466 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-09-14 21:34:11 +00:00
Matthew Fredrickson	dc7a314fb3	Merged revisions 462 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r462 \| mattf \| 2007-09-06 10:11:29 -0500 (Thu, 06 Sep 2007) \| 9 lines Merged revisions 460 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r460 \| mattf \| 2007-09-06 10:06:42 -0500 (Thu, 06 Sep 2007) \| 1 line TBCT now works. It should work for NI2, 4E, and 5E. This code was tested on NI2. ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@463 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-09-06 15:15:50 +00:00
Jason Parker	68b9ad1084	Merged revisions 446 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r446 \| qwell \| 2007-08-27 14:21:08 -0500 (Mon, 27 Aug 2007) \| 10 lines Merged revisions 445 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r445 \| qwell \| 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) \| 2 lines Make sure we build both the static and shared modules with -fPIC. ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@447 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-08-27 19:22:03 +00:00
Jason Parker	f611084923	Merged revisions 441 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 (closes issue #10253) ........ r441 \| qwell \| 2007-08-06 14:58:19 -0500 (Mon, 06 Aug 2007) \| 4 lines Allow setting CC to something with a space, such as `make CC="gcc -m32"` Issue 10253. ........ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@442 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-08-06 19:58:56 +00:00
Matthew Fredrickson	a19cc73b41	Revert that back to how it was git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@430 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-20 15:18:34 +00:00
Matthew Fredrickson	cbda0d7376	Patch to add PTMP mode (BRI support) git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@429 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-19 20:31:54 +00:00
Matthew Fredrickson	453e006faa	Merged revisions 427 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r427 \| mattf \| 2007-06-19 13:23:36 -0500 (Tue, 19 Jun 2007) \| 9 lines Merged revisions 426 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r426 \| mattf \| 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) \| 1 line Try to send pending facility messages if we receive alerting (for when we don't get proceeding) (#9651) ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@428 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-19 18:24:20 +00:00
Matthew Fredrickson	3fba8aa932	Merged revisions 424 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r424 \| mattf \| 2007-06-06 16:58:22 -0500 (Wed, 06 Jun 2007) \| 9 lines Merged revisions 423 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r423 \| mattf \| 2007-06-06 16:57:15 -0500 (Wed, 06 Jun 2007) \| 1 line Oops, that should not be on one line ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@425 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-06 21:59:19 +00:00
Matthew Fredrickson	bcd84a9d79	Preliminary patch plus mods for Q.SIG Path Replacement (Q.SIG version of 2BCT) #7778 git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@422 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-06 21:47:36 +00:00
Matthew Fredrickson	f5d76bd5d2	Merged revisions 416 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r416 \| mattf \| 2007-06-06 08:22:15 -0500 (Wed, 06 Jun 2007) \| 10 lines Merged revisions 415 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r415 \| mattf \| 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) \| 2 lines Make sure we only send the NFE when we are talking QSIG ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@417 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-06-06 13:23:29 +00:00
Matthew Fredrickson	0a62b72633	Commit path for ROSE-12 and ROSE-13 support (#9076 ) git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@413 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-05-25 17:36:28 +00:00
Matthew Fredrickson	ec3b7c156e	Merged revisions 390 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r390 \| mattf \| 2007-01-22 16:29:24 -0600 (Mon, 22 Jan 2007) \| 10 lines Merged revisions 389 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r389 \| mattf \| 2007-01-22 16:20:59 -0600 (Mon, 22 Jan 2007) \| 2 lines Make sure we send DISCONNECT if we reached the active state and a call is disconnected, regardless of cause code. ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@393 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-01-23 22:02:44 +00:00
Matthew Fredrickson	bcee9e2fd6	Fix mess up in up-port git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@392 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-01-23 22:01:28 +00:00
Matthew Fredrickson	054a30cd94	Merged revisions 389 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ........ ........ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@391 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2007-01-22 22:31:13 +00:00
Joshua Colp	fd22b45abb	Merged revisions 386 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.4 ................ r386 \| file \| 2006-12-30 14:17:34 -0500 (Sat, 30 Dec 2006) \| 10 lines Merged revisions 385 via svnmerge from https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r385 \| file \| 2006-12-30 14:16:17 -0500 (Sat, 30 Dec 2006) \| 2 lines Specify full path to restorecon instead of assuming it will be available from what is in $PATH. (issue #8670 reported by djflux) ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@387 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2006-12-30 19:18:43 +00:00
Matthew Fredrickson	9a0d8c4df9	Remove pointless recursion. (#8281 ) git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@382 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2006-11-03 18:16:49 +00:00
Kevin P. Fleming	c7f3a4b899	set up merge tracking from 1.4 branch git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@374 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2006-09-20 21:00:58 +00:00