[svn-commits] kpfleming: branch 1.4 r574 - /branches/1.4/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 11 11:24:01 2008
New Revision: 574

URL: http://svn.digium.com/view/libpri?view=rev&rev=574
Log:
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)

Modified:
    branches/1.4/libpri.h
    branches/1.4/pri.c
    branches/1.4/pri_internal.h
    branches/1.4/q931.c

Modified: branches/1.4/libpri.h
URL: http://svn.digium.com/view/libpri/branches/1.4/libpri.h?view=diff&rev=574&r1=573&r2=574
==============================================================================
--- branches/1.4/libpri.h (original)
+++ branches/1.4/libpri.h Fri Jul 11 11:24:01 2008
@@ -624,6 +624,9 @@
 /* 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_inbandrelease(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);

Modified: branches/1.4/pri.c
URL: http://svn.digium.com/view/libpri/branches/1.4/pri.c?view=diff&rev=574&r1=573&r2=574
==============================================================================
--- branches/1.4/pri.c (original)
+++ branches/1.4/pri.c Fri Jul 11 11:24:01 2008
@@ -782,6 +782,11 @@
 	pri->overlapdial = state;
 }
 
+void pri_set_inbandrelease(struct pri *pri, unsigned int enable)
+{
+	pri->acceptinbandrelease = (enable != 0);
+}
+
 int pri_fd(struct pri *pri)
 {
 	return pri->fd;

Modified: branches/1.4/pri_internal.h
URL: http://svn.digium.com/view/libpri/branches/1.4/pri_internal.h?view=diff&rev=574&r1=573&r2=574
==============================================================================
--- branches/1.4/pri_internal.h (original)
+++ branches/1.4/pri_internal.h Fri Jul 11 11:24:01 2008
@@ -61,10 +61,11 @@
 	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 acceptinbandrelease:1;	/* Should we allow inband progress after RELEASE? */
 	
 	/* Q.921 State */
 	int q921_state;	

Modified: branches/1.4/q931.c
URL: http://svn.digium.com/view/libpri/branches/1.4/q931.c?view=diff&rev=574&r1=573&r2=574
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Fri Jul 11 11:24:01 2008
@@ -3782,7 +3782,7 @@
 
 		/* 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->acceptinbandrelease && (c->progressmask & PRI_PROG_INBAND_AVAILABLE))
 			break;
 
 		/* Return such an event */