[Pkg-voip-commits] r3202 - in asterisk/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2007-03-04 08:57:44 +0000 (Sun, 04 Mar 2007)
New Revision: 3202

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/bristuff.dpatch
Log:
* New upstream release. Also fixes remote SIP security hole.
* Updated bristuff patch.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-03-03 18:10:47 UTC (rev 3201)
+++ asterisk/trunk/debian/changelog	2007-03-04 08:57:44 UTC (rev 3202)
@@ -1,9 +1,12 @@
-asterisk (1:1.2.15~dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.2.16~dfsg-1) unstable; urgency=high
 
-  * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Sat,  3 Mar 2007 18:10:52 +0000
+  [ Tzafrir Cohen ]
+  * New upstream release. Also fixes remote SIP security hole.
+  * Updated bristuff patch.
 
+ -- Tzafrir Cohen <tzafrir at boomtime.cohens.org.il>  Sun,  4 Mar 2007 00:35:53 +0200
+
 asterisk (1:1.2.15~dfsg-1) unstable; urgency=low
 
   [ Tzafrir Cohen ]

Modified: asterisk/trunk/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/trunk/debian/patches/bristuff.dpatch	2007-03-03 18:10:47 UTC (rev 3201)
+++ asterisk/trunk/debian/patches/bristuff.dpatch	2007-03-04 08:57:44 UTC (rev 3202)
@@ -4,15 +4,15 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: bristuff support in asterisk: asterisk.patch from bristuff-0.3.0-PRE-1x
 ## DP: cygdef.h removed ;-)
-## DP: Updated version: 1.2.15
+## DP: Updated version: 1.2.16
 
 @DPATCH@
 diff -urNad asterisk-1.2.15~dfsg~/.version asterisk-1.2.15~dfsg/.version
 --- asterisk-1.2.15~dfsg~/.version	2007-02-09 01:35:53.000000000 +0200
 +++ asterisk-1.2.15~dfsg/.version	2007-02-11 06:04:58.000000000 +0200
 @@ -1 +1 @@
--1.2.15
-+1.2.15-BRIstuffed-0.3.0-PRE-1x
+-1.2.16
++1.2.16-BRIstuffed-0.3.0-PRE-1x
 diff -urNad asterisk-1.2.15~dfsg~/HARDWARE asterisk-1.2.15~dfsg/HARDWARE
 --- asterisk-1.2.15~dfsg~/HARDWARE	2005-11-29 20:24:39.000000000 +0200
 +++ asterisk-1.2.15~dfsg/HARDWARE	2007-02-11 06:04:58.000000000 +0200
@@ -8468,7 +8468,7 @@
  						}
  						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
  					}
-@@ -8516,39 +9302,58 @@
+@@ -8516,36 +9302,58 @@
  				break;
  			case PRI_EVENT_RING:
  				crv = NULL;
@@ -8500,15 +8500,12 @@
 -								PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span);
 -							break;
 -						} else {
--							ast_log(LOG_WARNING, "Ring requested on channel %d/%d already in use on span %d.  Hanging up owner.\n", 
+-							/* This is where we handle initial glare */
+-							ast_log(LOG_DEBUG, "Ring requested on channel %d/%d already in use or previously requested on span %d.  Attempting to renegotiating channel.\n", 
 +					    /* safety check, for messed up retransmissions? */
 +					    if (pri->pvts[chanpos]->call == e->ring.call) {
 +						ast_log(LOG_WARNING, "Duplicate setup requested on channel %d/%d already in use on span %d\n", 
  							PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span);
--							if (pri->pvts[chanpos]->realcall) 
--								pri_hangup_all(pri->pvts[chanpos]->realcall, pri);
--							else
--								pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
 -							ast_mutex_unlock(&pri->pvts[chanpos]->lock);
 -							chanpos = -1;
 +						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -8805,15 +8802,18 @@
  						pri->pvts[chanpos]->call = NULL;
  						pri->pvts[chanpos]->exten[0] = '\0';
  					}
-@@ -8749,7 +9659,7 @@
- 						ast_mutex_unlock(&crv->lock);
+@@ -8749,9 +9659,9 @@
  					ast_mutex_unlock(&pri->pvts[chanpos]->lock);
- 				} else 
--					pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_REQUESTED_CHAN_UNAVAIL);
-+					pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_REQUESTED_CHAN_UNAVAIL, -1);
+ 				} else {
+ 					if (e->ring.flexible)
+-						pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION);
++						pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION, -1);
+ 					else
+-						pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_REQUESTED_CHAN_UNAVAIL);
++						pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_REQUESTED_CHAN_UNAVAIL, -1);
+ 				}
  				break;
  			case PRI_EVENT_RINGING:
- 				chanpos = pri_find_principle(pri, e->ringing.channel);
 @@ -8767,7 +9677,7 @@
  					} else {
  						ast_mutex_lock(&pri->pvts[chanpos]->lock);