CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc

2019-11-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Nov 28 00:18:36 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: types.h

Log Message:
match ifdefs with stats.c atomic selection


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc

2019-11-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Nov 28 00:18:36 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: types.h

Log Message:
match ifdefs with stats.c atomic selection


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mpl/bind/dist/lib/isc/include/isc/types.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5	Wed Nov 27 00:48:42 2019
+++ src/external/mpl/bind/dist/lib/isc/include/isc/types.h	Wed Nov 27 19:18:36 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.5 2019/11/27 05:48:42 christos Exp $	*/
+/*	$NetBSD: types.h,v 1.6 2019/11/28 00:18:36 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -78,7 +78,7 @@ typedef struct isc_socket		isc_socket_t;
 typedef struct isc_socketevent		isc_socketevent_t;	/*%< Socket Event */
 typedef struct isc_socketmgr		isc_socketmgr_t;	/*%< Socket Manager */
 typedef struct isc_stats		isc_stats_t;		/*%< Statistics */
-#if defined(_WIN32) && !defined(_WIN64)
+#if defined(_WIN32) && !defined(_WIN64) || !defined(_LP64)
 	typedef int_fast32_t 		isc_statscounter_t;	/*%< Statistics Counter */
 #else
 	typedef int_fast64_t 		isc_statscounter_t;



CVS commit: src/external/mpl/bind/dist/lib/isc

2019-11-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov 16 19:23:56 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc: task.c timer.c

Log Message:
shorten names


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/timer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mpl/bind/dist/lib/isc

2019-11-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Nov 16 19:23:56 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc: task.c timer.c

Log Message:
shorten names


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/timer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mpl/bind/dist/lib/isc/task.c
diff -u src/external/mpl/bind/dist/lib/isc/task.c:1.5 src/external/mpl/bind/dist/lib/isc/task.c:1.6
--- src/external/mpl/bind/dist/lib/isc/task.c:1.5	Thu Sep  5 15:32:59 2019
+++ src/external/mpl/bind/dist/lib/isc/task.c	Sat Nov 16 14:23:56 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: task.c,v 1.5 2019/09/05 19:32:59 christos Exp $	*/
+/*	$NetBSD: task.c,v 1.6 2019/11/16 19:23:56 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1385,7 +1385,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
 		>queues[i].thread)
 			  == ISC_R_SUCCESS);
 		char name[21];
-		snprintf(name, sizeof(name), "isc-worker%04u", i);
+		snprintf(name, sizeof(name), "work-%u", i);
 		isc_thread_setname(manager->queues[i].thread, name);
 	}
 	UNLOCK(>lock);

Index: src/external/mpl/bind/dist/lib/isc/timer.c
diff -u src/external/mpl/bind/dist/lib/isc/timer.c:1.4 src/external/mpl/bind/dist/lib/isc/timer.c:1.5
--- src/external/mpl/bind/dist/lib/isc/timer.c:1.4	Sun Feb 24 15:01:31 2019
+++ src/external/mpl/bind/dist/lib/isc/timer.c	Sat Nov 16 14:23:56 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.c,v 1.4 2019/02/24 20:01:31 christos Exp $	*/
+/*	$NetBSD: timer.c,v 1.5 2019/11/16 19:23:56 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -725,7 +725,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc
  "isc_thread_create() failed");
 		return (ISC_R_UNEXPECTED);
 	}
-	isc_thread_setname(manager->thread, "isc-timer");
+	isc_thread_setname(manager->thread, "timer");
 
 	*managerp = (isc_timermgr_t *)manager;
 



CVS commit: src/external/mpl/bind/dist/lib/isc

2019-10-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  2 15:43:15 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc: siphash.c

Log Message:
PR/54594: Martin Husemann: bind may crash at startup
Use memcpy(3) instead of assuming casting "uint8_t *" to "uint64_t *" and
de-referencing works.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/siphash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mpl/bind/dist/lib/isc/siphash.c
diff -u src/external/mpl/bind/dist/lib/isc/siphash.c:1.2 src/external/mpl/bind/dist/lib/isc/siphash.c:1.3
--- src/external/mpl/bind/dist/lib/isc/siphash.c:1.2	Thu Sep  5 15:32:59 2019
+++ src/external/mpl/bind/dist/lib/isc/siphash.c	Wed Oct  2 11:43:15 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: siphash.c,v 1.2 2019/09/05 19:32:59 christos Exp $	*/
+/*	$NetBSD: siphash.c,v 1.3 2019/10/02 15:43:15 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -60,9 +60,13 @@
 void
 isc_siphash24(const uint8_t *k, const uint8_t *in, size_t inlen, uint8_t *out)
 {
-	const uint64_t *key = (const uint64_t *)k;
-	uint64_t k0 = le64toh(key[0]);
-	uint64_t k1 = le64toh(key[1]);
+	uint64_t k0, k1;
+
+	memcpy(, k, sizeof(k0));
+	memcpy(, k + sizeof(k0), sizeof(k1));
+
+	k0 = le64toh(k0);
+	k1 = le64toh(k1);
 
 	uint64_t v0 = 0x736f6d6570736575ULL ^ k0;
 	uint64_t v1 = 0x646f72616e646f6dULL ^ k1;



CVS commit: src/external/mpl/bind/dist/lib/isc

2019-10-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct  2 15:43:15 UTC 2019

Modified Files:
src/external/mpl/bind/dist/lib/isc: siphash.c

Log Message:
PR/54594: Martin Husemann: bind may crash at startup
Use memcpy(3) instead of assuming casting "uint8_t *" to "uint64_t *" and
de-referencing works.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/siphash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.