Importing release summary for 1.4.12-beta3 release.

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.12-beta3@2130 2fbb986a-6c06-0410-b554-c9c1f0a7f128
Importing files for 1.4.12-beta3 release.
2010-11-17 20:53:53 +00:00 · 2010-11-17 20:53:51 +00:00 · 2010-11-17 20:53:19 +00:00 · 2010-11-12 02:31:24 +00:00 · 2010-11-11 00:30:33 +00:00 · 2010-11-10 23:47:45 +00:00
23 changed files with 5613 additions and 1732 deletions
--- a/.version
+++ b/.version
@@ -0,0 +1 @@
+1.4.12-beta3
--- a/1656
+++ b/1656
--- a/24
+++ b/24
@@ -93,12 +93,20 @@ DYNAMIC_OBJS= \
 	rose_qsig_mwi.lo \
 	rose_qsig_name.lo \
 	version.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 libdir?=$(INSTALL_BASE)/lib
-SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
-LDCONFIG = /sbin/ldconfig
+ifneq ($(findstring Darwin,$(OSARCH)),)
+  SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+    SOFLAGS+=/usr/lib/bundle1.o
+  endif
+  LDCONFIG=/usr/bin/true
+else
+  SOFLAGS=-shared -Wl,-h$(DYNAMIC_LIBRARY) $(COVERAGE_LDFLAGS)
+  LDCONFIG = /sbin/ldconfig
+endif
 ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX XGNUX))
 LDCONFIG_FLAGS=-n
 else
@@ -126,7 +134,13 @@ ifeq ($(PROC),sparc64)
 PROC=ultrasparc
 LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
 else
-LIBPRI_OPT = -O2
+  ifneq ($(CODE_COVERAGE),)
+    LIBPRI_OPT=
+    COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+    COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+  else
+    LIBPRI_OPT=-O2
+  endif
 endif

 ifeq ($(CPUARCH),i686)
@@ -205,7 +219,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ranlib $(STATIC_LIBRARY)

 $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
-	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
+	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
 	ln -sf libpri.so.$(SONAME) libpri.so

--- a/doc/cc_ptmp_agent.fsm
+++ b/doc/cc_ptmp_agent.fsm
@@ -25,7 +25,13 @@ FSM CC_PTMP_Agent
 			Action Send_CC_Available(Q931_DISCONNECT);
 			Next_State CC_STATE_AVAILABLE;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Release_LinkID;
+			Action Pass_Up_CC_Cancel;
+			Next_State CC_STATE_IDLE;
+		}
 		Stimulus CC_EVENT_CANCEL {
+			Action Release_LinkID;
 			Next_State CC_STATE_IDLE;
 		}
 	}
@@ -45,22 +51,26 @@ FSM CC_PTMP_Agent
 			Action Pass_Up_CC_Request;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			Action Pass_Up_CC_Cancel;
 			Next_State CC_STATE_IDLE;
 		}
 		Stimulus CC_EVENT_CANCEL {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			Next_State CC_STATE_IDLE;
 		}
 	}
 	State CC_STATE_REQUESTED {
 		Epilog {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 		}
 		Stimulus CC_EVENT_CC_REQUEST_ACCEPT {
 			Next_State CC_STATE_ACTIVATED;
--- a/doc/cc_ptmp_agent_flattened.fsm
+++ b/doc/cc_ptmp_agent_flattened.fsm
@@ -20,7 +20,14 @@ FSM CC_PTMP_Agent
 			Action Send_CC_Available(Q931_DISCONNECT);
 			Next_State CC_STATE_AVAILABLE;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Release_LinkID;
+			Action Pass_Up_CC_Cancel;
+			Action Set_Selfdestruct;
+			Next_State CC_STATE_IDLE;
+		}
 		Stimulus CC_EVENT_CANCEL {
+			Action Release_LinkID;
 			Action Set_Selfdestruct;
 			Next_State CC_STATE_IDLE;
 		}
@@ -39,9 +46,13 @@ FSM CC_PTMP_Agent
 			Action Stop_T_RETENTION;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			Action Pass_Up_CC_Cancel;
 			Action Stop_T_RETENTION;
 			Action Set_Selfdestruct;
@@ -49,7 +60,7 @@ FSM CC_PTMP_Agent
 		}
 		Stimulus CC_EVENT_CANCEL {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			Action Stop_T_RETENTION;
 			Action Set_Selfdestruct;
 			Next_State CC_STATE_IDLE;
@@ -58,7 +69,7 @@ FSM CC_PTMP_Agent
 	State CC_STATE_REQUESTED {
 		Stimulus CC_EVENT_CC_REQUEST_ACCEPT {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			/* Start T_CCBS2 or T_CCNR2 depending upon CC mode. */
 			Action Start_T_SUPERVISION;
 			Action Reset_A_Status;
@@ -67,7 +78,7 @@ FSM CC_PTMP_Agent
 		}
 		Stimulus CC_EVENT_CANCEL {
 			Action Send_EraseCallLinkageID;
-			Action Relese_LinkID;
+			Action Release_LinkID;
 			Action Set_Selfdestruct;
 			Next_State CC_STATE_IDLE;
 		}
--- a/doc/cc_ptp_agent.fsm
+++ b/doc/cc_ptp_agent.fsm
@@ -25,6 +25,10 @@ FSM CC_PTP_Agent
 			Action Send_CC_Available(Q931_DISCONNECT);
 			Next_State CC_STATE_AVAILABLE;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Pass_Up_CC_Cancel;
+			Next_State CC_STATE_IDLE;
+		}
 		Stimulus CC_EVENT_CANCEL {
 			Next_State CC_STATE_IDLE;
 		}
@@ -53,6 +57,10 @@ FSM CC_PTP_Agent
 			Action Stop_T_RETENTION;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Pass_Up_CC_Cancel;
 			Next_State CC_STATE_IDLE;
--- a/doc/cc_ptp_agent_flattened.fsm
+++ b/doc/cc_ptp_agent_flattened.fsm
@@ -20,6 +20,11 @@ FSM CC_PTP_Agent
 			Action Send_CC_Available(Q931_DISCONNECT);
 			Next_State CC_STATE_AVAILABLE;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Pass_Up_CC_Cancel;
+			Action Set_Selfdestruct;
+			Next_State CC_STATE_IDLE;
+		}
 		Stimulus CC_EVENT_CANCEL {
 			Action Set_Selfdestruct;
 			Next_State CC_STATE_IDLE;
@@ -46,6 +51,10 @@ FSM CC_PTP_Agent
 			Action Stop_T_RETENTION;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Pass_Up_CC_Cancel;
 			Action Stop_T_RETENTION;
--- a/doc/cc_qsig_agent.fsm
+++ b/doc/cc_qsig_agent.fsm
@@ -41,6 +41,10 @@ FSM CC_QSIG_Agent
 			Action Send_Call_Proceeding;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Pass_Up_CC_Cancel;
 			Next_State CC_STATE_IDLE;
--- a/doc/cc_qsig_agent_flattened.fsm
+++ b/doc/cc_qsig_agent_flattened.fsm
@@ -34,6 +34,10 @@ FSM CC_QSIG_Agent
 			Action Stop_T_RETENTION;
 			Next_State CC_STATE_REQUESTED;
 		}
