[Pkg-voip-commits] r8179 - in /asterisk/trunk/debian: changelog patches/dahdi-fxsks-hookstate

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Mar  9 10:55:16 2010
New Revision: 8179

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8179
Log:
Patch dahdi-fxsks-hookstate: a simpler version. 

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/dahdi-fxsks-hookstate

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8179&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Mar  9 10:55:16 2010
@@ -5,8 +5,9 @@
   * Patch safe_asterisk-config: Mostly merged upstream. 
   * Patch moh_datadir: Make the datadir the default base for moh files
     if a relative path is used.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 06 Mar 2010 22:58:17 +0200
+  * Patch dahdi-fxsks-hookstate: a simpler version. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 09 Mar 2010 12:43:27 +0200
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 

Modified: asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi-fxsks-hookstate?rev=8179&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi-fxsks-hookstate (original)
+++ asterisk/trunk/debian/patches/dahdi-fxsks-hookstate Tue Mar  9 10:55:16 2010
@@ -1,7 +1,7 @@
 Subject: Allow FXO channels to send out calls even before someone calls in through them
 Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Bug: http://issues.asterisk.org/view.php?id=14577
-Last-Update: 2009-12-19
+Last-Update: 2010-03-09
 
 This rxisoffhook does not work. Before 1.6.0 it was wrapped in a #ifdef
 DAHDI_CHECK_HOOKSTATE (or rather: ZAP_CHECK_HOOKSTATE). In 1.6 it is 
@@ -10,22 +10,19 @@
 On DAHDI (the kernel) this field is not properly initialized at startup. 
 And thus it will only work after an incoming ring.
 
+This patch makes the test only apply in case of CAS channels. For analog
+channels we have a red alarm to signal a line with no battery.
+
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -10685,12 +10685,16 @@ static inline int available(struct dahdi
+@@ -10704,8 +10704,8 @@ static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t g
  				/* When "onhook" that means no battery on the line, and thus
  				  it is out of service..., if it's on a TDM card... If it's a channel
  				  bank, there is no telling... */
-+#ifdef DAHDI_CHECK_HOOKSTATE
- 				if (par.rxbits > -1)
- 					return 1;
+-				if (par.rxbits > -1)
+-					return 1;
++				if (par.rxbits <= -1)
++					return 1; /* Not CAS: not a channel bank */
  				if (par.rxisoffhook)
  					return 1;
  				else
- 					return 0;
-+#else
-+				return 1;
-+#endif
- 			} else if (par.rxisoffhook) {
- 				ast_debug(1, "Channel %d off hook, can't use\n", p->channel);
- 				/* Not available when the other end is off hook */