[Pkg-voip-commits] r5457 - in /asterisk/trunk/debian: changelog patches/bristuff/zapata-bri+euroisdn

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Apr  3 02:11:56 2008
New Revision: 5457

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5457
Log:
* Fix a bug in the bristuff/zapata-bri+euroisdn patch where a significant
  portion of chan_zap code was ignored because of bad block nesting.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5457&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Apr  3 02:11:56 2008
@@ -2,8 +2,10 @@
 
   * Build with -O2 instead of the default -O6 (bug introduced in
     1.4.18~dfsg-1).
-
- -- Faidon Liambotis <paravoid at debian.org>  Thu, 03 Apr 2008 04:08:48 +0300
+  * Fix a bug in the bristuff/zapata-bri+euroisdn patch where a significant
+    portion of chan_zap code was ignored because of bad block nesting.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 03 Apr 2008 05:11:29 +0300
 
 asterisk (1:1.4.18.1~dfsg-1) unstable; urgency=high
 

Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5457&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Apr  3 02:11:56 2008
@@ -1472,7 +1472,13 @@
  #ifdef PRI_PROGRESS_MASK
  					if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
  #else
-@@ -9013,6 +9397,12 @@ static void *pri_dchannel(void *vpri)
+@@ -9008,11 +9392,18 @@ static void *pri_dchannel(void *vpri)
+ 						pri->pvts[chanpos]->progress = 1;
+ 						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
+ 					}
++				    }
+ 				}
+ 				break;
  			case PRI_EVENT_PROCEEDING:
  				chanpos = pri_find_principle(pri, e->proceeding.channel);
  				if (chanpos > -1) {
@@ -1485,7 +1491,15 @@
  					if (!pri->pvts[chanpos]->proceeding) {
  						struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
  						
-@@ -9060,6 +9450,163 @@ static void *pri_dchannel(void *vpri)
+@@ -9037,6 +9428,7 @@ static void *pri_dchannel(void *vpri)
+ 						pri->pvts[chanpos]->proceeding = 1;
+ 						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
+ 					}
++				    }
+ 				}
+ 				break;
+ 			case PRI_EVENT_FACNAME:
+@@ -9060,6 +9452,163 @@ static void *pri_dchannel(void *vpri)
  					}
  				}
  				break;				
@@ -1827,16 +1841,6 @@
  						pri->pvts[chanpos]->resetting = 0;
  						if (pri->pvts[chanpos]->owner) {
  							if (option_verbose > 2) 
-@@ -9287,7 +9895,9 @@ static void *pri_dchannel(void *vpri)
- #endif
- 
- 						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
-+					    }
- 					}
-+				    }
- 				}
- 				break;
- 			case PRI_EVENT_CONFIG_ERR:
 @@ -9377,10 +9987,22 @@ static void *pri_dchannel(void *vpri)
  					ast_mutex_lock(&pri->pvts[chanpos]->lock);
  					switch (e->notify.info) {