[svn-commits] qwell: branch 1.2 r2696 - /branches/1.2/zaptel-base.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Jul  5 13:08:53 2007
New Revision: 2696

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2696
Log:
Do not report channels in ZT_STATE_KEWL or ZT_STATE_AFTERKEWL (ie; battery drop) states as available.
This becomes more likely if ZT_KEWLTIME or ZT_AFTERKEWLTIME are set to higher values.

Issue 7612, patch by rbraun.

Modified:
    branches/1.2/zaptel-base.c

Modified: branches/1.2/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel-base.c?view=diff&rev=2696&r1=2695&r2=2696
==============================================================================
--- branches/1.2/zaptel-base.c (original)
+++ branches/1.2/zaptel-base.c Thu Jul  5 13:08:53 2007
@@ -2892,12 +2892,14 @@
 			j = zt_q_sig(chan); 
 			if (j >= 0) { /* if returned with success */
 				stack.param.rxisoffhook = ((chan->rxsig & (j >> 8)) != (j & 0xff));
-			}
-			else {
+			} else {
 				stack.param.rxisoffhook = ((chan->rxhooksig != ZT_RXSIG_ONHOOK) &&
 					(chan->rxhooksig != ZT_RXSIG_INITIAL));
 			}
-		} else stack.param.rxisoffhook = 0;
+		} else if ((chan->txstate == ZT_TXSTATE_KEWL) || (chan->txstate == ZT_TXSTATE_AFTERKEWL))
+			stack.param.rxisoffhook = 1;
+		else
+			stack.param.rxisoffhook = 0;
 		if (chan->span && chan->span->rbsbits && !(chan->sig & ZT_SIG_CLEAR)) {
 			stack.param.rxbits = chan->rxsig;
 			stack.param.txbits = chan->txsig;