[Pkg-voip-commits] r6808 - in /asterisk/trunk/debian: changelog patches/fix_fxo_alarm patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Feb 23 22:47:30 2009
New Revision: 6808

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6808
Log:
Patch fix_fxo_alarm: Fix Zaptel FXO alarm detection on startup 
(Closes: #516838).

Added:
    asterisk/trunk/debian/patches/fix_fxo_alarm
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=6808&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Feb 23 22:47:30 2009
@@ -3,6 +3,8 @@
   * Remove asterisk-dev Recommends of asterisk. 
   * Patch AST-2009-001 - Fix CVE-2009-0041 - Information leak in IAX2 
     authentication (Closes: #513413).
+  * Patch fix_fxo_alarm: Fix Zaptel FXO alarm detection on startup 
+   (Closes: #516838).
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 21 Feb 2009 16:08:59 +0200
 

Added: asterisk/trunk/debian/patches/fix_fxo_alarm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/fix_fxo_alarm?rev=6808&op=file
==============================================================================
--- asterisk/trunk/debian/patches/fix_fxo_alarm (added)
+++ asterisk/trunk/debian/patches/fix_fxo_alarm Mon Feb 23 22:47:30 2009
@@ -1,0 +1,34 @@
+Fix channel alarm state detection at startup for FXO channels (#______)
+
+Upstream issue: http://bugs.digium.com/view.php?id=12160
+Source: http://bugs.digium.com/file_download.php?file_id=19277&type=bug
+
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
+@@ -7429,6 +7429,9 @@ static struct zt_pvt *mkintf(int channel
+ 				}
+ 				tmp->law = p.curlaw;
+ 				tmp->span = p.spanno;
++#ifdef ZT_GET_PARAMS_V1
++				tmp->inalarm = (p.chan_alarms != 0);
++#endif
+ 				span = p.spanno - 1;
+ 			} else {
+ 				if (channel == CHAN_PSEUDO)
+@@ -7796,10 +7799,12 @@ static struct zt_pvt *mkintf(int channel
+ 			ioctl(tmp->subs[SUB_REAL].zfd,ZT_SETTONEZONE,&tmp->tonezone);
+ #ifdef HAVE_PRI
+ 			/* the dchannel is down so put the channel in alarm */
+-			if (tmp->pri && !pri_is_up(tmp->pri))
+-				tmp->inalarm = 1;
+-			else
+-				tmp->inalarm = 0;
++			if (tmp->pri) {
++				if (!pri_is_up(tmp->pri))
++					tmp->inalarm = 1;
++				else
++					tmp->inalarm = 0;
++			}
+ #endif				
+ 			memset(&si, 0, sizeof(si));
+ 			if (ioctl(tmp->subs[SUB_REAL].zfd,ZT_SPANSTAT,&si) == -1) {

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=6808&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Feb 23 22:47:30 2009
@@ -90,3 +90,4 @@
 zap-fix-timing-source
 zap-fix-deadlock
 zap-fix-cause34
+fix_fxo_alarm