+		Stimulus CC_EVENT_INTERNAL_CLEARING {
+			Action Stop_T_RETENTION;
+			Action Start_T_RETENTION;
+		}
 		Stimulus CC_EVENT_TIMEOUT_T_RETENTION {
 			Action Pass_Up_CC_Cancel;
 			Action Stop_T_RETENTION;
--- a/libpri-1.4.12-beta3-summary.html
+++ b/libpri-1.4.12-beta3-summary.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - libpri-1.4.12-beta3</title></head>
+<body>
+<h1 align="center"><a name="top">Release Summary</a></h1>
+<h3 align="center">libpri-1.4.12-beta3</h3>
+<h3 align="center">Date: 2010-11-17</h3>
+<h3 align="center">&lt;asteriskteam@digium.com&gt;</h3>
+<hr/>
+<h2 align="center">Table of Contents</h2>
+<ol>
+   <li><a href="#summary">Summary</a></li>
+   <li><a href="#contributors">Contributors</a></li>
+   <li><a href="#issues">Closed Issues</a></li>
+   <li><a href="#commits">Other Changes</a></li>
+   <li><a href="#diffstat">Diffstat</a></li>
+</ol>
+<hr/>
+<a name="summary"><h2 align="center">Summary</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes.  The changes included were made only to address problems that have been identified in this release series.  Users should be able to safely upgrade to this version if this release series is already in use.  Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
+<p>The data in this summary reflects changes that have been made since the previous release, libpri-1.4.12-beta2.</p>
+<hr/>
+<a name="contributors"><h2 align="center">Contributors</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release.  For coders, the number is how many of their patches (of any size) were committed into this release.  For testers, the number is the number of times their name was listed as assisting with testing a patch.  Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
+<table width="100%" border="0">
+<tr>
+<td width="33%"><h3>Coders</h3></td>
+<td width="33%"><h3>Testers</h3></td>
+<td width="33%"><h3>Reporters</h3></td>
+</tr>
+<tr valign="top">
+<td>
+28 rmudgett<br/>
+1 russell<br/>
+1 tilghman<br/>
+</td>
+<td>
+4 rmudgett<br/>
+1 lelio<br/>
+1 shawkris<br/>
+1 wimpy<br/>
+</td>
+<td>
+1 bklang<br/>
+1 gelo<br/>
+1 jmls<br/>
+1 lelio<br/>
+1 schmoozecom<br/>
+1 shawkris<br/>
+1 wimpy<br/>
+1 wuwu<br/>
+</td>
+</tr>
+</table>
+<hr/>
+<a name="issues"><h2 align="center">Closed Issues</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
+<h3>Category: Channels/chan_dahdi</h3><br/>
+<a href="https://issues.asterisk.org/view.php?id=17270">#17270</a>: getting warning message every 4 seconds<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2113">2113</a><br/>
+Reporter: jmls<br/>
+Coders: rmudgett<br/>
+<br/>
+<h3>Category: General</h3><br/>
+<a href="https://issues.asterisk.org/view.php?id=17360">#17360</a>: [patch] LibPRI problem with restart of PBX processor (Testing SVN 1688)<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1962">1962</a><br/>
+Reporter: shawkris<br/>
+Testers: shawkris, rmudgett<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=17522">#17522</a>: segfault in pri_schedule_del - ctrl invalid value<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2015">2015</a><br/>
+Reporter: wuwu<br/>
+Testers: rmudgett<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=17865">#17865</a>: [patch] BRI NT ptmp: Active channels not cleard when i/f goes down<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1982">1982</a><br/>
+Reporter: wimpy<br/>
+Testers: rmudgett, wimpy<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=17968">#17968</a>: [patch] Libpri crashes when receiving Message Type (100)<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2021">2021</a><br/>
+Reporter: gelo<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=18032">#18032</a>: [patch] Asterisk is core dumping with LibPRI<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2015">2015</a><br/>
+Reporter: schmoozecom<br/>
+Testers: rmudgett<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=18232">#18232</a>: [patch] B410P gets incoming call packets on ISDN but DAHDI doesn't generate the call in Asterisk<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2088">2088</a><br/>
+Reporter: lelio<br/>
+Testers: lelio<br/>
+Coders: rmudgett<br/>
+<br/>
+<a href="https://issues.asterisk.org/view.php?id=18255">#18255</a>: SABME flood on backup D-channel in NFAS configuration<br/>
+Revision: <a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2111">2111</a><br/>
+Reporter: bklang<br/>
+Coders: rmudgett<br/>
+<br/>
+<hr/>
+<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker.  The commits may have been marked as being related to an issue.  If that is the case, the issue numbers are listed here, as well.</p>
+<table width="100%" border="1">
+<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1955">1955</a></td><td>rmudgett</td><td>Don't crash in __pri_new_tei() if a GR303 subchannel creation fails.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1958">1958</a></td><td>rmudgett</td><td>Balance curly braces in post_handle_q931_message().</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1961">1961</a></td><td>rmudgett</td><td>Prevent a CONNECT message from sending a CONNECT ACKNOWLEDGE in the wrong state.</td>
+<td><a href="https://issues.asterisk.org/view.php?id=17360">#17360</a></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1965">1965</a></td><td>rmudgett</td><td>Added more parameter checks to pri_set_timer() and pri_get_timer().</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1976">1976</a></td><td>rmudgett</td><td>Fix spelling error in PTMP agent FSM files.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=1991">1991</a></td><td>rmudgett</td><td>PRI links do not retain active calls if the link comes back before T309 expires.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2001">2001</a></td><td>russell</td><td>Makefile tweaks to allow building for code coverage analysis.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2009">2009</a></td><td>tilghman</td><td>Minor changes to make libpri build on Mac OS X</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2027">2027</a></td><td>rmudgett</td><td>Create two versions of call ptr verify.  One gripes and one does not.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2042">2042</a></td><td>rmudgett</td><td>Dump Q.931 message using the TEI value the message came in with.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2063">2063</a></td><td>rmudgett</td><td>Logically separate Q.921 TEI link processing from D channel control.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2070">2070</a></td><td>rmudgett</td><td>Restructure the Q.931 call record to layer 2 link association.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2077">2077</a></td><td>rmudgett</td><td>Extract the layer 2 link structure out of struct pri.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2078">2078</a></td><td>rmudgett</td><td>Partial support for dynamic interfaces with NFAS.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2079">2079</a></td><td>rmudgett</td><td>Fixes CC agents not automatically clearing if T309 clears the original call.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2098">2098</a></td><td>rmudgett</td><td>Mainly put space after switch and while keywords.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2101">2101</a></td><td>rmudgett</td><td>Remove all TEIs when NT PTMP starts.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2102">2102</a></td><td>rmudgett</td><td>Remove unneeded struct q921_link.mdl_error_state member.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2103">2103</a></td><td>rmudgett</td><td>Convert TEI identity defines to enum and create 2str() function.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2104">2104</a></td><td>rmudgett</td><td>Q.921 TEI assignment procedure corrections.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2105">2105</a></td><td>rmudgett</td><td>Added TEI identity check feature to reclaim dead TEIs.</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/libpri/branches/1.4?view=revision&revision=2109">2109</a></td><td>rmudgett</td><td>Minor MDL handler changes.</td>
+<td></td></tr></table>
+<hr/>
+<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
+<pre>
+Makefile                        |   24
+doc/cc_ptmp_agent.fsm           |   16
+doc/cc_ptmp_agent_flattened.fsm |   19
+doc/cc_ptp_agent.fsm            |    8
+doc/cc_ptp_agent_flattened.fsm  |    9
+doc/cc_qsig_agent.fsm           |    4
+doc/cc_qsig_agent_flattened.fsm |    4
+pri.c                           |  515 +++++++---
+pri_aoc.c                       |   25
+pri_cc.c                        |   82 -
+pri_facility.c                  |   40
+pri_internal.h                  |  134 +-
+pri_q921.h                      |  101 +-
+pri_q931.h                      |   17
+prisched.c                      |   38
+q921.c                          | 1988 ++++++++++++++++++++++++----------------
+q931.c                          |  788 +++++++++++----
+17 files changed, 2518 insertions(+), 1294 deletions(-)
+</pre><br/>
+<hr/>
+</body>
+</html>
--- a/libpri-1.4.12-beta3-summary.txt
+++ b/libpri-1.4.12-beta3-summary.txt
@@ -0,0 +1,235 @@
+                                Release Summary
+
+                              libpri-1.4.12-beta3
+
+                                Date: 2010-11-17
+
+                           <asteriskteam@digium.com>
+
+     ----------------------------------------------------------------------
+
+                               Table of Contents
+
+    1. Summary
+    2. Contributors
+    3. Closed Issues
+    4. Other Changes
+    5. Diffstat
+
+     ----------------------------------------------------------------------
+
+                                    Summary
+
+                                 [Back to Top]
+
+   This release includes only bug fixes. The changes included were made only
+   to address problems that have been identified in this release series.
+   Users should be able to safely upgrade to this version if this release
+   series is already in use. Users considering upgrading from a previous
+   release series are strongly encouraged to review the UPGRADE.txt document
+   as well as the CHANGES document for information about upgrading to this
+   release series.
+
+   The data in this summary reflects changes that have been made since the
+   previous release, libpri-1.4.12-beta2.
+
+     ----------------------------------------------------------------------
+
+                                  Contributors
+
+                                 [Back to Top]
+
+   This table lists the people who have submitted code, those that have
+   tested patches, as well as those that reported issues on the issue tracker
+   that were resolved in this release. For coders, the number is how many of
+   their patches (of any size) were committed into this release. For testers,
+   the number is the number of times their name was listed as assisting with
+   testing a patch. Finally, for reporters, the number is the number of
+   issues that they reported that were closed by commits that went into this
+   release.
+
+     Coders                   Testers                  Reporters              
+   28 rmudgett              4 rmudgett               1 bklang                 
+   1 russell                1 lelio                  1 gelo                   
+   1 tilghman               1 shawkris               1 jmls                   
+                            1 wimpy                  1 lelio                  
+                                                     1 schmoozecom            
+                                                     1 shawkris               
+                                                     1 wimpy                  
+                                                     1 wuwu                   
+
+     ----------------------------------------------------------------------
+
+                                 Closed Issues
+
+                                 [Back to Top]
+
+   This is a list of all issues from the issue tracker that were closed by
+   changes that went into this release.
+
+  Category: Channels/chan_dahdi
+
+   #17270: getting warning message every 4 seconds
+   Revision: 2113
+   Reporter: jmls
+   Coders: rmudgett
+
+  Category: General
+
+   #17360: [patch] LibPRI problem with restart of PBX processor (Testing SVN
+   1688)
+   Revision: 1962
+   Reporter: shawkris
+   Testers: shawkris, rmudgett
+   Coders: rmudgett
+
+   #17522: segfault in pri_schedule_del - ctrl invalid value
+   Revision: 2015
+   Reporter: wuwu
+   Testers: rmudgett
+   Coders: rmudgett
+
+   #17865: [patch] BRI NT ptmp: Active channels not cleard when i/f goes down
+   Revision: 1982
+   Reporter: wimpy
+   Testers: rmudgett, wimpy
+   Coders: rmudgett
+
+   #17968: [patch] Libpri crashes when receiving Message Type (100)
+   Revision: 2021
+   Reporter: gelo
+   Coders: rmudgett
+
+   #18032: [patch] Asterisk is core dumping with LibPRI
+   Revision: 2015
+   Reporter: schmoozecom
+   Testers: rmudgett
+   Coders: rmudgett
+
+   #18232: [patch] B410P gets incoming call packets on ISDN but DAHDI doesn't
+   generate the call in Asterisk
+   Revision: 2088
+   Reporter: lelio
+   Testers: lelio
+   Coders: rmudgett
+
+   #18255: SABME flood on backup D-channel in NFAS configuration
+   Revision: 2111
+   Reporter: bklang
+   Coders: rmudgett
+
+     ----------------------------------------------------------------------
+
+                      Commits Not Associated with an Issue
+
+                                 [Back to Top]
+
+   This is a list of all changes that went into this release that did not
+   directly close an issue from the issue tracker. The commits may have been
+   marked as being related to an issue. If that is the case, the issue
+   numbers are listed here, as well.
+
+   +------------------------------------------------------------------------+
+   | Revision | Author   | Summary                             | Issues     |
+   |          |          |                                     | Referenced |
+   |----------+----------+-------------------------------------+------------|
+   | 1955     | rmudgett | Don't crash in __pri_new_tei() if a |            |
+   |          |          | GR303 subchannel creation fails.    |            |
+   |----------+----------+-------------------------------------+------------|
+   | 1958     | rmudgett | Balance curly braces in             |            |
+   |          |          | post_handle_q931_message().         |            |
+   |----------+----------+-------------------------------------+------------|
+   |          |          | Prevent a CONNECT message from      |            |
+   | 1961     | rmudgett | sending a CONNECT ACKNOWLEDGE in    | #17360     |
+   |          |          | the wrong state.                    |            |
+   |----------+----------+-------------------------------------+------------|
+   |          |          | Added more parameter checks to      |            |
+   | 1965     | rmudgett | pri_set_timer() and                 |            |
+   |          |          | pri_get_timer().                    |            |
+   |----------+----------+-------------------------------------+------------|
+   | 1976     | rmudgett | Fix spelling error in PTMP agent    |            |
+   |          |          | FSM files.                          |            |
+   |----------+----------+-------------------------------------+------------|
+   |          |          | PRI links do not retain active      |            |
+   | 1991     | rmudgett | calls if the link comes back before |            |
+   |          |          | T309 expires.                       |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2001     | russell  | Makefile tweaks to allow building   |            |
+   |          |          | for code coverage analysis.         |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2009     | tilghman | Minor changes to make libpri build  |            |
+   |          |          | on Mac OS X                         |            |
+   |----------+----------+-------------------------------------+------------|
+   |          |          | Create two versions of call ptr     |            |
+   | 2027     | rmudgett | verify. One gripes and one does     |            |
+   |          |          | not.                                |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2042     | rmudgett | Dump Q.931 message using the TEI    |            |
+   |          |          | value the message came in with.     |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2063     | rmudgett | Logically separate Q.921 TEI link   |            |
+   |          |          | processing from D channel control.  |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2070     | rmudgett | Restructure the Q.931 call record   |            |
+   |          |          | to layer 2 link association.        |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2077     | rmudgett | Extract the layer 2 link structure  |            |
+   |          |          | out of struct pri.                  |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2078     | rmudgett | Partial support for dynamic         |            |
+   |          |          | interfaces with NFAS.               |            |
+   |----------+----------+-------------------------------------+------------|
+   |          |          | Fixes CC agents not automatically   |            |
+   | 2079     | rmudgett | clearing if T309 clears the         |            |
+   |          |          | original call.                      |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2098     | rmudgett | Mainly put space after switch and   |            |
+   |          |          | while keywords.                     |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2101     | rmudgett | Remove all TEIs when NT PTMP        |            |
+   |          |          | starts.                             |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2102     | rmudgett | Remove unneeded struct              |            |
+   |          |          | q921_link.mdl_error_state member.   |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2103     | rmudgett | Convert TEI identity defines to     |            |
+   |          |          | enum and create 2str() function.    |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2104     | rmudgett | Q.921 TEI assignment procedure      |            |
+   |          |          | corrections.                        |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2105     | rmudgett | Added TEI identity check feature to |            |
+   |          |          | reclaim dead TEIs.                  |            |
+   |----------+----------+-------------------------------------+------------|
+   | 2109     | rmudgett | Minor MDL handler changes.          |            |
+   +------------------------------------------------------------------------+
+
+     ----------------------------------------------------------------------
+
+                                Diffstat Results
+
+                                 [Back to Top]
+
+   This is a summary of the changes to the source code that went into this
+   release that was generated using the diffstat utility.
+
+ Makefile                        |   24
+ doc/cc_ptmp_agent.fsm           |   16
+ doc/cc_ptmp_agent_flattened.fsm |   19
+ doc/cc_ptp_agent.fsm            |    8
+ doc/cc_ptp_agent_flattened.fsm  |    9
+ doc/cc_qsig_agent.fsm           |    4
+ doc/cc_qsig_agent_flattened.fsm |    4
+ pri.c                           |  515 +++++++---
+ pri_aoc.c                       |   25
+ pri_cc.c                        |   82 -
+ pri_facility.c                  |   40
+ pri_internal.h                  |  134 +-
+ pri_q921.h                      |  101 +-
+ pri_q931.h                      |   17
+ prisched.c                      |   38
+ q921.c                          | 1988 ++++++++++++++++++++++++----------------
+ q931.c                          |  788 +++++++++++----
+ 17 files changed, 2518 insertions(+), 1294 deletions(-)
+
+     ----------------------------------------------------------------------
--- a/pri.c
+++ b/pri.c
--- a/pri_aoc.c
+++ b/pri_aoc.c
@@ -212,7 +212,7 @@ void aoc_etsi_aoc_request(struct pri *ctrl, q931_call *call, const struct rose_m
 	struct pri_subcommand *subcmd;
 	int request;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		send_facility_error(ctrl, call, invoke->invoke_id, ROSE_ERROR_Gen_NotSubscribed);
 		return;
 	}
