From: Shawn Routhier <sar@isc.org>
Date: Fri, 20 Nov 2009 00:10:14 +0000 (+0000)
Subject: Update to bind 9.7.0b3, remove work around for fdwatchpoke bug
X-Git-Tag: v4_2_0a1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4b839a226603eb3085e70d3cc1f2b6d208bdc6;p=thirdparty%2Fdhcp.git

Update to bind 9.7.0b3, remove work around for fdwatchpoke bug
---

diff --git a/RELNOTES b/RELNOTES
index 9e9d43886..d7174045a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -13,19 +13,6 @@ Processing the DHCP to DNS server transactions in an asyncrhonous fashion.
 The DHCP server or client can now continue with it's processing while
 awaiting replies from the DNS server.
 
-As part of the changes to support asynchronous DNS the DHCP code was
-modified to use the current BIND libraries and a small number of changes
-were made to the BIND libraries to support DHCP.  There is a bug in one
-of these changes that can cause an exception in a DHCP server.  This bug
-requires either failover or omapi to be in use and a number of events
-(timeouts, packet reception, packet transmision) to happen within the same
-scheduling interval.  As a work around the number of events required to
-trigger this issue has been increased though this may affect the responsivness
-of the DNS code under load.  A fix is being developed but needs
-to go into a BIND release.  Note that the bug is in a part of the BIND
-libraries that is only used by the DHCP code and does NOT affect any
-other part of the BIND code.
-
 There are a number of DHCPv6 limitations and features missing in this
 release, which will be addressed in the future:
 
diff --git a/omapip/isclib.c b/omapip/isclib.c
index 59bba1ffd..3225096d2 100644
--- a/omapip/isclib.c
+++ b/omapip/isclib.c
@@ -127,16 +127,7 @@ dhcp_context_create(void) {
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
-	/*sar*/
-	/*
-	 * We currently use a large number for quantum to get around
-	 * an issue in the fdwatchpoke code that allows us to re-check
-	 * a socket for reading or writing even if it already has a pending
-	 * read or write.  This event causes an exception and stops the
-	 * program.  When that code is fixed the quantum can be reduced.
-	 */
-	result = isc_task_create(dhcp_gbl_ctx.taskmgr, 100,
-				 &dhcp_gbl_ctx.task);
+	result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, &dhcp_gbl_ctx.task);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
diff --git a/util/bind.sh b/util/bind.sh
index a9ee33d71..57e6ca2db 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bind.sh,v 1.5 2009/11/09 20:25:00 dhankins Exp $
+# $Id: bind.sh,v 1.6 2009/11/20 00:10:14 sar Exp $
 
 # Get the bind distribution for the libraries
 # This script is used to build the DHCP distribution and shouldn't be shipped
@@ -30,7 +30,7 @@ binddir=$topdir/bind
 case $# in 
     1)
 	case "$1" in 
-	4.2.0a2|4.2.0a1|4.2.0) BINDTAG=v9_7_0b2 ;;
+	4.2.0a2|4.2.0a1|4.2.0) BINDTAG=v9_7_0b3 ;;
 	*) echo "bind.sh: unsupported version: $1" >&2
 	   exit 1
 	   ;;