[Pkg-voip-commits] r5833 - in /zaptel/trunk/debian: changelog patches/chan_release_check patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Jun  5 18:17:04 2008
New Revision: 5833

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5833
Log:
Patch chan_release_check: fixes a regression from 1.4.10.1 that causes
a panic if disconnecting an Astribank device with a channel still open.

Added:
    zaptel/trunk/debian/patches/chan_release_check
Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/series

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5833&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Jun  5 18:17:04 2008
@@ -21,8 +21,10 @@
     ZT_SIG_DACS. Makes ztscan report then as digital spans.
   * Patch bri_dchan: change ZT_FLAG_BRIDCHAN as ZT_FLAG_MTP2 is also
     defined to be 19 as of zaptel 1.4.11 .
-
- -- Faidon Liambotis <paravoid at debian.org>  Wed, 21 May 2008 03:53:30 +0300
+  * Patch chan_release_check: fixes a regression from 1.4.10.1 that causes
+    a panic if disconnecting an Astribank device with a channel still open.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu,  5 Jun 2008 21:13:13 +0300
 
 zaptel (1:1.4.10.1~dfsg-1) unstable; urgency=low
 

Added: zaptel/trunk/debian/patches/chan_release_check
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/chan_release_check?rev=5833&op=file
==============================================================================
--- zaptel/trunk/debian/patches/chan_release_check (added)
+++ zaptel/trunk/debian/patches/chan_release_check Thu Jun  5 18:17:04 2008
@@ -1,0 +1,22 @@
+clear_check.diff from http://bugs.digium.com/9379
+
+Fixes a potential panic in Xorcom Astribanks devices if disconnected 
+when a userspace program still holds a channel open. Regression from
+1.4.10.1 .
+
+Index: kernel/zaptel-base.c
+===================================================================
+--- a/kernel/zaptel-base.c	(revision 4338)
++++ b/kernel/zaptel-base.c	(working copy)
+@@ -2515,7 +2515,10 @@
+ 		close_channel(chans[unit]);
+ 		if (chans[unit]->span && chans[unit]->span->close)
+ 			res = chans[unit]->span->close(chans[unit]);
+-		clear_bit(ZT_FLAGBIT_OPEN, &chans[unit]->flags);
++
++		/* The channel might be destroyed on close: */
++		if (chans[unit])
++			clear_bit(ZT_FLAGBIT_OPEN, &chans[unit]->flags);
+ 	} else
+ 		res = -ENXIO;
+ #ifndef LINUX26

Modified: zaptel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/series?rev=5833&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/series (original)
+++ zaptel/trunk/debian/patches/series Thu Jun  5 18:17:04 2008
@@ -7,3 +7,4 @@
 zaphfc-florz
 zaptel_perl
 #sigcap_dacs
+chan_release_check