Importing files for 1.4.6 release

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.6@593 2fbb986a-6c06-0410-b554-c9c1f0a7f128

.version

@@ -1 +1 @@
-1.4.4
+1.4.6

ChangeLog

@@ -1,3 +1,42 @@
+2008-07-22 Kevin P. Fleming <kpfleming@digium.com>
+
+	* Libpri 1.4.6 released.
+
+2008-07-22 19:43 +0000 [r589]  Kevin P. Fleming <kpfleming@digium.com>
+
+	* pri.c, pri_internal.h, q931.c, libpri.h: rename API call and
+	  option (nothing has been released to use it yet so this should be
+	  safe) to be more accurate in describing what it does (closes
+	  issue #13042)
+
+2008-07-11 Jason Parker <jparker@digium.com>
+
+	* Libpri 1.4.5 released.
+
+2008-07-11 16:44 +0000 [r574-579]  Kevin P. Fleming <kpfleming@digium.com>
+
+	* /: ignore generated files
+
+	* pri.c, pri_internal.h, q931.c, libpri.h: modify work done for
+	  issue #10552, making the support of inband audio after RELEASE a
+	  configurable option, since it is causing problems for a number of
+	  users (closes issue #13042)
+
+2008-06-04 17:02 +0000 [r562]  Dwayne M. Hubbard <dhubbard@digium.com>
+
+	* q931.c: While working on issue 3450 I noticed that the
+	  information channel selection field in the channel identification
+	  IE was displayed incorrectly when using 'pri intense debug'. I
+	  wanted another pair of eyes to look at the code because
+	  everything looked correct until Shaun Ruffell noticed the missing
+	  comma in the msg_chan_sel array.
+
+2008-05-07 19:51 +0000 [r557]  Matthew Fredrickson <creslin@digium.com>
+
+	* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
+	  q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
+	  pri_facility.h, libpri.h: Moving trunk changes back into 1.4
+
 2008-05-07 Matthew Fredrickson <creslin@digium.com>
 
 	* Libpri 1.4.4 released.

libpri.h

@@ -624,6 +624,9 @@ int pri_progress(struct pri *pri, q931_call *c, int channel, int info);
 /* Send call proceeding */
 int pri_proceeding(struct pri *pri, q931_call *c, int channel, int info);
 
+/* Enable inband progress when a RELEASE is received */
+void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable);
+
 /* Enslave a PRI to another, so they share the same call list
    (and maybe some timers) */
 void pri_enslave(struct pri *master, struct pri *slave);

pri.c

@@ -782,6 +782,11 @@ void pri_set_overlapdial(struct pri *pri,int state)
 	pri->overlapdial = state;
 }
 
+void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable)
+{
+	pri->acceptinbanddisconnect = (enable != 0);
+}
+
 int pri_fd(struct pri *pri)
 {
 	return pri->fd;

pri_internal.h

@@ -61,10 +61,11 @@ struct pri {
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */
 
-	int bri;
 	int sapi;
 	int tei;
 	int protodisc;
+	unsigned int bri:1;
+	unsigned int acceptinbanddisconnect:1;	/* Should we allow inband progress after RELEASE? */
 	
 	/* Q.921 State */
 	int q921_state;	

q931.c

@@ -421,7 +421,7 @@ static FUNC_DUMP(dump_channel_id)
 	int x;
 	int res = 0;
 	static const char*	msg_chan_sel[] = {
-		"No channel selected", "B1 channel", "B2 channel","Any channel selected" 
+		"No channel selected", "B1 channel", "B2 channel","Any channel selected",  
 		"No channel selected", "As indicated in following octets", "Reserved","Any channel selected"
 	};
 
@@ -3782,7 +3782,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 
 		/* wait for a RELEASE so that sufficient time has passed
 		   for the inband audio to be heard */
-		if (c->progressmask & PRI_PROG_INBAND_AVAILABLE)
+		if (pri->acceptinbanddisconnect && (c->progressmask & PRI_PROG_INBAND_AVAILABLE))
 			break;
 
 		/* Return such an event */