Drop incorrect summary files.

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.11.5@2142 2fbb986a-6c06-0410-b554-c9c1f0a7f128
Importing release summary for 1.4.11.5 release.
2010-11-18 21:02:58 +00:00 · 2010-11-18 20:24:34 +00:00 · 2010-11-17 21:52:46 +00:00 · 2010-11-17 21:32:40 +00:00 · 2010-11-17 21:30:31 +00:00 · 2010-11-17 21:28:12 +00:00
12 changed files with 2738 additions and 1193 deletions
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.11
+1.4.11.5
--- a/328
+++ b/328
@@ -1,3 +1,331 @@
+2010-11-17 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.5 released.
+
+2010-11-17 21:32 +0000 [r2131-2139]  Richard Mudgett <rmudgett@digium.com>
+
+	* q921.c: Merged revision 2101 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r2101 | rmudgett | 2010-11-05 14:24:01 -0500 (Fri, 05 Nov 2010) |
+	  9 lines Remove all TEIs when NT PTMP starts. Remove all TEIs when
+	  a NT PTMP link is started and there are no other links to make
+	  sure there are no devices that think they have a TEI. A device
+	  may think it has a TEI if the upper layer program is restarted or
+	  the system reboots. This fixes the bug portion of JIRA
+	  LIBPRI-51/SWP-2453. ..........
+
+	* q921.c: Merged revision 2088 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r2088 | rmudgett | 2010-11-02 14:11:01 -0500 (Tue, 02 Nov 2010) |
+	  14 lines B410P gets incoming call packets on ISDN but Asterisk
+	  doesn't see the call. The Cisco 1751 with VIC 2-BRI ports sends
+	  out SETUP messages on the broadcast TEI as if the BRI were PTMP
+	  even though it is configured for PTP mode. Make PTP mode also
+	  accept frames on SAPI=0, TEI=127 (Broadcast). (closes issue
+	  #18232) Reported by: lelio Patches: issue18232_v1.4.patch
+	  uploaded by rmudgett (license 664) Tested by: lelio ..........
+
+	* q931.c: Merged revision 2021 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r2021 | rmudgett | 2010-10-14 13:35:48 -0500 (Thu, 14 Oct 2010) |
+	  10 lines Crash when receiving an unknown/unsupported message
+	  type. Fix double free of a call record and the subsequent
+	  continued use of the freed call record when receiving an
+	  unsupported/unknown message type. (closes issue #17968) Reported
+	  by: gelo Patches: issue_17968_v1.4.patch uploaded by rmudgett
+	  (license 664) issue_17968_v1.4.11.4.patch uploaded by rmudgett
+	  (license 664) ..........
+
+	* q931.c, pri_facility.c, pri.c, pri_internal.h: Merged revision
+	  2015 from https://origsvn.digium.com/svn/libpri/branches/1.4
+	  .......... r2015 | rmudgett | 2010-10-14 12:09:40 -0500 (Thu, 14
+	  Oct 2010) | 16 lines Segfault in pri_schedule_del() - ctrl value
+	  is invalid. Validate the given call pointer in libpri API calls.
+	  If the call pointer is not an active call record then a complaint
+	  message is issued and the API call aborts. The call pointer is
+	  likely stale. This patch is defensive. More information is needed
+	  to figure out why Asterisk still has a call pointer during its
+	  hangup sequence. (closes issue #17522) (closes issue #18032)
+	  Reported by: schmoozecom Patches: issue_18032_v1.4.patch uploaded
+	  by rmudgett (license 664) issue_18032_v1.4.11.4.patch uploaded by
+	  rmudgett (license 664) Tested by: rmudgett ..........
+
+	* pri_q931.h, q921.c, q931.c: Merged revision 1991 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r1991 | rmudgett | 2010-09-13 16:21:37 -0500 (Mon, 13 Sep 2010) |
+	  9 lines PRI links do not retain active calls if the link comes
+	  back before T309 expires. The DL-ESTABLISH confirm event was not
+	  passed from Q.921 to Q.931 so Q.931 never cancelled the T309
+	  timer. Refactored q931_dl_tei_removal() and q931_dl_indication()
+	  into q931_dl_event() to allow the DL-ESTABLISH confirm/indication
+	  and DL-RELEASE confirm/indication events to be passed to Q.931.
+	  ..........
+
+	* pri_q931.h, q921.c, q931.c, prisched.c, pri.c, pri_internal.h:
+	  Merged revision 1982 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r1982 | rmudgett | 2010-09-13 11:07:24 -0500 (Mon, 13 Sep 2010) |
+	  18 lines BRI PTMP: Active channels not cleared when the interface
+	  goes down. If the connection to the terminal is lost while there
+	  are open channels on the interface, red alarm is reported, but
+	  the open channels are never cleared. Additionally, if you
+	  manually try to channel request hangup, Asterisk crashes. For
+	  PTMP, the T309 processing was not searching the call pool on the
+	  master control record. Additionally, for NT PTMP, the timeout
+	  events were not passed to the upper layer because the events were
+	  not put on the master control record where timer processing
+	  expects them. (closes issue #17865) Reported by: wimpy Patches:
+	  issue17865_v1.4.patch uploaded by rmudgett (license 664) Tested
+	  by: rmudgett, wimpy ..........
+
+	* q921.c, q931.c: Merged revision 1962 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r1962 | rmudgett | 2010-09-07 19:13:24 -0500 (Tue, 07 Sep 2010) |
+	  21 lines Made Q.921 delay events to Q.931 if the event could
+	  immediately generate response frames. Q.921 was passing a
+	  q931_dl_indication(up) event to Q.931 before it was finished
+	  processing the frame. The q931_dl_indication(up) event could
+	  immediately send STATUS messages in the Q.921 intermediate state
+	  that would then get stuck in the tx queue with an invalid N(S).
+	  Q.921 was passing i-frames to Q.931 before it was finished
+	  processing the frame. The i-frames could cause Q.931 to
+	  immediately generate a response message that may cause the peer
+	  to see the P/F bit as incorrect. Delayed passing
+	  q931_dl_indication(up) events and i-frames to Q.931 until Q.921
+	  has completed processing the frame event. (The Q.921 SDL diagrams
+	  were designed with this assumption.) (closes issue #17360)
+	  Reported by: shawkris Patches: issue17360_v1.4.patch uploaded by
+	  rmudgett (license 664) Tested by: shawkris, rmudgett ..........
+
+	* q931.c: Merged revision 1961 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r1961 | rmudgett | 2010-09-07 19:10:05 -0500 (Tue, 07 Sep 2010) |
+	  12 lines Prevent a CONNECT message from sending a CONNECT
+	  ACKNOWLEDGE in the wrong state. Filter the processing of the
+	  CONNECT message to prevent libpri from sending a CONNECT
+	  ACKNOWLEDGE when the call is in an inappropriate state. This can
+	  happen when we hang up an outgoing call after the other end has
+	  sent a CONNECT but before we have processed the CONNECT. (issue
+	  #17360) Reported by: shawkris Patches:
+	  issue17360_con_ack_v1.4.patch uploaded by rmudgett (license 664)
+	  ..........
+
+	* q931.c, pri.c: Merged revision 1955,1958 from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ..........
+	  r1955 | rmudgett | 2010-09-02 12:33:51 -0500 (Thu, 02 Sep 2010) |
+	  1 line Don't crash in __pri_new_tei() if a GR303 subchannel
+	  creation fails. .......... r1958 | rmudgett | 2010-09-07 18:13:04
+	  -0500 (Tue, 07 Sep 2010) | 1 line Balance curly braces in
+	  post_handle_q931_message(). ..........
+
+2010-08-30 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.4 released.
+
+2010-08-30 22:34 +0000 [r1939-1949]  Richard Mudgett <rmudgett@digium.com>
+
+	* q931.c, q921.c: Merged revisions 1923,1928-1929 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1923
+	  | rmudgett | 2010-08-30 14:31:46 -0500 (Mon, 30 Aug 2010) | 18
+	  lines Q.921 improvements from comparing Q.921 SDL diagrams with
+	  implementation. * Handle sending and receiving DM response frames
+	  as needed. * Added handling of received FRMR frames. * Completed
+	  implementation of Q921_AWAITING_RELEASE state. (State is
+	  currently unreachable since we have no API to initiate sending
+	  the DISC message.) * Better NT PTMP TEI allocation. * Reduced
+	  more ERROR level severity messages so users will stop panicking
+	  when they see ERROR. This is especially true for the Q.921
+	  MDL-ERROR messages. * Added better Q.921 visibility when normal
+	  debug message level is enabled. ........ r1928 | rmudgett |
+	  2010-08-30 15:30:59 -0500 (Mon, 30 Aug 2010) | 9 lines
+	  Q.921/Q.931 message debug output improvements. The Q.931 message
+	  decode debug output now will follow the correct Q.921 header
+	  decode if Q.921 message dumping is enabled. Also the Q.931
+	  message decode will happen when the message actually goes out on
+	  the line instead of when Q.931 passes the message to Q.921. Q.921
+	  may have to request a TEI, bring the connection up, or retransmit
+	  previous frames before it can actually send the new message.
+	  ........ r1929 | rmudgett | 2010-08-30 15:49:11 -0500 (Mon, 30
+	  Aug 2010) | 2 lines Reduced fake MDL-ERROR (Z) message severity
+	  to be visible only when debugging enabled. ........
+
+	* q921.c: Merged revisions 1918 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1918
+	  | rmudgett | 2010-08-30 12:53:33 -0500 (Mon, 30 Aug 2010) | 41
+	  lines ISDN BRI does not recover from line faults Q.921 was
+	  getting stuck in state 2 (Q921_ASSIGN_AWAITING_TEI). For some
+	  reason the network was removing the TEI. Libpri then immediately
+	  tried to get a new TEI assigned. The network did not reply to the
+	  N202(3) attempts to get a new TEI. Libpri then just gave up
+	  trying but did not leave the state. Some paths in Q.921 Figure
+	  B.3 were not implemented. Q.921 now transitions to the
+	  Q921_TEI_UNASSIGNED state when the N202 count is exceeded. Q.921
+	  will wait there until an incoming or outgoing call is attempted.
+	  * Fixed initializing the n202_counter. Not initializing the
+	  n202_counter would cause the Q921_TEI_IDENTITY_REQUEST to
+	  unexpectedly not go out and due to how state transitions were
+	  done, Q.921 would get stuck in the Q921_ASSIGN_AWAITING_TEI
+	  state. * Fixed start T202 timer fail causing Q.921 to get stuck
+	  in the Q921_ASSIGN_AWAITING_TEI state if the network did not
+	  respond to the request. * Fixed handling of
+	  Q921_TEI_IDENTITY_REMOVE to do the MDL-REMOVE primitive
+	  (q921_mdl_remove()) instead of transitioning directly to the
+	  Q921_TEI_UNASSIGNED state. Necessary state clean-up was not
+	  getting done. * Minor tweaks to q921_mdl_remove(). The worst
+	  problem was erroneously generating an error message. * Fixed
+	  potential for sending I-frames with an invalid TEI. The I-frame
+	  could have been queued when Q.921 did not have an assigned TEI. *
+	  Fixed testing of the q931_receive() return value when a UI-frame
+	  is received. (closes issue #17570) Reported by: jcovert Patches:
+	  issue17570_v1.4.11.3_v3.patch uploaded by rmudgett (license 664)
+	  issue17570_v1.4_v3.patch uploaded by rmudgett (license 664)
+	  Tested by: jcovert, rmudgett ........
+
+	* rose.c, rosetest.c: Merged revisions 1904 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1904
+	  | rmudgett | 2010-08-27 10:54:17 -0500 (Fri, 27 Aug 2010) | 15
+	  lines Add support to receive ECMA-164 2nd edition OID name ROSE
+	  messages. NOTE: To add support to send the old style name
+	  messages will require implementing them as new ROSE operation
+	  message types. NOTE: To actually use them would likely require
+	  implementing another version of the Q.SIG switch type. Like (NI1
+	  & NI2) and (4ess & 5ess) for example. Patches: libpri37.patch
+	  uploaded by rmudgett (license 664) JIRA SWP-2100 JIRA LIBPRI-37
+	  ........
+
+	* rosetest.c, pri.c, q921.c: Merged revisions 1878,1883-1884,1894
+	  via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1878
+	  | mattf | 2010-08-23 17:13:44 -0500 (Mon, 23 Aug 2010) | 1 line
+	  Add silly fake MDL error Z for kicking L2 to reactivate if a DISC
+	  or DM is received in proper states on PTP links. ........ r1883 |
+	  rmudgett | 2010-08-25 11:38:29 -0500 (Wed, 25 Aug 2010) | 2 lines
+	  Don't silently fail to post our fake MDL-ERROR(Z). ........ r1884
+	  | rmudgett | 2010-08-25 12:17:09 -0500 (Wed, 25 Aug 2010) | 2
+	  lines Added gripe check to rosetest for invalid operation and
+	  error codes. ........ r1894 | rmudgett | 2010-08-26 18:26:16
+	  -0500 (Thu, 26 Aug 2010) | 1 line Make pri_dump_event() only
+	  print the event name. ........
+
+	* q931.c: Merged revisions 1853 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1853
+	  | rmudgett | 2010-08-06 13:35:35 -0500 (Fri, 06 Aug 2010) | 18
+	  lines No audio on inbound J1 calls. Incoming calls specifying the
+	  channel using a slot map could not negotiate a B channel
+	  correctly. Libpri historically has handled this as an any channel
+	  request. However, when chan_dahdi picked a new channel, libpri
+	  sent out the recorded slot map and not the new channel selected.
+	  Thus the two endpoints would be attached to different B channels
+	  and the parties would not hear anything or would hear the wrong
+	  parties. This patch restores the historical preference of sending
+	  out the channel id using the channel number method if a channel
+	  number is available. JIRA LIBPRI-35 Patches:
+	  libpri-35_v1.4.11.3.patch uploaded by rmudgett (license 664)
+	  libpri-35_v1.4.patch uploaded by rmudgett (license 664) Tested
+	  by: rmudgett ........
+
+	* q931.c, q921.c: Merged revisions 1848,1852 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1848
+	  | rmudgett | 2010-08-03 18:04:52 -0500 (Tue, 03 Aug 2010) | 11
+	  lines Improved Q.921/Q.931 debug output. * Debug output for a
+	  sent Q.931 message in TE PTMP now uses the best available TEI
+	  number instead of always using 127. It could still be wrong if
+	  layer 2 does not have a TEI assigned. * Q.921 debug output is
+	  grouped better so a decoded message is not split by a blank line.
+	  * The Q.921 state is also decoded to a name. ........ r1852 |
+	  rmudgett | 2010-08-06 13:22:39 -0500 (Fri, 06 Aug 2010) | 1 line
+	  Learn (AGAIN!) why state 7 and state 8 transitions were
+	  suppressed. ........
+
+	* q921.c: Merged revisions 1845 via svnmerge from
+	  https://origsvn.digium.com/svn/libpri/branches/1.4 ........ r1845
+	  | rmudgett | 2010-08-03 12:33:54 -0500 (Tue, 03 Aug 2010) | 10
+	  lines Q921_TIMER_RECOVERY SDL issue in q921_rnr_rx() Added
+	  missing code specified by Q.921 (Figure B.8 Page 85) when receive
+	  RNR in "Timer Recovery" state. (closes issue #16791) Reported by:
+	  alecdavis Patches: rnr_timer_recovery.diff.txt uploaded by
+	  alecdavis (license 585) ........
+
+	* rosetest.c, q921.c: Merged revisions 1829-1830,1842 via svnmerge
+	  from https://origsvn.digium.com/svn/libpri/branches/1.4 ........
+	  r1829 | rmudgett | 2010-07-16 12:15:07 -0500 (Fri, 16 Jul 2010) |
+	  1 line Added a libpri version output line as a sanity check for
+	  rosetest. ........ r1830 | rmudgett | 2010-07-16 12:20:21 -0500
+	  (Fri, 16 Jul 2010) | 1 line Only need to output one version of
+	  the version message. ........ r1842 | rmudgett | 2010-08-02
+	  13:47:10 -0500 (Mon, 02 Aug 2010) | 5 lines Renamed local struct
+	  pri *pri variables to struct pri *ctrl in q921.c. The context
+	  tagging for my editor is much happier now that the struct and the
+	  variable do not have the same name. (At least for this file.)
+	  ........
+
+	* rosetest.c, rose_qsig_name.c: Merged revisions 1828 via svnmerge
+	  from https://origsvn.digium.com/svn/libpri/branches/1.4 ........
+	  r1828 | rmudgett | 2010-07-16 11:37:07 -0500 (Fri, 16 Jul 2010) |
+	  18 lines Calling name not successfully processed on inbound QSIG
+	  PRI calls from Mitel PBX The alternate form of the Q.SIG Name
+	  sequence that allows manufacturer extensions for CallingName,
+	  CalledName, ConnectedName, and BusyName was not consuming the
+	  next ASN.1 tag. The code that processed the ASN.1 Name structure
+	  was then using a stale tag value. The stale tag value was then
+	  rejected with the "Did not expect" message. I have added a test
+	  case using the supplied PRI debug output to the rosetest utility
+	  to verify that this alternate encoding is tested in the future.
+	  (closes issue #17619) Reported by: jims8650 Patches:
+	  issue17619_v1.4.11.3.patch uploaded by rmudgett (license 664)
+	  Tested by: rmudgett ........
+
+2010-06-29 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.3 released.
+
+2010-06-29 11:17 +0000 [r1824]  Richard Mudgett <rmudgett@digium.com>
+
+	* pri_internal.h, q931.c: [regression] Calling Number assignment
+	  logic change in libpri 1.4.11. Restored the old behaviour if
+	  there is more than one calling number in the incoming SETUP
+	  message.  A network provided number is reported as ANI. (closes
+	  issue #17495) Reported by: ibercom Patches:
+	  issue_17495_v1.4.11.2.patch uploaded by rmudgett (license 664)
+	  issue_17495_v1.4.patch uploaded by rmudgett (license 664) Tested
+	  by: ibercom
+
+2010-06-02 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.2 released.
+
+2010-06-04 17:45 +0000 [r1810]  Richard Mudgett <rmudgett@digium.com>
+
+	* pri_facility.c: Q.SIG calling name in FACILITY message not
+	  reported to the upper layer. Q.SIG can send the CallingName,
+	  CalledName, and ConnectedName in stand alone FACILITY messages.
+	  If the CallingName was not sent in the SETUP message, the caller
+	  id name was not reported to the upper layer. (closes issue #17458)
+	  Reported by: jsmith Patches: issue17458_post_qsig_name.patch uploaded
+	  by rmudgett (license 664) issue17458_post_qsig_name_v1.4.11.1.patch
+	  uploaded by rmudgett (license 664) Tested by: rmudgett, jsmith
+
+2010-06-02 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.1 released.
+
+2010-06-02 11:26 +0000 [r1805-1806]  Richard Mudgett <rmudgett@digium.com>
+
+	* pri.c: Inband disconnect setting does nothing on BRI spans.
+	  The acceptinbanddisconnect flag is not inherited when creating
+	  a new TEI and thus rendering the setting (and its respective
+	  equivalent in Asterisk) a no-op on BRI setups. (closes issue
+	  #15265) Reported by: paravoid Patches: inband-bri.diff uploaded
+	  by paravoid (license 200) Tested by: paravoid
+
+	* q931.c, rose.c, rosetest.c: Multi component FACILITY messages
+	  only process the first component. The code was only processing
+	  the first ROSE component in the facility message. I also updated
+	  rosetest.c to have a multiple component ROSE message test.
+	  (closes issue #17428) Reported by: patrol-cz Patches:
+	  issue17428.patch uploaded by rmudgett (license 664) Tested by:
+	  rmudgett, patrol-cz
+
 2010-05-20 Russell Bryant <russell@digium.com>

 	* libpri 1.4.11 released.
--- a/pri.c
+++ b/pri.c
@@ -300,6 +300,7 @@ struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master,
 	pri_default_timers(p, switchtype);
 	if (master) {
 		pri_set_debug(p, master->debug);
+		pri_set_inbanddisconnect(p, master->acceptinbanddisconnect);
 		if (master->sendfacility)
 			pri_facility_enable(p);
 	}
@@ -323,7 +324,7 @@ struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master,
 		p->subchannel = __pri_new_tei(-1, node, PRI_SWITCH_GR303_EOC_PATH, p, NULL, NULL, NULL, Q921_TEI_GR303_EOC_PATH, 0);
 		if (!p->subchannel) {
 			free(p);
-			p = NULL;
+			return NULL;
 		}
 		break;
 	case PRI_SWITCH_GR303_TMC:
@@ -333,7 +334,7 @@ struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master,
 		p->subchannel = __pri_new_tei(-1, node, PRI_SWITCH_GR303_TMC_SWITCHING, p, NULL, NULL, NULL, Q921_TEI_GR303_TMC_SWITCHING, 0);
 		if (!p->subchannel) {
 			free(p);
-			p = NULL;
+			return NULL;
 		}
 		break;
 	case PRI_SWITCH_GR303_TMC_SWITCHING:
@@ -364,8 +365,15 @@ struct pri *__pri_new_tei(int fd, int node, int switchtype, struct pri *master,

 void pri_call_set_useruser(q931_call *c, const char *userchars)
 {
-	if (userchars)
-		libpri_copy_string(c->useruserinfo, userchars, sizeof(c->useruserinfo));
+	/*
+	 * There is a slight risk here if c is actually stale.  However,
+	 * if it is stale then it is better to catch it here than to
+	 * write with it.
+	 */
+	if (!userchars || !pri_is_call_valid(NULL, c)) {
+		return;
+	}
+	libpri_copy_string(c->useruserinfo, userchars, sizeof(c->useruserinfo));
 }

 void pri_sr_set_useruser(struct pri_sr *sr, const char *userchars)
@@ -433,32 +441,32 @@ char *pri_event2str(int id)
 		char *name;
 	} events[] = {
 /* *INDENT-OFF* */
-		{ PRI_EVENT_DCHAN_UP,       "D-Channel Up" },
-		{ PRI_EVENT_DCHAN_DOWN,     "D-channel Down" },
-		{ PRI_EVENT_RESTART,        "Restart channel" },
-		{ PRI_EVENT_CONFIG_ERR,     "Configuration Error" },
-		{ PRI_EVENT_RING,           "Ring" },
-		{ PRI_EVENT_HANGUP,         "Hangup" },
-		{ PRI_EVENT_RINGING,        "Ringing" },
-		{ PRI_EVENT_ANSWER,         "Answer" },
-		{ PRI_EVENT_HANGUP_ACK,     "Hangup ACK" },
-		{ PRI_EVENT_RESTART_ACK,    "Restart ACK" },
-		{ PRI_EVENT_FACILITY,       "Facility" },
-		{ PRI_EVENT_INFO_RECEIVED,  "Info Received" },
-		{ PRI_EVENT_PROCEEDING,     "Proceeding" },
-		{ PRI_EVENT_SETUP_ACK,      "Setup ACK" },
-		{ PRI_EVENT_HANGUP_REQ,     "Hangup Req" },
-		{ PRI_EVENT_NOTIFY,         "Notify" },
-		{ PRI_EVENT_PROGRESS,       "Progress" },
-		{ PRI_EVENT_KEYPAD_DIGIT,   "Keypad Digit" },
-		{ PRI_EVENT_SERVICE,        "Service" },
-		{ PRI_EVENT_SERVICE_ACK,    "Service ACK" },
-		{ PRI_EVENT_HOLD,           "Hold" },
-		{ PRI_EVENT_HOLD_ACK,       "Hold Ack" },
-		{ PRI_EVENT_HOLD_REJ,       "Hold Rej" },
-		{ PRI_EVENT_RETRIEVE,       "Retrieve" },
-		{ PRI_EVENT_RETRIEVE_ACK,   "Retrieve ACK" },
-		{ PRI_EVENT_RETRIEVE_REJ,   "Retrieve Rej" },
+		{ PRI_EVENT_DCHAN_UP,       "PRI_EVENT_DCHAN_UP" },
+		{ PRI_EVENT_DCHAN_DOWN,     "PRI_EVENT_DCHAN_DOWN" },
+		{ PRI_EVENT_RESTART,        "PRI_EVENT_RESTART" },
+		{ PRI_EVENT_CONFIG_ERR,     "PRI_EVENT_CONFIG_ERR" },
+		{ PRI_EVENT_RING,           "PRI_EVENT_RING" },
+		{ PRI_EVENT_HANGUP,         "PRI_EVENT_HANGUP" },
+		{ PRI_EVENT_RINGING,        "PRI_EVENT_RINGING" },
+		{ PRI_EVENT_ANSWER,         "PRI_EVENT_ANSWER" },
+		{ PRI_EVENT_HANGUP_ACK,     "PRI_EVENT_HANGUP_ACK" },
+		{ PRI_EVENT_RESTART_ACK,    "PRI_EVENT_RESTART_ACK" },
+		{ PRI_EVENT_FACILITY,       "PRI_EVENT_FACILITY" },
+		{ PRI_EVENT_INFO_RECEIVED,  "PRI_EVENT_INFO_RECEIVED" },
+		{ PRI_EVENT_PROCEEDING,     "PRI_EVENT_PROCEEDING" },
+		{ PRI_EVENT_SETUP_ACK,      "PRI_EVENT_SETUP_ACK" },
+		{ PRI_EVENT_HANGUP_REQ,     "PRI_EVENT_HANGUP_REQ" },
+		{ PRI_EVENT_NOTIFY,         "PRI_EVENT_NOTIFY" },
+		{ PRI_EVENT_PROGRESS,       "PRI_EVENT_PROGRESS" },
+		{ PRI_EVENT_KEYPAD_DIGIT,   "PRI_EVENT_KEYPAD_DIGIT" },
+		{ PRI_EVENT_SERVICE,        "PRI_EVENT_SERVICE" },
+		{ PRI_EVENT_SERVICE_ACK,    "PRI_EVENT_SERVICE_ACK" },
+		{ PRI_EVENT_HOLD,           "PRI_EVENT_HOLD" },
+		{ PRI_EVENT_HOLD_ACK,       "PRI_EVENT_HOLD_ACK" },
+		{ PRI_EVENT_HOLD_REJ,       "PRI_EVENT_HOLD_REJ" },
+		{ PRI_EVENT_RETRIEVE,       "PRI_EVENT_RETRIEVE" },
+		{ PRI_EVENT_RETRIEVE_ACK,   "PRI_EVENT_RETRIEVE_ACK" },
+		{ PRI_EVENT_RETRIEVE_REJ,   "PRI_EVENT_RETRIEVE_REJ" },
 /* *INDENT-ON* */
 	};

@@ -574,74 +582,83 @@ void pri_facility_enable(struct pri *pri)

 int pri_acknowledge(struct pri *pri, q931_call *call, int channel, int info)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_alerting(pri, call, channel, info);
 }

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

 	return q931_call_progress(pri, call, channel, info);
 }

 int pri_information(struct pri *pri, q931_call *call, char digit)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_information(pri, call, digit);
 }

 int pri_keypad_facility(struct pri *pri, q931_call *call, const char *digits)
 {
-	if (!pri || !call || !digits || !digits[0])
+	if (!pri || !pri_is_call_valid(pri, call) || !digits || !digits[0]) {
 		return -1;
+	}

 	return q931_keypad_facility(pri, call, digits);
 }

 int pri_notify(struct pri *pri, q931_call *call, int channel, int info)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_notify(pri, call, channel, info);
 }

 void pri_destroycall(struct pri *pri, q931_call *call)
 {
-	if (pri && call)
+	if (pri && pri_is_call_valid(pri, call)) {
 		q931_destroycall(pri, call);
-	return;
+	}
 }

 int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_setup_ack(pri, call, channel, nonisdn);
 }

 int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_connect(pri, call, channel, nonisdn);
 }

@@ -737,7 +754,7 @@ int pri_connected_line_update(struct pri *ctrl, q931_call *call, const struct pr
 	unsigned idx;
 	struct q931_call *subcall;

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

@@ -803,7 +820,7 @@ int pri_redirecting_update(struct pri *ctrl, q931_call *call, const struct pri_p
 	unsigned idx;
 	struct q931_call *subcall;

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

@@ -907,23 +924,31 @@ int pri_redirecting_update(struct pri *ctrl, q931_call *call, const struct pri_p
 /* deprecated routines, use pri_hangup */
 int pri_release(struct pri *pri, q931_call *call, int cause)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_release(pri, call, cause);
 }

 int pri_disconnect(struct pri *pri, q931_call *call, int cause)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	return q931_disconnect(pri, call, cause);
 }
 #endif

 int pri_channel_bridge(q931_call *call1, q931_call *call2)
 {
-	if (!call1 || !call2)
+	/*
+	 * There is a slight risk here if call1 or call2 is actually
+	 * stale.  However, if they are stale then it is better to catch
+	 * it here than to write with these pointers.
+	 */
+	if (!pri_is_call_valid(NULL, call1) || !pri_is_call_valid(NULL, call2)) {
 		return -1;
+	}

 	/* Make sure we have compatible switchtypes */
 	if (call1->pri->switchtype != call2->pri->switchtype)
@@ -975,8 +1000,9 @@ void pri_hangup_fix_enable(struct pri *ctrl, int enable)

 int pri_hangup(struct pri *pri, q931_call *call, int cause)
 {
-	if (!pri || !call)
+	if (!pri || !pri_is_call_valid(pri, call)) {
 		return -1;
+	}
 	if (cause == -1)
 		/* normal clear cause */
 		cause = PRI_CAUSE_NORMAL_CLEARING;
@@ -1018,26 +1044,6 @@ void pri_dump_event(struct pri *pri, pri_event *e)
 	if (!pri || !e)
 		return;
 	pri_message(pri, "Event type: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
-	switch(e->gen.e) {
-	case PRI_EVENT_DCHAN_UP:
-	case PRI_EVENT_DCHAN_DOWN:
-		break;
-	case PRI_EVENT_CONFIG_ERR:
-		pri_message(pri, "Error: %s", e->err.err);
-		break;
-	case PRI_EVENT_RESTART:
-		pri_message(pri, "Restart on channel %d\n", e->restart.channel);
-	case PRI_EVENT_RING:
-		pri_message(pri, "Calling number: %s (%s, %s)\n", e->ring.callingnum, pri_plan2str(e->ring.callingplan), pri_pres2str(e->ring.callingpres));
-		pri_message(pri, "Called number: %s (%s)\n", e->ring.callednum, pri_plan2str(e->ring.calledplan));
-		pri_message(pri, "Channel: %d (%s) Reference number: %d\n", e->ring.channel, e->ring.flexible ? "Flexible" : "Not Flexible", e->ring.cref);
-		break;
-	case PRI_EVENT_HANGUP:
-		pri_message(pri, "Hangup, reference number: %d, reason: %s\n", e->hangup.cref, pri_cause2str(e->hangup.cause));
-		break;
-	default:
-		pri_message(pri, "Don't know how to dump events of type %d\n", e->gen.e);
-	}
 }

 static void pri_sr_init(struct pri_sr *req)
@@ -1074,8 +1080,10 @@ int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan
 					int calledplan)
 {
 	struct pri_sr req;
-	if (!pri || !c)
+
+	if (!pri || !pri_is_call_valid(pri, c)) {
 		return -1;
+	}

 	pri_sr_init(&req);
 	pri_sr_set_connection_call_independent(&req);
@@ -1094,8 +1102,10 @@ int pri_mwi_deactivate(struct pri *pri, q931_call *c, char *caller, int callerpl
 					int calledplan)
 {
 	struct pri_sr req;
-	if (!pri || !c)
+
+	if (!pri || !pri_is_call_valid(pri, c)) {
 		return -1;
+	}

 	pri_sr_init(&req);
 	pri_sr_set_connection_call_independent(&req);
@@ -1112,8 +1122,9 @@ int pri_mwi_deactivate(struct pri *pri, q931_call *c, char *caller, int callerpl
 	
 int pri_setup(struct pri *pri, q931_call *c, struct pri_sr *req)
 {
-	if (!pri || !c)
+	if (!pri || !pri_is_call_valid(pri, c)) {
 		return -1;
+	}

 	return q931_setup(pri, c, req);
 }
@@ -1123,8 +1134,11 @@ int pri_call(struct pri *pri, q931_call *c, int transmode, int channel, int excl
 					int calledplan, int ulayer1)
 {
 	struct pri_sr req;
-	if (!pri || !c)
+
+	if (!pri || !pri_is_call_valid(pri, c)) {
 		return -1;
+	}
+
 	pri_sr_init(&req);
 	pri_sr_set_caller(&req, caller, callername, callerplan, callerpres);
 	pri_sr_set_called(&req, called, calledplan, 0);
@@ -1347,7 +1361,7 @@ char *pri_dump_info_str(struct pri *ctrl)
 			enum PRI_TIMERS_AND_COUNTERS tmr;

 			tmr = pri_timer[idx].number;
-			if (0 <= ctrl->timers[tmr] || tmr == PRI_TIMER_T309) {
+			if (0 <= ctrl->timers[tmr]) {
 				used = pri_snprintf(buf, used, buf_size, "  %s: %d\n",
 					pri_timer[idx].name, ctrl->timers[tmr]);
 			}
@@ -1363,18 +1377,27 @@ char *pri_dump_info_str(struct pri *ctrl)

 int pri_get_crv(struct pri *pri, q931_call *call, int *callmode)
 {
+	if (!pri || !pri_is_call_valid(pri, call)) {
+		return -1;
+	}
 	return q931_call_getcrv(pri, call, callmode);
 }

 int pri_set_crv(struct pri *pri, q931_call *call, int crv, int callmode)
 {
+	if (!pri || !pri_is_call_valid(pri, call)) {
+		return -1;
+	}
 	return q931_call_setcrv(pri, call, crv, callmode);
 }

 void pri_enslave(struct pri *master, struct pri *slave)
 {
-	if (master && slave)
+	if (master && slave) {
 		slave->callpool = &master->localpool;
+		slave->nfas = 1;
+		master->nfas = 1;
+	}
 }

 struct pri_sr *pri_sr_new(void)
@@ -1513,7 +1536,7 @@ void pri_hold_enable(struct pri *ctrl, int enable)

 int pri_hold(struct pri *ctrl, q931_call *call)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_hold(ctrl, call);
@@ -1521,7 +1544,7 @@ int pri_hold(struct pri *ctrl, q931_call *call)

 int pri_hold_ack(struct pri *ctrl, q931_call *call)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_hold_ack(ctrl, call);
@@ -1529,7 +1552,7 @@ int pri_hold_ack(struct pri *ctrl, q931_call *call)

 int pri_hold_rej(struct pri *ctrl, q931_call *call, int cause)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_hold_rej(ctrl, call, cause);
@@ -1537,7 +1560,7 @@ int pri_hold_rej(struct pri *ctrl, q931_call *call, int cause)

 int pri_retrieve(struct pri *ctrl, q931_call *call, int channel)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_retrieve(ctrl, call, channel);
@@ -1545,7 +1568,7 @@ int pri_retrieve(struct pri *ctrl, q931_call *call, int channel)

 int pri_retrieve_ack(struct pri *ctrl, q931_call *call, int channel)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_retrieve_ack(ctrl, call, channel);
@@ -1553,7 +1576,7 @@ int pri_retrieve_ack(struct pri *ctrl, q931_call *call, int channel)

 int pri_retrieve_rej(struct pri *ctrl, q931_call *call, int cause)
 {
-	if (!ctrl || !call) {
+	if (!ctrl || !pri_is_call_valid(ctrl, call)) {
 		return -1;
 	}
 	return q931_send_retrieve_rej(ctrl, call, cause);
@@ -1561,8 +1584,9 @@ int pri_retrieve_rej(struct pri *ctrl, q931_call *call, int cause)

 int pri_callrerouting_facility(struct pri *pri, q931_call *call, const char *dest, const char* original, const char* reason)
 {
-	if (!pri || !call || !dest)
+	if (!pri || !pri_is_call_valid(pri, call) || !dest) {
 		return -1;
+	}

 	return qsig_cf_callrerouting(pri, call, dest, original, reason);
 }
@@ -1581,7 +1605,7 @@ int pri_reroute_call(struct pri *ctrl, q931_call *call, const struct pri_party_i
 	struct q931_party_id local_caller;
 	struct q931_party_redirecting reroute;

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

--- a/pri_facility.c
+++ b/pri_facility.c
@@ -3180,7 +3180,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;
 	}

@@ -3745,25 +3745,65 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		/* CallingName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.CallingName.name);
+
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The caller name will automatically be reported. */
+			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
+		}
 		break;
 	case ROSE_QSIG_CalledName:
 		/* CalledName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.CalledName.name);

-		/* Setup connected line subcommand */
-		subcmd = q931_alloc_subcommand(ctrl);
-		if (!subcmd) {
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The called name will automatically be reported. */
 			pri_error(ctrl, "ERROR: Too many facility subcommands\n");
 			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
 		}
-		subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
-		q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
 		break;
 	case ROSE_QSIG_ConnectedName:
 		/* ConnectedName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.ConnectedName.name);
+
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The connected line name will automatically be reported. */
+			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
+		}
 		break;
 #if 0	/* Not handled yet */
 	case ROSE_QSIG_BusyName:
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -84,6 +84,7 @@ struct pri {
 	int sapi;
 	int tei;
 	int protodisc;
+	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;
@@ -458,6 +459,8 @@ struct q931_call {
 	 *    (Caller-ID for answered or connected-line for originated calls.)
 	 */
 	struct q931_party_id remote_id;
+	/*! \brief Automatic Number Identification (ANI) */
+	struct q931_party_number ani;

 	/*!
 	 * \brief Staging place for the Q.931 redirection number ie.
@@ -540,11 +543,26 @@ struct d_ctrl_dummy {
 	struct q931_call dummy_call;
 };

+/*!
+ * \brief Check if the given call ptr is valid.
+ *
+ * \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(ctrl, call, __PRETTY_FUNCTION__, __LINE__)
+
+int q931_is_call_valid(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);

--- a/pri_q931.h
+++ b/pri_q931.h
@@ -494,7 +494,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 pri *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
@@ -184,3 +184,31 @@ void pri_schedule_del(struct pri *ctrl, int id)
 		pri_error(ctrl, "Asked to delete sched id %d???\n", id);
 	}
 }
+
+/*!
+ * \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)
+{
+	/* Scheduling runs on master channels only */
+	ctrl = PRI_MASTER(ctrl);
+
+	if (0 < id && id <= MAX_SCHED) {
+		if (ctrl->pri_sched[id - 1].callback == function
+			&& ctrl->pri_sched[id - 1].data == data) {
+			return 1;
+		}
+	} else if (id) {
+		pri_error(ctrl, "Asked to check sched id %d???\n", id);
+	}
+	return 0;
+}
--- a/q921.c
+++ b/q921.c
--- a/q931.c
+++ b/q931.c
--- a/rose.c
+++ b/rose.c
@@ -470,6 +470,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* */
@@ -479,7 +494,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) }
 	 */
 	{
@@ -503,6 +518,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) }
@@ -2241,13 +2284,6 @@ const unsigned char *rose_decode(struct pri *ctrl, const unsigned char *pos,
 		return NULL;
 	}

-	if (pos < end) {
-		if (ctrl->debug & PRI_DEBUG_APDU) {
-			pri_message(ctrl, "  %u byte(s) of trailing data not consumed.\n",
-				(unsigned) (end - pos));
-		}
-	}
-
 	return pos;
 }

--- a/rose_qsig_name.c
+++ b/rose_qsig_name.c
@@ -382,6 +382,7 @@ static const unsigned char *rose_dec_qsig_PartyName_ARG_Backend(struct pri *ctrl
 		ASN1_CALL(pos, asn1_dec_length(pos, end, &length));
 		ASN1_END_SETUP(seq_end, seq_offset, length, pos, end);

+		ASN1_CALL(pos, asn1_dec_tag(pos, seq_end, &tag));
 		ASN1_CALL(pos, rose_dec_qsig_Name(ctrl, "name", tag, pos, seq_end,
 			&party->name));

--- a/rosetest.c
+++ b/rosetest.c
@@ -994,7 +994,6 @@ static unsigned char rose_etsi_indefinite_len[] = {
 			0x00, 0x00,
 			0x05, 0x00,
 		0x00, 0x00,
-	0x00, 0x00,
 	0x00, 0x00
 /* *INDENT-ON* */
 };
@@ -1039,7 +1038,6 @@ static unsigned char rose_etsi_unused_indefinite_len[] = {
 			0x00, 0x00,
 			0x05, 0x00,
 		0x00, 0x00,
-	0x00, 0x00,
 	0x00, 0x00
 /* *INDENT-ON* */
 };
@@ -1076,45 +1074,7 @@ static unsigned char rose_etsi_unused[] = {
 			0x30, 0x06,
 				0x84, 0x04,
 					0x31, 0x38, 0x30, 0x33,
-			0x05, 0x00,
-	0x00, 0x00
-/* *INDENT-ON* */
-};
-
-static unsigned char rose_etsi_extra[] = {
-/* *INDENT-OFF* */
-/*
- *	Context Specific/C [1 0x01] <A1> Len:24 <18>
- *		Integer(2 0x02) <02> Len:1 <01>
- *			<44>
- *		Integer(2 0x02) <02> Len:1 <01>
- *			<07>
- *		Sequence/C(48 0x30) <30> Len:16 <10>
- *			Enumerated(10 0x0A) <0A> Len:1 <01>
- *				<01>
- *			Enumerated(10 0x0A) <0A> Len:1 <01>
- *				<05>
- *			Sequence/C(48 0x30) <30> Len:6 <06>
- *				Context Specific [4 0x04] <84> Len:4 <04>
- *					<31 38 30 33>
- *			NULL(5 0x05) <05> Len:0 <00>
- */
-	0x91,
-	0xA1, 0x18,
-		0x02, 0x01,
-			0x44,
-		0x02, 0x01,
-			0x07,
-		0x30, 0x10,
-			0x0A, 0x01,
-				0x01,
-			0x0A, 0x01,
-				0x05,
-			0x30, 0x06,
-				0x84, 0x04,
-					0x31, 0x38, 0x30, 0x33,
-			0x05, 0x00,
-	0x00, 0x00
+			0x05, 0x00
 /* *INDENT-ON* */
 };

@@ -2116,6 +2076,136 @@ static const struct rose_message rose_qsig_msgs[] = {
 /* *INDENT-ON* */
 };

+static unsigned char rose_qsig_multiple_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:16 <10>
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<01> - "~"
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<55> - "U"
+ *		Sequence/C(48 0x30) <30> Len:8 <08>
+ *			Context Specific [2 0x02] <82> Len:3 <03>
+ *				<01 30 40> - "~0@"
+ *			Context Specific [6 0x06] <86> Len:1 <01>
+ *				<01> - "~"
+ *	Context Specific/C [1 0x01] <A1> Len:19 <13>
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<02> - "~"
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<00> - "~"
+ *		Context Specific [0 0x00] <80> Len:11 <0B>
+ *			<4D 6F 64 65 6D 20 44 69-73 63 6F> - "Modem Disco"
+ */
+	0x9f,
+	0xaa, 0x06,
+		0x80, 0x01,
+			0x00,
+		0x82, 0x01,
+			0x00,
+		0x8b, 0x01,
+			0x00,
+	0xa1, 0x10,
+		0x02, 0x01,
+			0x01,
+		0x02, 0x01,
+			0x55,
+		0x30, 0x08,
+			0x82, 0x03,
+				0x01, 0x30, 0x40,
+			0x86, 0x01,
+				0x01,
+	0xa1, 0x13,
+		0x02, 0x01,
+			0x02,
+		0x02, 0x01,
+			0x00,
+		0x80, 0x0b,
+			0x4d, 0x6f, 0x64, 0x65, 0x6d, 0x20, 0x44, 0x69, 0x73, 0x63, 0x6f
+/* *INDENT-ON* */
+};
+
+static unsigned char rose_qsig_name_alt_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:21 <15>
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<1D> - "~"
+ *		Integer(2 0x02) <02> Len:1 <01>
+ *			<00> - "~"
+ *		Sequence/C(48 0x30) <30> Len:13 <0D>
+ *			Context Specific [0 0x00] <80> Len:11 <0B>
+ *				<55 54 49 4C 49 54 59 20-54 45 4C> - "UTILITY TEL"
+ */
+	0x9F,
+	0xAA, 0x06,
+		0x80, 0x01,
+			0x00,
+		0x82, 0x01,
+			0x00,
+		0x8B, 0x01,
+			0x00,
+	0xA1, 0x15,
+		0x02, 0x01,
+			0x1D,
+		0x02, 0x01,
+			0x00,
+		0x30, 0x0D,
+			0x80, 0x0B,
+				0x55, 0x54, 0x49, 0x4C, 0x49, 0x54, 0x59, 0x20, 0x54, 0x45, 0x4C
+/* *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* */
@@ -2223,17 +2313,22 @@ static void rose_test_msg(struct pri *ctrl, unsigned index,
 			if (!dec_pos) {
 				pri_error(ctrl, "Error: Message:%u failed to decode header\n", index);
 			} else {
-				dec_pos = rose_decode(ctrl, dec_pos, dec_end, &decoded_msg);
-				if (!dec_pos) {
-					pri_error(ctrl, "Error: Message:%u failed to decode ROSE\n", index);
-				} else {
-					if (header
-						&& memcmp(header, &decoded_header, sizeof(decoded_header))) {
-						pri_error(ctrl, "Error: Message:%u Header did not match\n",
+				while (dec_pos < dec_end) {
+					dec_pos = rose_decode(ctrl, dec_pos, dec_end, &decoded_msg);
+					if (!dec_pos) {
+						pri_error(ctrl, "Error: Message:%u failed to decode ROSE\n",
 							index);
-					}
-					if (memcmp(encode_msg, &decoded_msg, sizeof(decoded_msg))) {
-						pri_error(ctrl, "Error: Message:%u ROSE did not match\n", index);
+						break;
+					} else {
+						if (header
+							&& memcmp(header, &decoded_header, sizeof(decoded_header))) {
+							pri_error(ctrl, "Error: Message:%u Header did not match\n",
+								index);
+						}
+						if (memcmp(encode_msg, &decoded_msg, sizeof(decoded_msg))) {
+							pri_error(ctrl, "Error: Message:%u ROSE did not match\n",
+								index);
+						}
 					}
 				}
 			}
@@ -2271,9 +2366,12 @@ static void rose_test_exception(struct pri *ctrl, const char *name,
 	if (!pos) {
 		pri_error(ctrl, "Error: %s test: Message failed to decode header\n", name);
 	} else {
-		pos = rose_decode(ctrl, pos, end, &decoded_msg);
-		if (!pos) {
-			pri_error(ctrl, "Error: %s test: Message failed to decode ROSE\n", name);
+		while (pos < end) {
+			pos = rose_decode(ctrl, pos, end, &decoded_msg);
+			if (!pos) {
+				pri_error(ctrl, "Error: %s test: Message failed to decode ROSE\n", name);
+				break;
+			}
 		}
 	}

@@ -2294,6 +2392,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);
@@ -2302,6 +2401,9 @@ int main(int argc, char *argv[])
 	memset(&dummy_ctrl, 0, sizeof(dummy_ctrl));
 	dummy_ctrl.debug = PRI_DEBUG_APDU;

+	/* For sanity specify what version of libpri we are testing. */
+	pri_error(&dummy_ctrl, "libpri version tested: %s\n", pri_get_version());
+
 	offset = 0;
 	pri_message(&dummy_ctrl, "Encode/decode message(s)\n");
 	if (argc <= 1) {
@@ -2382,30 +2484,37 @@ int main(int argc, char *argv[])

 	dummy_ctrl.switchtype = PRI_SWITCH_EUROISDN_E1;

-	rose_test_exception(&dummy_ctrl, "Extra bytes on end", rose_etsi_extra,
-		sizeof(rose_etsi_extra));
-
 	rose_test_exception(&dummy_ctrl, "Indefinite length", rose_etsi_indefinite_len,
-		sizeof(rose_etsi_indefinite_len) - 2);
-	rose_test_exception(&dummy_ctrl, "Indefinite length (extra)",
-		rose_etsi_indefinite_len, sizeof(rose_etsi_indefinite_len));
+		sizeof(rose_etsi_indefinite_len));

 	rose_test_exception(&dummy_ctrl, "Unused components (indefinite length)",
-		rose_etsi_unused_indefinite_len, sizeof(rose_etsi_unused_indefinite_len) - 2);
-	rose_test_exception(&dummy_ctrl, "Unused components (indefinite length, extra)",
 		rose_etsi_unused_indefinite_len, sizeof(rose_etsi_unused_indefinite_len));

 	rose_test_exception(&dummy_ctrl, "Unused components", rose_etsi_unused,
-		sizeof(rose_etsi_unused) - 2);
-	rose_test_exception(&dummy_ctrl, "Unused components (extra)", rose_etsi_unused,
 		sizeof(rose_etsi_unused));

+	dummy_ctrl.switchtype = PRI_SWITCH_QSIG;
+
+	rose_test_exception(&dummy_ctrl, "Multiple component messages",
+		rose_qsig_multiple_msg, sizeof(rose_qsig_multiple_msg));
+
+	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");
@@ -2415,7 +2524,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");
@@ -1 +1 @@
 .4.11
 .4.11.5