@@ -439,7 +439,7 @@ void aoc_etsi_aoc_s_currency(struct pri *ctrl, const struct rose_msg_invoke *inv
 {
 	struct pri_subcommand *subcmd;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -470,7 +470,7 @@ void aoc_etsi_aoc_s_special_arrangement(struct pri *ctrl, const struct rose_msg_
 {
 	struct pri_subcommand *subcmd;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -535,7 +535,7 @@ void aoc_etsi_aoc_d_currency(struct pri *ctrl, const struct rose_msg_invoke *inv
 {
 	struct pri_subcommand *subcmd;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -577,7 +577,7 @@ void aoc_etsi_aoc_d_charging_unit(struct pri *ctrl, const struct rose_msg_invoke
 {
 	struct pri_subcommand *subcmd;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -760,7 +760,7 @@ void aoc_etsi_aoc_e_currency(struct pri *ctrl, q931_call *call, const struct ros
 {
 	struct pri_subcommand *subcmd;

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -828,7 +828,7 @@ void aoc_etsi_aoc_e_charging_unit(struct pri *ctrl, q931_call *call, const struc
 		}
 	}

-	if (!PRI_MASTER(ctrl)->aoc_support) {
+	if (!ctrl->aoc_support) {
 		return;
 	}
 	subcmd = q931_alloc_subcommand(ctrl);
@@ -869,7 +869,6 @@ void aoc_etsi_aoc_e_charging_unit(struct pri *ctrl, q931_call *call, const struc
 void pri_aoc_events_enable(struct pri *ctrl, int enable)
 {
 	if (ctrl) {
-		ctrl = PRI_MASTER(ctrl);
 		ctrl->aoc_support = enable ? 1 : 0;
 	}
 }
@@ -1610,7 +1609,7 @@ static int aoc_e_encode(struct pri *ctrl, q931_call *call, const struct pri_subc

 int pri_aoc_de_request_response_send(struct pri *ctrl, q931_call *call, int response, int invoke_id)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -1629,7 +1628,7 @@ int pri_aoc_de_request_response_send(struct pri *ctrl, q931_call *call, int resp

 int pri_aoc_s_request_response_send(struct pri *ctrl, q931_call *call, int invoke_id, const struct pri_subcmd_aoc_s *aoc_s)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -1692,7 +1691,7 @@ int aoc_charging_request_send(struct pri *ctrl, q931_call *call, enum PRI_AOC_RE

 int pri_aoc_s_send(struct pri *ctrl, q931_call *call, const struct pri_subcmd_aoc_s *aoc_s)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -1711,7 +1710,7 @@ int pri_aoc_s_send(struct pri *ctrl, q931_call *call, const struct pri_subcmd_ao

 int pri_aoc_d_send(struct pri *ctrl, q931_call *call, const struct pri_subcmd_aoc_d *aoc_d)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -1729,7 +1728,7 @@ int pri_aoc_d_send(struct pri *ctrl, q931_call *call, const struct pri_subcmd_ao

 int pri_aoc_e_send(struct pri *ctrl, q931_call *call, const struct pri_subcmd_aoc_e *aoc_e)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

--- a/pri_cc.c
+++ b/pri_cc.c
@@ -61,7 +61,6 @@ struct pri_cc_record *pri_cc_find_by_reference(struct pri *ctrl, unsigned refere
 {
 	struct pri_cc_record *cc_record;

-	ctrl = PRI_MASTER(ctrl);
 	for (cc_record = ctrl->cc.pool; cc_record; cc_record = cc_record->next) {
 		if (cc_record->ccbs_reference_id == reference_id) {
 			/* Found the record */
@@ -85,7 +84,6 @@ struct pri_cc_record *pri_cc_find_by_linkage(struct pri *ctrl, unsigned linkage_
 {
 	struct pri_cc_record *cc_record;

-	ctrl = PRI_MASTER(ctrl);
 	for (cc_record = ctrl->cc.pool; cc_record; cc_record = cc_record->next) {
 		if (cc_record->call_linkage_id == linkage_id) {
 			/* Found the record */
@@ -110,7 +108,6 @@ static struct pri_cc_record *pri_cc_find_by_id(struct pri *ctrl, long cc_id)
 {
 	struct pri_cc_record *cc_record;

-	ctrl = PRI_MASTER(ctrl);
 	for (cc_record = ctrl->cc.pool; cc_record; cc_record = cc_record->next) {
 		if (cc_record->record_id == cc_id) {
 			/* Found the record */
@@ -234,7 +231,6 @@ struct pri_cc_record *pri_cc_find_by_addressing(struct pri *ctrl, const struct q
 	struct q931_party_address addr_a;
 	struct q931_party_address addr_b;

-	ctrl = PRI_MASTER(ctrl);
 	addr_a = *party_a;
 	addr_b = *party_b;
 	for (cc_record = ctrl->cc.pool; cc_record; cc_record = cc_record->next) {
@@ -266,7 +262,6 @@ static int pri_cc_new_reference_id(struct pri *ctrl)
 	long reference_id;
 	long first_id;

-	ctrl = PRI_MASTER(ctrl);
 	ctrl->cc.last_reference_id = (ctrl->cc.last_reference_id + 1) & 0x7F;
 	reference_id = ctrl->cc.last_reference_id;
 	first_id = reference_id;
@@ -298,7 +293,6 @@ static int pri_cc_new_linkage_id(struct pri *ctrl)
 	long linkage_id;
 	long first_id;

-	ctrl = PRI_MASTER(ctrl);
 	ctrl->cc.last_linkage_id = (ctrl->cc.last_linkage_id + 1) & 0x7F;
 	linkage_id = ctrl->cc.last_linkage_id;
 	first_id = linkage_id;
@@ -330,7 +324,6 @@ static long pri_cc_new_id(struct pri *ctrl)
 	long record_id;
 	long first_id;

-	ctrl = PRI_MASTER(ctrl);
 	record_id = ++ctrl->cc.last_record_id;
 	first_id = record_id;
 	while (pri_cc_find_by_id(ctrl, record_id)) {
@@ -386,7 +379,6 @@ static void pri_cc_delete_record(struct pri *ctrl, struct pri_cc_record *doomed)
 	}
 	pri_cc_disassociate_signaling_link(doomed);

-	ctrl = PRI_MASTER(ctrl);
 	for (prev = &ctrl->cc.pool, current = ctrl->cc.pool; current;
 		prev = &current->next, current = current->next) {
 		if (current == doomed) {
@@ -413,7 +405,6 @@ struct pri_cc_record *pri_cc_new_record(struct pri *ctrl, q931_call *call)
 	struct pri_cc_record *cc_record;
 	long record_id;

-	ctrl = PRI_MASTER(ctrl);
 	record_id = pri_cc_new_id(ctrl);
 	if (record_id < 0) {
 		return NULL;
@@ -424,7 +415,7 @@ struct pri_cc_record *pri_cc_new_record(struct pri *ctrl, q931_call *call)
 	}

 	/* Initialize the new record */
-	cc_record->master = ctrl;
+	cc_record->ctrl = ctrl;
 	cc_record->record_id = record_id;
 	cc_record->call_linkage_id = CC_PTMP_INVALID_ID;/* So it will never be found this way */
 	cc_record->ccbs_reference_id = CC_PTMP_INVALID_ID;/* So it will never be found this way */
@@ -975,7 +966,7 @@ static unsigned char *enc_qsig_cc_request(struct pri *ctrl,

 	//msg.args.qsig.CcbsRequest.can_retain_service = 0;

-	switch (PRI_MASTER(ctrl)->cc.option.signaling_retention_req) {
+	switch (ctrl->cc.option.signaling_retention_req) {
 	case 0:/* Want release signaling link. */
 		cc_record->option.retain_signaling_link = 0;

@@ -1954,7 +1945,6 @@ static unsigned char *enc_etsi_ptmp_cc_interrogate_rsp_general(struct pri *ctrl,
 	struct q931_party_number party_a_number;
 	const struct pri_cc_record *cc_record;
 	unsigned char *new_pos;
-	struct pri *master;
 	unsigned idx;

 	pos = facility_encode_header(ctrl, pos, end, NULL);
@@ -1966,8 +1956,7 @@ static unsigned char *enc_etsi_ptmp_cc_interrogate_rsp_general(struct pri *ctrl,
 	msg.invoke_id = invoke->invoke_id;
 	msg.operation = invoke->operation;

-	master = PRI_MASTER(ctrl);
-	msg.args.etsi.CCBSInterrogate.recall_mode = master->cc.option.recall_mode;
+	msg.args.etsi.CCBSInterrogate.recall_mode = ctrl->cc.option.recall_mode;

 	/* Convert the given party A number. */
 	q931_party_number_init(&party_a_number);
@@ -1979,7 +1968,7 @@ static unsigned char *enc_etsi_ptmp_cc_interrogate_rsp_general(struct pri *ctrl,

 	/* Build the CallDetails list. */
 	idx = 0;
-	for (cc_record = master->cc.pool; cc_record; cc_record = cc_record->next) {
+	for (cc_record = ctrl->cc.pool; cc_record; cc_record = cc_record->next) {
 		if (cc_record->ccbs_reference_id == CC_PTMP_INVALID_ID
 			|| (!cc_record->is_ccnr) != (invoke->operation == ROSE_ETSI_CCBSInterrogate)) {
 			/*
@@ -2087,7 +2076,7 @@ int pri_cc_interrogate_rsp(struct pri *ctrl, q931_call *call, const struct rose_
 {
 	int encode_result;

-	if (!PRI_MASTER(ctrl)->cc_support) {
+	if (!ctrl->cc_support) {
 		/* Call completion is disabled. */
 		return send_facility_error(ctrl, call, invoke->invoke_id,
 			ROSE_ERROR_Gen_NotSubscribed);
@@ -2134,7 +2123,7 @@ void pri_cc_ptmp_request(struct pri *ctrl, q931_call *call, const struct rose_ms
 {
 	struct pri_cc_record *cc_record;

-	if (!PRI_MASTER(ctrl)->cc_support) {
+	if (!ctrl->cc_support) {
 		/* Call completion is disabled. */
 		send_facility_error(ctrl, call, invoke->invoke_id,
 			ROSE_ERROR_Gen_NotSubscribed);
@@ -2191,7 +2180,7 @@ void pri_cc_ptp_request(struct pri *ctrl, q931_call *call, int msgtype, const st
 		/* Ignore CC request message since it did not come in on the correct message. */
 		return;
 	}
-	if (!PRI_MASTER(ctrl)->cc_support) {
+	if (!ctrl->cc_support) {
 		/* Call completion is disabled. */
 		rose_error_msg_encode(ctrl, call, Q931_ANY_MESSAGE, invoke->invoke_id,
 			ROSE_ERROR_Gen_NotSubscribed);
@@ -2270,7 +2259,6 @@ void pri_cc_ptp_request(struct pri *ctrl, q931_call *call, int msgtype, const st
 */
 void pri_cc_qsig_request(struct pri *ctrl, q931_call *call, int msgtype, const struct rose_msg_invoke *invoke)
 {
-	struct pri *master;
 	struct pri_cc_record *cc_record;
 	struct q931_party_address party_a;
 	struct q931_party_address party_b;
@@ -2279,8 +2267,7 @@ void pri_cc_qsig_request(struct pri *ctrl, q931_call *call, int msgtype, const s
 		/* Ignore CC request message since it did not come in on the correct message. */
 		return;
 	}
-	master = PRI_MASTER(ctrl);
-	if (!master->cc_support) {
+	if (!ctrl->cc_support) {
 		/* Call completion is disabled. */
 		rose_error_msg_encode(ctrl, call, Q931_ANY_MESSAGE, invoke->invoke_id,
 			ROSE_ERROR_QSIG_LongTermRejection);
@@ -2302,7 +2289,7 @@ void pri_cc_qsig_request(struct pri *ctrl, q931_call *call, int msgtype, const s
 	rose_copy_subaddress_to_q931(ctrl, &party_b.subaddress,
 		&invoke->args.qsig.CcbsRequest.subaddr_b);

-	cc_record = pri_cc_find_by_addressing(master, &party_a, &party_b,
+	cc_record = pri_cc_find_by_addressing(ctrl, &party_a, &party_b,
 		invoke->args.qsig.CcbsRequest.q931ie.length,
 		invoke->args.qsig.CcbsRequest.q931ie.contents);
 	if (!cc_record || cc_record->state != CC_STATE_AVAILABLE) {
@@ -2321,7 +2308,7 @@ void pri_cc_qsig_request(struct pri *ctrl, q931_call *call, int msgtype, const s
 	} else {
 		/* The originator does not care.  Do how we are configured. */
 		cc_record->option.retain_signaling_link =
-			master->cc.option.signaling_retention_rsp;
+			ctrl->cc.option.signaling_retention_rsp;
 	}
 	if (!cc_record->party_a.number.valid || cc_record->party_a.number.str[0] == '\0') {
 		/*
@@ -2626,6 +2613,9 @@ static const char *pri_cc_fsm_event_str(enum CC_EVENTS event)
 	case CC_EVENT_CANCEL:
 		str = "CC_EVENT_CANCEL";
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		str = "CC_EVENT_INTERNAL_CLEARING";
+		break;
 	case CC_EVENT_SIGNALING_GONE:
 		str = "CC_EVENT_SIGNALING_GONE";
 		break;
@@ -2805,7 +2795,7 @@ static void pri_cc_timeout_t_retention(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_retention = 0;
-	q931_cc_timeout(cc_record->master, cc_record, CC_EVENT_TIMEOUT_T_RETENTION);
+	q931_cc_timeout(cc_record->ctrl, cc_record, CC_EVENT_TIMEOUT_T_RETENTION);
 }

 /*!
@@ -2857,7 +2847,7 @@ static void pri_cc_timeout_extended_t_ccbs1(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->fsm.ptmp.extended_t_ccbs1 = 0;
-	q931_cc_timeout(cc_record->master, cc_record, CC_EVENT_TIMEOUT_EXTENDED_T_CCBS1);
+	q931_cc_timeout(cc_record->ctrl, cc_record, CC_EVENT_TIMEOUT_EXTENDED_T_CCBS1);
 }

 /*!
@@ -2911,7 +2901,7 @@ static void pri_cc_timeout_t_supervision(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_supervision = 0;
-	q931_cc_timeout(cc_record->master, cc_record, CC_EVENT_TIMEOUT_T_SUPERVISION);
+	q931_cc_timeout(cc_record->ctrl, cc_record, CC_EVENT_TIMEOUT_T_SUPERVISION);
 }

 /*!
@@ -2991,7 +2981,7 @@ static void pri_cc_timeout_t_recall(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_recall = 0;
-	q931_cc_timeout(cc_record->master, cc_record, CC_EVENT_TIMEOUT_T_RECALL);
+	q931_cc_timeout(cc_record->ctrl, cc_record, CC_EVENT_TIMEOUT_T_RECALL);
 }

 /*!
@@ -3755,7 +3745,7 @@ static void pri_cc_indirect_status_rsp_a(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_indirect = 0;
-	q931_cc_indirect(cc_record->master, cc_record, pri_cc_fill_status_rsp_a);
+	q931_cc_indirect(cc_record->ctrl, cc_record, pri_cc_fill_status_rsp_a);
 }

 /*!
@@ -3904,7 +3894,7 @@ static void pri_cc_indirect_status_a(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_indirect = 0;
-	q931_cc_indirect(cc_record->master, cc_record, pri_cc_fill_status_a);
+	q931_cc_indirect(cc_record->ctrl, cc_record, pri_cc_fill_status_a);
 }

 /*!
@@ -4261,7 +4251,7 @@ static void pri_cc_post_hangup_signaling(void *data)
 	struct pri_cc_record *cc_record = data;

 	cc_record->t_indirect = 0;
-	q931_cc_timeout(cc_record->master, cc_record, CC_EVENT_HANGUP_SIGNALING);
+	q931_cc_timeout(cc_record->ctrl, cc_record, CC_EVENT_HANGUP_SIGNALING);
 }

 /*!
@@ -4364,7 +4354,14 @@ static void pri_cc_fsm_ptmp_agent_pend_avail(struct pri *ctrl, q931_call *call,
 		pri_cc_act_send_cc_available(ctrl, cc_record, call, Q931_DISCONNECT);
 		cc_record->state = CC_STATE_AVAILABLE;
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		pri_cc_act_release_link_id(ctrl, cc_record);
+		pri_cc_act_pass_up_cc_cancel(ctrl, cc_record);
+		pri_cc_act_set_self_destruct(ctrl, cc_record);
+		cc_record->state = CC_STATE_IDLE;
+		break;
 	case CC_EVENT_CANCEL:
+		pri_cc_act_release_link_id(ctrl, cc_record);
 		pri_cc_act_set_self_destruct(ctrl, cc_record);
 		cc_record->state = CC_STATE_IDLE;
 		break;
@@ -4397,6 +4394,10 @@ static void pri_cc_fsm_ptmp_agent_avail(struct pri *ctrl, q931_call *call, struc
 		pri_cc_act_stop_t_retention(ctrl, cc_record);
 		cc_record->state = CC_STATE_REQUESTED;
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		pri_cc_act_stop_t_retention(ctrl, cc_record);
+		pri_cc_act_start_t_retention(ctrl, cc_record);
+		break;
 	case CC_EVENT_TIMEOUT_T_RETENTION:
 		pri_cc_act_send_erase_call_linkage_id(ctrl, cc_record);
 		pri_cc_act_release_link_id(ctrl, cc_record);
@@ -5288,6 +5289,11 @@ static void pri_cc_fsm_ptp_agent_pend_avail(struct pri *ctrl, q931_call *call, s
 		pri_cc_act_send_cc_available(ctrl, cc_record, call, Q931_DISCONNECT);
 		cc_record->state = CC_STATE_AVAILABLE;
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		pri_cc_act_pass_up_cc_cancel(ctrl, cc_record);
+		pri_cc_act_set_self_destruct(ctrl, cc_record);
+		cc_record->state = CC_STATE_IDLE;
+		break;
 	case CC_EVENT_CANCEL:
 		pri_cc_act_set_self_destruct(ctrl, cc_record);
 		cc_record->state = CC_STATE_IDLE;
@@ -5328,6 +5334,10 @@ static void pri_cc_fsm_ptp_agent_avail(struct pri *ctrl, q931_call *call, struct
 		pri_cc_act_stop_t_retention(ctrl, cc_record);
 		cc_record->state = CC_STATE_REQUESTED;
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		pri_cc_act_stop_t_retention(ctrl, cc_record);
+		pri_cc_act_start_t_retention(ctrl, cc_record);
+		break;
 	case CC_EVENT_TIMEOUT_T_RETENTION:
 		pri_cc_act_pass_up_cc_cancel(ctrl, cc_record);
 		pri_cc_act_stop_t_retention(ctrl, cc_record);
@@ -5927,6 +5937,10 @@ static void pri_cc_fsm_qsig_agent_avail(struct pri *ctrl, q931_call *call, struc
 		pri_cc_act_stop_t_retention(ctrl, cc_record);
 		cc_record->state = CC_STATE_REQUESTED;
 		break;
+	case CC_EVENT_INTERNAL_CLEARING:
+		pri_cc_act_stop_t_retention(ctrl, cc_record);
+		pri_cc_act_start_t_retention(ctrl, cc_record);
+		break;
 	case CC_EVENT_TIMEOUT_T_RETENTION:
 		pri_cc_act_pass_up_cc_cancel(ctrl, cc_record);
 		pri_cc_act_stop_t_retention(ctrl, cc_record);
@@ -6803,7 +6817,7 @@ long pri_cc_available(struct pri *ctrl, q931_call *call)
 	struct pri_cc_record *cc_record;
 	long cc_id;

-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	if (call->cc.record) {
@@ -6850,7 +6864,7 @@ long pri_cc_available(struct pri *ctrl, q931_call *call)
 				break;
 			}
 			cc_record->call_linkage_id = linkage_id;
-			cc_record->signaling = PRI_MASTER(ctrl)->dummy_call;
+			cc_record->signaling = ctrl->link.dummy_call;
 		} else {
 			cc_record = pri_cc_new_record(ctrl, call);
 			if (!cc_record) {
@@ -6894,7 +6908,7 @@ void pri_cc_qsig_determine_available(struct pri *ctrl, q931_call *call)
 		return;
 	}

-	if (!PRI_MASTER(ctrl)->cc_support) {
+	if (!ctrl->cc_support) {
 		/*
 		 * Blocking the cc-available event effectively
 		 * disables call completion for outgoing calls.
@@ -7811,7 +7825,7 @@ int pri_cc_call(struct pri *ctrl, long cc_id, q931_call *call, struct pri_sr *re
 {
 	struct pri_cc_record *cc_record;

-	if (!ctrl || !call || !req) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call) || !req) {
 		return -1;
 	}
 	cc_record = pri_cc_find_by_id(ctrl, cc_id);
--- a/pri_facility.c
+++ b/pri_facility.c
@@ -1859,7 +1859,7 @@ int pri_mwi_indicate(struct pri *ctrl, const struct pri_party_id *mailbox,
 		if (!BRI_NT_PTMP(ctrl)) {
 			return -1;
 		}
-		call = PRI_MASTER(ctrl)->dummy_call;
+		call = ctrl->link.dummy_call;
 		if (!call) {
 			return -1;
 		}
@@ -2556,8 +2556,9 @@ static int etsi_ect_link_id_rsp(enum APDU_CALLBACK_REASON reason, struct pri *ct

 	switch (reason) {
 	case APDU_CALLBACK_REASON_MSG_RESULT:
-		call_2 = q931_find_call(ctrl, apdu->response.user.value);
-		if (!call_2) {
+		call_2 = apdu->response.user.ptr;
+		if (!q931_is_call_valid(ctrl, call_2)) {
+			/* Call is no longer present. */
 			break;
 		}

@@ -2636,7 +2637,7 @@ int etsi_initiate_transfer(struct pri *ctrl, q931_call *call_1, q931_call *call_
 	response.invoke_id = ctrl->last_invoke;
 	response.timeout_time = ctrl->timers[PRI_TIMER_T_RESPONSE];
 	response.callback = etsi_ect_link_id_rsp;
-	response.user.value = call_2->cr;
+	response.user.ptr = call_2;

 	/* Remember that if we queue a facility IE for a facility message we
 	 * have to explicitly send the facility message ourselves */
@@ -3632,7 +3633,7 @@ int pri_rerouting_rsp(struct pri *ctrl, q931_call *call, int invoke_id, enum PRI
 {
 	enum rose_error_code rose_err;

-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -3673,7 +3674,7 @@ int pri_rerouting_rsp(struct pri *ctrl, q931_call *call, int invoke_id, enum PRI

 int pri_transfer_rsp(struct pri *ctrl, q931_call *call, int invoke_id, int is_successful)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}

@@ -3804,7 +3805,7 @@ static int rose_mcid_req_encode(struct pri *ctrl, q931_call *call)

 int pri_mcid_req_send(struct pri *ctrl, q931_call *call)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	if (call->cc.originated) {
@@ -3824,7 +3825,6 @@ int pri_mcid_req_send(struct pri *ctrl, q931_call *call)
 void pri_mcid_enable(struct pri *ctrl, int enable)
 {
 	if (ctrl) {
-		ctrl = PRI_MASTER(ctrl);
 		ctrl->mcid_support = enable ? 1 : 0;
 	}
 }
@@ -3881,7 +3881,7 @@ void rose_handle_reject(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		 * Look for the original invocation message on the
 		 * broadcast dummy call reference call first.
 		 */
-		orig_call = PRI_MASTER(ctrl)->dummy_call;
+		orig_call = ctrl->link.dummy_call;
 		if (orig_call) {
 			apdu = pri_call_apdu_find(orig_call, reject->invoke_id);
 		}
@@ -3965,7 +3965,7 @@ void rose_handle_error(struct pri *ctrl, q931_call *call, int msgtype, q931_ie *
 		 * Look for the original invocation message on the
 		 * broadcast dummy call reference call first.
 		 */
-		orig_call = PRI_MASTER(ctrl)->dummy_call;
+		orig_call = ctrl->link.dummy_call;
 		if (orig_call) {
 			apdu = pri_call_apdu_find(orig_call, error->invoke_id);
 		}
@@ -4041,7 +4041,7 @@ void rose_handle_result(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		 * Look for the original invocation message on the
 		 * broadcast dummy call reference call first.
 		 */
-		orig_call = PRI_MASTER(ctrl)->dummy_call;
+		orig_call = ctrl->link.dummy_call;
 		if (orig_call) {
 			apdu = pri_call_apdu_find(orig_call, result->invoke_id);
 		}
@@ -4098,7 +4098,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		break;
 #endif	/* Not handled yet */
 	case ROSE_ETSI_CallDeflection:
-		if (!PRI_MASTER(ctrl)->deflection_support) {
+		if (!ctrl->deflection_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_NotSubscribed);
 			break;
@@ -4166,7 +4166,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 			&deflection);
 		break;
 	case ROSE_ETSI_CallRerouting:
-		if (!PRI_MASTER(ctrl)->deflection_support) {
+		if (!ctrl->deflection_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_NotSubscribed);
 			break;
@@ -4364,7 +4364,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		break;
 #endif	/* Not handled yet */
 	case ROSE_ETSI_EctExecute:
-		if (!PRI_MASTER(ctrl)->transfer_support) {
+		if (!ctrl->transfer_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_NotSubscribed);
 			break;
@@ -4389,7 +4389,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		break;
 #endif	/* Not handled yet */
 	case ROSE_ETSI_EctLinkIdRequest:
-		if (!PRI_MASTER(ctrl)->transfer_support) {
+		if (!ctrl->transfer_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_ResourceUnavailable);
 			break;
@@ -4429,7 +4429,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		break;
 #endif	/* defined(STATUS_REQUEST_PLACE_HOLDER) */
 	case ROSE_ETSI_CallInfoRetain:
-		if (!PRI_MASTER(ctrl)->cc_support) {
+		if (!ctrl->cc_support) {
 			/*
 			 * Blocking the cc-available event effectively
 			 * disables call completion for outgoing calls.
@@ -4444,7 +4444,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		if (!cc_record) {
 			break;
 		}
-		cc_record->signaling = PRI_MASTER(ctrl)->dummy_call;
+		cc_record->signaling = ctrl->link.dummy_call;
 		/*
 		 * Since we received this facility, we will not be allocating any
 		 * reference and linkage id's.
@@ -4644,7 +4644,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		pri_cc_event(ctrl, call, cc_record, CC_EVENT_REMOTE_USER_FREE);
 		break;
 	case ROSE_ETSI_CCBS_T_Available:
-		if (!PRI_MASTER(ctrl)->cc_support) {
+		if (!ctrl->cc_support) {
 			/*
 			 * Blocking the cc-available event effectively
 			 * disables call completion for outgoing calls.
@@ -4668,7 +4668,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 			/* Don't even dignify this with a response. */
 			break;
 		}
-		if (!PRI_MASTER(ctrl)->mcid_support) {
+		if (!ctrl->mcid_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_NotSubscribed);
 			break;
@@ -4876,7 +4876,7 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		break;
 #endif	/* Not handled yet */
 	case ROSE_QSIG_CallRerouting:
-		if (!PRI_MASTER(ctrl)->deflection_support) {
+		if (!ctrl->deflection_support) {
 			send_facility_error(ctrl, call, invoke->invoke_id,
 				ROSE_ERROR_Gen_NotSubscribed);
 			break;
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -76,8 +76,10 @@ struct pri {
 	void *userdata;
 	/*! Accumulated pri_message() line. (Valid in master record only) */
 	struct pri_msg_line *msg_line;
-	struct pri *subchannel;	/* Sub-channel if appropriate */
-	struct pri *master;		/* Master channel if appropriate */
+	/*! NFAS master/primary channel if appropriate */
+	struct pri *master;
+	/*! Next NFAS slaved D channel if appropriate */
+	struct pri *slave;
 	struct {
 		/*! Dynamically allocated array of timers that can grow as needed. */
 		struct pri_sched *timer;
@@ -93,9 +95,9 @@ struct pri {
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */

-	int sapi;
-	int tei;
-	int protodisc;
+	int protodisc;	/* Layer 3 protocol discriminator */
+
+	unsigned int nfas:1;/* TRUE if this D channel is involved with an NFAS group */
 	unsigned int bri:1;
 	unsigned int acceptinbanddisconnect:1;	/* Should we allow inband progress after DISCONNECT? */
 	unsigned int sendfacility:1;
@@ -111,57 +113,27 @@ struct pri {
 	unsigned int manual_connect_ack:1;/* TRUE if the CONNECT_ACKNOWLEDGE is sent with API call */
 	unsigned int mcid_support:1;/* TRUE if the upper layer supports MCID */

-	/* MDL variables */
-	int mdl_error;
-	int mdl_error_state;
-	int mdl_timer;
-	int mdl_free_me;
-
-	/* Q.921 State */
-	int q921_state;	
-	int RC;
-	int peer_rx_busy:1;
-	int own_rx_busy:1;
-	int acknowledge_pending:1;
-	int reject_exception:1;
-
-	int v_s;			/* Next N(S) for transmission */
-	int v_a;			/* Last acknowledged frame */
-	int v_r;			/* Next frame expected to be received */
+	/*! Layer 2 link control for D channel. */
+	struct q921_link link;
+	/*! T201 TEI Identity Check timer. */
+	int t201_timer;
+	/*! Number of times T201 has expired. */
+	int t201_expirycnt;
 	
 	int cref;			/* Next call reference value */
-	
-	int l3initiated;

-	/* Various timers */
-	int t203_timer;		/* Max idle time */
-	int t202_timer;
-	int n202_counter;
-	int ri;
-	int t200_timer;		/* T-200 retransmission timer */
 	/* All ISDN Timer values */
 	int timers[PRI_MAX_TIMERS];

 	/* Used by scheduler */
-	struct timeval tv;
 	int schedev;
 	pri_event ev;		/* Static event thingy */
 	/*! Subcommands for static event thingy. */
 	struct pri_subcommands subcmds;
 	
-	/* Q.921 Re-transmission queue */
-	struct q921_frame *txqueue;
-	
 	/* Q.931 calls */
-	q931_call **callpool;
-	q931_call *localpool;
-
-	/*!
-	 * \brief Q.931 Dummy call reference call associated with this TEI.
-	 * \note If present then this call is allocated as part of the
-	 * D channel control structure.
-	 */
-	q931_call *dummy_call;
+	struct q931_call **callpool;
+	struct q931_call *localpool;

 #ifdef LIBPRI_COUNTERS
 	/* q921/q931 packet counters */
@@ -369,10 +341,6 @@ struct pri_sr {
 	int aoc_charging_request;
 };

-/* Internal switch types */
-#define PRI_SWITCH_GR303_EOC_PATH	19
-#define PRI_SWITCH_GR303_TMC_SWITCHING	20
-
 #define Q931_MAX_TEI	8

 /*! \brief Incoming call transfer states. */
@@ -447,9 +415,10 @@ struct decoded_bc {

 /* q931_call datastructure */
 struct q931_call {
-	struct pri *pri;	/* PRI */
+	struct pri *pri;	/* D channel controller (master) */
+	struct q921_link *link;	/* Q.921 link associated with this call. */
+	struct q931_call *next;
 	int cr;				/* Call Reference */
-	q931_call *next;
 	/* Slotmap specified (bitmap of channels 31/24-1) (Channel Identifier IE) (-1 means not specified) */
 	int slotmap;
 	/* An explicit channel (Channel Identifier IE) (-1 means not specified) */
@@ -590,7 +559,7 @@ struct q931_call {
 	int is_link_id_valid;

 	/* Bridged call info */
-	q931_call *bridged_call;        /* Pointer to other leg of bridged call (Used by Q.SIG when eliminating tromboned calls) */
+	struct q931_call *bridged_call;        /* Pointer to other leg of bridged call (Used by Q.SIG when eliminating tromboned calls) */

 	int changestatus;		/* SERVICE message changestatus */
 	int reversecharge;		/* Reverse charging indication:
@@ -699,6 +668,8 @@ enum CC_EVENTS {
 	CC_EVENT_LINK_CANCEL,
 	/*! Tear down CC request from upper layer. */
 	CC_EVENT_CANCEL,
+	/*! Abnormal clearing of original call.  (T309 processing/T309 timeout/TEI removal) */
+	CC_EVENT_INTERNAL_CLEARING,
 	/*! Received message indicating tear down of CC signaling link completed. */
 	CC_EVENT_SIGNALING_GONE,
 	/*! Delayed hangup request for the signaling link to allow subcmd events to be passed up. */
@@ -744,8 +715,8 @@ enum CC_PARTY_A_AVAILABILITY {
 struct pri_cc_record {
 	/*! Next call-completion record in the list */
 	struct pri_cc_record *next;
-	/*! Master D channel control structure. */
-	struct pri *master;
+	/*! D channel control structure. */
+	struct pri *ctrl;
 	/*! Original call that is offered CC availability. (NULL if no longer exists.) */
 	struct q931_call *original_call;
 	/*!
@@ -881,11 +852,35 @@ struct d_ctrl_dummy {
 	struct q931_call dummy_call;
 };

+/*! Layer 2 link control structure with associated dummy call reference record. */
+struct link_dummy {
+	/*! Layer 2 control structure. Must be first in the structure. */
+	struct q921_link link;
+	/*! Dummy call reference call record. */
+	struct q931_call dummy_call;
+};
+
+/*!
+ * \brief Check if the given call ptr is valid and gripe if not.
+ *
+ * \param ctrl D channel controller.
+ * \param call Q.931 call leg.
+ *
+ * \retval TRUE if call ptr is valid.
+ * \retval FALSE if call ptr is invalid.
+ */
+#define pri_is_call_valid(ctrl, call)	\
+	q931_is_call_valid_gripe(ctrl, call, __PRETTY_FUNCTION__, __LINE__)
+
+int q931_is_call_valid(struct pri *ctrl, struct q931_call *call);
+int q931_is_call_valid_gripe(struct pri *ctrl, struct q931_call *call, const char *func_name, unsigned long func_line);
+
 extern int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), void *data);

 extern pri_event *pri_schedule_run(struct pri *pri);

 extern void pri_schedule_del(struct pri *pri, int ev);
+int pri_schedule_check(struct pri *ctrl, int id, void (*function)(void *data), void *data);

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

@@ -894,10 +889,10 @@ void pri_error(struct pri *ctrl, const char *fmt, ...) __attribute__((format(pri

 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);
+void pri_link_destroy(struct q921_link *link);
+struct q921_link *pri_link_new(struct pri *ctrl, int sapi, int tei);

-void q931_init_call_record(struct pri *ctrl, struct q931_call *call, int cr);
+void q931_init_call_record(struct q921_link *link, struct q931_call *call, int cr);

 void pri_sr_init(struct pri_sr *req);

@@ -967,13 +962,13 @@ int q931_cc_timeout(struct pri *ctrl, struct pri_cc_record *cc_record, enum CC_E
 void q931_cc_indirect(struct pri *ctrl, struct pri_cc_record *cc_record, void (*func)(struct pri *ctrl, q931_call *call, struct pri_cc_record *cc_record));

 /*!
- * \brief Get the master PRI control structure.
+ * \brief Get the NFAS master PRI control structure.
 *
 * \param ctrl D channel controller.
 *
- * \return Master PRI control structure.
+ * \return NFAS master PRI control structure.
 */
-static inline struct pri *PRI_MASTER(struct pri *ctrl)
+static inline struct pri *PRI_NFAS_MASTER(struct pri *ctrl)
 {
 	while (ctrl->master) {
 		ctrl = ctrl->master;
@@ -993,10 +988,8 @@ static inline int BRI_NT_PTMP(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
 	return my_ctrl->bri && my_ctrl->localtype == PRI_NETWORK
-		&& my_ctrl->tei == Q921_TEI_GROUP;
+		&& my_ctrl->link.tei == Q921_TEI_GROUP;
 }

 /*!
@@ -1011,10 +1004,8 @@ static inline int BRI_TE_PTMP(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
 	return my_ctrl->bri && my_ctrl->localtype == PRI_CPE
-		&& my_ctrl->tei == Q921_TEI_GROUP;
+		&& my_ctrl->link.tei == Q921_TEI_GROUP;
 }

 /*!
@@ -1029,8 +1020,6 @@ static inline int NT_MODE(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
 	return my_ctrl->localtype == PRI_NETWORK;
 }

@@ -1046,8 +1035,6 @@ static inline int TE_MODE(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
 	return my_ctrl->localtype == PRI_CPE;
 }

@@ -1063,9 +1050,7 @@ static inline int PTP_MODE(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
-	return my_ctrl->tei == Q921_TEI_PRI;
+	return my_ctrl->link.tei == Q921_TEI_PRI;
 }

 /*!
@@ -1080,9 +1065,7 @@ static inline int PTMP_MODE(const struct pri *ctrl)
 {
 	struct pri *my_ctrl = (struct pri *) ctrl;

-	/* Check master control structure */
-	my_ctrl = PRI_MASTER(my_ctrl);
-	return my_ctrl->tei == Q921_TEI_GROUP;
+	return my_ctrl->link.tei == Q921_TEI_GROUP;
 }

 #define Q931_DUMMY_CALL_REFERENCE	-1
@@ -1094,14 +1077,13 @@ static inline int PTMP_MODE(const struct pri *ctrl)
 * \retval TRUE if given call is a dummy call.
 * \retval FALSE otherwise.
 */
-static inline int q931_is_dummy_call(const q931_call *call)
+static inline int q931_is_dummy_call(const struct q931_call *call)
 {
 	return (call->cr == Q931_DUMMY_CALL_REFERENCE) ? 1 : 0;
 }

 static inline short get_invokeid(struct pri *ctrl)
 {
-	ctrl = PRI_MASTER(ctrl);
 	return ++ctrl->last_invoke;
 }

--- a/pri_q921.h
+++ b/pri_q921.h
@@ -57,6 +57,8 @@
 #define Q921_TEI_GR303_EOC_OPS			4
 #define Q921_TEI_GR303_TMC_SWITCHING	0
 #define Q921_TEI_GR303_TMC_CALLPROC		0
+#define Q921_TEI_AUTO_FIRST				64
+#define Q921_TEI_AUTO_LAST				126

 #define Q921_SAPI_CALL_CTRL		0
 #define Q921_SAPI_GR303_EOC		1
@@ -69,13 +71,16 @@
 #define Q921_SAPI_LAYER2_MANAGEMENT	63


-#define Q921_TEI_IDENTITY_REQUEST			1
-#define Q921_TEI_IDENTITY_ASSIGNED			2
-#define Q921_TEI_IDENTITY_DENIED			3
-#define Q921_TEI_IDENTITY_CHECK_REQUEST		4
-#define Q921_TEI_IDENTITY_CHECK_RESPONSE	5
-#define Q921_TEI_IDENTITY_REMOVE			6
-#define Q921_TEI_IDENTITY_VERIFY			7
+/*! Q.921 TEI management message type */
+enum q921_tei_identity {
+	Q921_TEI_IDENTITY_REQUEST = 1,
+	Q921_TEI_IDENTITY_ASSIGNED = 2,
+	Q921_TEI_IDENTITY_DENIED = 3,
+	Q921_TEI_IDENTITY_CHECK_REQUEST = 4,
+	Q921_TEI_IDENTITY_CHECK_RESPONSE = 5,
+	Q921_TEI_IDENTITY_REMOVE = 6,
+	Q921_TEI_IDENTITY_VERIFY = 7,
+};

 typedef struct q921_header {
 #if __BYTE_ORDER == __BIG_ENDIAN
@@ -180,6 +185,82 @@ typedef enum q921_state {
 	Q921_TIMER_RECOVERY = 8,
 } q921_state;

+/*! TEI identity check procedure states. */
+enum q921_tei_check_state {
+	/*! Not participating in the TEI check procedure. */
+	Q921_TEI_CHECK_NONE,
+	/*! No reply to TEI check received. */
+	Q921_TEI_CHECK_DEAD,
+	/*! Reply to TEI check received in current poll. */
+	Q921_TEI_CHECK_REPLY,
+	/*! No reply to current TEI check poll received.  A previous poll got a reply. */
+	Q921_TEI_CHECK_DEAD_REPLY,
+};
+
+/*! \brief Q.921 link controller structure */
+struct q921_link {
+	/*! Next Q.921 link in the chain. */
+	struct q921_link *next;
+	/*! D channel controller associated with this link. */
+	struct pri *ctrl;
+
+	/*!
+	 * \brief Q.931 Dummy call reference call associated with this TEI.
+	 *
+	 * \note If present then this call is allocated with the D
+	 * channel control structure or the link control structure
+	 * unless this is the TE PTMP broadcast TEI or a GR303 link.
+	 */
+	struct q931_call *dummy_call;
+
+	/*! Q.921 Re-transmission queue */
+	struct q921_frame *tx_queue;
+
+	/*! Q.921 State */
+	enum q921_state state;
+
+	/*! TEI identity check procedure state. */
+	enum q921_tei_check_state tei_check;
+
+	/*! Service Access Profile Identifier (SAPI) of this link */
+	int sapi;
+	/*! Terminal Endpoint Identifier (TEI) of this link */
+	int tei;
+	/*! TEI assignment random indicator. */
+	int ri;
+
+	/*! V(A) - Next I-frame sequence number needing ack */
+	int v_a;
+	/*! V(S) - Next I-frame sequence number to send */
+	int v_s;
+	/*! V(R) - Next I-frame sequence number expected to receive */
+	int v_r;
+
+	/* Various timers */
+
+	/*! T-200 retransmission timer */
+	int t200_timer;
+	/*! Retry Count (T200) */
+	int RC;
+	int t202_timer;
+	int n202_counter;
+	/*! Max idle time */
+	int t203_timer;
+	/*! PTP restart delay timer */
+	int restart_timer;
+
+	/* MDL variables */
+	int mdl_timer;
+	int mdl_error;
+	unsigned int mdl_free_me:1;
+
+	unsigned int peer_rx_busy:1;
+	unsigned int own_rx_busy:1;
+	unsigned int acknowledge_pending:1;
+	unsigned int reject_exception:1;
+	unsigned int l3_initiated:1;
+};
+
 static inline int Q921_ADD(int a, int b)
 {
 	return (a + b) % 128;
@@ -189,15 +270,15 @@ static inline int Q921_ADD(int a, int b)
 extern void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx);

 /* Bring up the D-channel */
-extern void q921_start(struct pri *pri);
+void q921_start(struct q921_link *link);

 //extern void q921_reset(struct pri *pri, int reset_iqueue);

 extern pri_event *q921_receive(struct pri *pri, q921_h *h, int len);

-extern int q921_transmit_iframe(struct pri *pri, int tei, void *buf, int len, int cr);
+int q921_transmit_iframe(struct q921_link *link, void *buf, int len, int cr);

-extern int q921_transmit_uiframe(struct pri *pri, void *buf, int len);
+int q921_transmit_uiframe(struct q921_link *link, void *buf, int len);

 extern pri_event *q921_dchannel_up(struct pri *pri);

--- a/pri_q931.h
+++ b/pri_q931.h
@@ -450,13 +450,11 @@ enum Q931_RANKED_CALL_STATE {

 extern int maintenance_service(struct pri *pri, int span, int channel, int changestatus);

-extern int maintenance_service_ack(struct pri *pri, q931_call *call);
-

 /* Q.SIG specific */
 #define QSIG_IE_TRANSIT_COUNT		0x31

-extern int q931_receive(struct pri *pri, int tei, q931_h *h, int len);
+int q931_receive(struct q921_link *link, q931_h *h, int len);

 extern int q931_alerting(struct pri *pri, q931_call *call, int channel, int info);

@@ -491,8 +489,7 @@ extern int q931_call_getcrv(struct pri *pri, q931_call *call, int *callmode);

 extern int q931_call_setcrv(struct pri *pri, q931_call *call, int crv, int callmode);

-struct q931_call *q931_find_call(struct pri *ctrl, int cr);
-struct q931_call *q931_new_call(struct pri *pri);
+struct q931_call *q931_new_call(struct pri *ctrl);

 extern int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req);

@@ -502,7 +499,15 @@ void q931_dump(struct pri *ctrl, int tei, q931_h *h, int len, int txrx);

 void q931_destroycall(struct pri *pri, q931_call *c);

-extern void q931_dl_indication(struct pri *pri, int event);
+enum Q931_DL_EVENT {
+	Q931_DL_EVENT_NONE,
+	Q931_DL_EVENT_DL_ESTABLISH_IND,
+	Q931_DL_EVENT_DL_ESTABLISH_CONFIRM,
+	Q931_DL_EVENT_DL_RELEASE_IND,
+	Q931_DL_EVENT_DL_RELEASE_CONFIRM,
+	Q931_DL_EVENT_TEI_REMOVAL,
+};
+void q931_dl_event(struct q921_link *link, enum Q931_DL_EVENT event);

 int q931_send_hold(struct pri *ctrl, struct q931_call *call);
 int q931_send_hold_ack(struct pri *ctrl, struct q931_call *call);
--- a/prisched.c
+++ b/prisched.c
@@ -112,9 +112,6 @@ int pri_schedule_event(struct pri *ctrl, int ms, void (*function)(void *data), v
 	unsigned x;
 	struct timeval tv;

-	/* Scheduling runs on master channels only */
-	ctrl = PRI_MASTER(ctrl);
-
 	max_used = ctrl->sched.max_used;
 	for (x = 0; x < max_used; ++x) {
 		if (!ctrl->sched.timer[x].callback) {
@@ -156,9 +153,6 @@ struct timeval *pri_schedule_next(struct pri *ctrl)
 	struct timeval *closest = NULL;
 	unsigned x;

-	/* Scheduling runs on master channels only */
-	ctrl = PRI_MASTER(ctrl);
-
 	/* Scan the scheduled timer slots backwards so we can update the max_used value. */
 	for (x = ctrl->sched.max_used; x--;) {
 		if (ctrl->sched.timer[x].callback) {
@@ -196,9 +190,6 @@ static pri_event *__pri_schedule_run(struct pri *ctrl, struct timeval *tv)
 	void (*callback)(void *);
 	void *data;

-	/* Scheduling runs on master channels only */
-	ctrl = PRI_MASTER(ctrl);
-
 	max_used = ctrl->sched.max_used;
 	for (x = 0; x < max_used; ++x) {
 		if (ctrl->sched.timer[x].callback
@@ -246,9 +237,6 @@ pri_event *pri_schedule_run(struct pri *ctrl)
 */
 void pri_schedule_del(struct pri *ctrl, int id)
 {
-	/* Scheduling runs on master channels only */
-	ctrl = PRI_MASTER(ctrl);
-
 	if (0 < id && id <= ctrl->sched.num_slots) {
 		ctrl->sched.timer[id - 1].callback = NULL;
 	} else if (id) {
@@ -256,3 +244,29 @@ void pri_schedule_del(struct pri *ctrl, int id)
 			ctrl->sched.num_slots);
 	}
 }
+
+/*!
+ * \brief Is the scheduled event this callback.
+ *
+ * \param ctrl D channel controller.
+ * \param id Scheduled event id to check.
+ * 0 is a disabled/unscheduled event id.
+ * 1 - MAX_SCHED is a valid event id.
+ * \param function Callback function to call when timeout.
+ * \param data Value to give callback function when timeout.
+ *
+ * \return TRUE if scheduled event has the callback.
+ */
+int pri_schedule_check(struct pri *ctrl, int id, void (*function)(void *data), void *data)
+{
+	if (0 < id && id <= ctrl->sched.num_slots) {
+		if (ctrl->sched.timer[id - 1].callback == function
+			&& ctrl->sched.timer[id - 1].data == data) {
+			return 1;
+		}
+	} else if (id) {
+		pri_error(ctrl, "Asked to check sched id %d??? num_slots=%d\n", id,
+			ctrl->sched.num_slots);
+	}
+	return 0;
+}
--- a/q921.c
+++ b/q921.c
--- a/q931.c
+++ b/q931.c
--- a/rose.c
+++ b/rose.c
@@ -761,6 +761,21 @@ static const struct rose_convert_error rose_etsi_errors[] = {
 /* ------------------------------------------------------------------- */


+/*
+ * Note the first value in oid.values[] is really the first two
+ * OID subidentifiers.  They are compressed using this formula:
+ * First_Value = (First_Subidentifier * 40) + Second_Subidentifier
+ */
+
+/*! \brief ECMA private-isdn-signalling-domain prefix. */
+static const struct asn1_oid rose_qsig_isdn_domain = {
+/* *INDENT-OFF* */
+	/* {iso(1) identified-organization(3) icd-ecma(12) private-isdn-signalling-domain(9)} */
+	3, { 43, 12, 9 }
+/* *INDENT-ON* */
+};
+
+
 /*! \brief Q.SIG specific invoke/result encode/decode message table */
 static const struct rose_convert_msg rose_qsig_msgs[] = {
 /* *INDENT-OFF* */
@@ -770,7 +785,7 @@ static const struct rose_convert_msg rose_qsig_msgs[] = {
 *			decode_invoke_args,                     decode_result_args
 */
 	/*
-	 * localValue's from Q.SIG Name-Operations
+	 * localValue's from Q.SIG Name-Operations 4th edition
 	 * { iso(1) standard(0) pss1-name(13868) name-operations(0) }
 	 */
 	{
@@ -794,6 +809,34 @@ static const struct rose_convert_msg rose_qsig_msgs[] = {
 			rose_dec_qsig_BusyName_ARG,				NULL
 	},

+	/*
+	 * globalValue's (OIDs) from Q.SIG Name-Operations 2nd edition
+	 * { iso(1) identified-organization(3) icd-ecma(12) standard(0) qsig-name(164) name-operations(0) }
+	 *
+	 * This older version of the Q.SIG switch is not supported.
+	 * However, we will accept receiving these messages anyway.
+	 */
+	{
+		ROSE_QSIG_CallingName,						&rose_qsig_isdn_domain, 0,
+			rose_enc_qsig_CallingName_ARG,			NULL,
+			rose_dec_qsig_CallingName_ARG,			NULL
+	},
+	{
+		ROSE_QSIG_CalledName,						&rose_qsig_isdn_domain, 1,
+			rose_enc_qsig_CalledName_ARG,			NULL,
+			rose_dec_qsig_CalledName_ARG,			NULL
+	},
+	{
+		ROSE_QSIG_ConnectedName,					&rose_qsig_isdn_domain, 2,
+			rose_enc_qsig_ConnectedName_ARG,		NULL,
+			rose_dec_qsig_ConnectedName_ARG,		NULL
+	},
+	{
+		ROSE_QSIG_BusyName,							&rose_qsig_isdn_domain, 3,
+			rose_enc_qsig_BusyName_ARG,				NULL,
+			rose_dec_qsig_BusyName_ARG,				NULL
+	},
+
 	/*
 	 * localValue's from Q.SIG SS-AOC-Operations
 	 * { iso(1) standard(0) pss1-advice-of-charge(15050) advice-of-charge-operations(0) }
--- a/rosetest.c
+++ b/rosetest.c
@@ -2837,6 +2837,42 @@ static unsigned char rose_qsig_name_alt_encode_msg[] = {
 /* *INDENT-ON* */
 };

+static unsigned char rose_qsig_name_2nd_encode_msg[] = {
+/* *INDENT-OFF* */
+/*
+ *	Context Specific/C [10 0x0A] <AA> Len:6 <06>
+ *		Context Specific [0 0x00] <80> Len:1 <01>
+ *			<00> - "~"
+ *		Context Specific [2 0x02] <82> Len:1 <01>
+ *			<00> - "~"
+ *	Context Specific [11 0x0B] <8B> Len:1 <01>
+ *		<00> - "~"
+ *	Context Specific/C [1 0x01] <A1> Len:26 <1A>
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<40> - "@"
+ *		OID(6 0x06) <06> Len:4 <04>
+ *			<2B 0C 09 00> - "+~~~"
+ *		Context Specific [0 0x00] <80> Len:15 <0F>
+ *			<4D 6F 64 65 6D 20 44 69-73 63 6F 42 61 6C 6C> - "Modem DiscoBall"
+ */
+	0x91,
+	0xaa, 0x06,
+		0x80, 0x01,
+			0x00,
+		0x82, 0x01,
+			0x00,
+		0x8b, 0x01,
+			0x00,
+	0xa1, 0x1a,
+		0x02, 0x01,
+			0x40,
+		0x06, 0x04,
+			0x2b, 0x0c, 0x09, 0x00,
+		0x80, 0x0f,
+			0x4d, 0x6f, 0x64, 0x65, 0x6d, 0x20, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x42, 0x61, 0x6c, 0x6c
+/* *INDENT-ON* */
+};
+

 static const struct rose_message rose_dms100_msgs[] = {
 /* *INDENT-OFF* */
@@ -3023,6 +3059,7 @@ int main(int argc, char *argv[])
 {
 	unsigned index;
 	unsigned offset;
+	const char *str;
 	static struct pri dummy_ctrl;

 	pri_set_message(rose_pri_message);
@@ -3131,12 +3168,20 @@ int main(int argc, char *argv[])
 	rose_test_exception(&dummy_ctrl, "Alternate name encoded messages",
 		rose_qsig_name_alt_encode_msg, sizeof(rose_qsig_name_alt_encode_msg));

+	rose_test_exception(&dummy_ctrl, "2nd edition name encoded messages",
+		rose_qsig_name_2nd_encode_msg, sizeof(rose_qsig_name_2nd_encode_msg));
+
 /* ------------------------------------------------------------------- */

 	pri_message(&dummy_ctrl, "\n\n"
 		"List of operation codes:\n");
 	for (index = 0; index < ROSE_Num_Operation_Codes; ++index) {
-		pri_message(&dummy_ctrl, "%d: %s\n", index, rose_operation2str(index));
+		str = rose_operation2str(index);
+		if (!strncmp(str, "Invalid code:", 13)) {
+			pri_error(&dummy_ctrl, "%d: %s\n", index, str);
+		} else {
+			pri_message(&dummy_ctrl, "%d: %s\n", index, str);
+		}
 	}
 	pri_message(&dummy_ctrl, "\n\n"
 		"************************************************************\n");
@@ -3146,7 +3191,12 @@ int main(int argc, char *argv[])
 	pri_message(&dummy_ctrl, "\n\n"
 		"List of error codes:\n");
 	for (index = 0; index < ROSE_ERROR_Num_Codes; ++index) {
-		pri_message(&dummy_ctrl, "%d: %s\n", index, rose_error2str(index));
+		str = rose_error2str(index);
+		if (!strncmp(str, "Invalid code:", 13)) {
+			pri_error(&dummy_ctrl, "%d: %s\n", index, str);
+		} else {
+			pri_message(&dummy_ctrl, "%d: %s\n", index, str);
+		}
 	}
 	pri_message(&dummy_ctrl, "\n\n"
 		"************************************************************\n");