[zaptel-commits] qwell: trunk r2698 - in /trunk: ./ zaptel.c

[SVN commits to the Zaptel project]

Author: qwell
Date: Thu Jul  5 13:11:54 2007
New Revision: 2698

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2698
Log:
Merged revisions 2697 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

Closes issue 7612.
................
r2697 | qwell | 2007-07-05 13:10:29 -0500 (Thu, 05 Jul 2007) | 13 lines

Merged revisions 2696 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2696 | qwell | 2007-07-05 13:08:53 -0500 (Thu, 05 Jul 2007) | 5 lines

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:
    trunk/   (props changed)
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=2698&r1=2697&r2=2698
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Thu Jul  5 13:11:54 2007
@@ -2994,12 +2994,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;