svn commit: r340037 - in head/contrib/unbound: . util
Dag-Erling Smørgrav
des at FreeBSD.org
Thu Nov 1 23:42:37 UTC 2018
Author: des
Date: Thu Nov 1 23:42:35 2018
New Revision: 340037
URL: https://svnweb.freebsd.org/changeset/base/340037
Log:
Merge upstream r4932: turn so-reuseport option off by default.
MFC after: 3 days
Modified:
head/contrib/unbound/config.h
head/contrib/unbound/config.h.in
head/contrib/unbound/configure
head/contrib/unbound/configure.ac
head/contrib/unbound/util/config_file.c
Directory Properties:
head/contrib/unbound/ (props changed)
Modified: head/contrib/unbound/config.h
==============================================================================
--- head/contrib/unbound/config.h Thu Nov 1 23:11:47 2018 (r340036)
+++ head/contrib/unbound/config.h Thu Nov 1 23:42:35 2018 (r340037)
@@ -664,6 +664,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
+/* if REUSEPORT is enabled by default */
+#define REUSEPORT_DEFAULT 0
+
/* default rootkey location */
#define ROOT_ANCHOR_FILE "/var/unbound/root.key"
Modified: head/contrib/unbound/config.h.in
==============================================================================
--- head/contrib/unbound/config.h.in Thu Nov 1 23:11:47 2018 (r340036)
+++ head/contrib/unbound/config.h.in Thu Nov 1 23:42:35 2018 (r340037)
@@ -663,6 +663,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* if REUSEPORT is enabled by default */
+#undef REUSEPORT_DEFAULT
+
/* default rootkey location */
#undef ROOT_ANCHOR_FILE
Modified: head/contrib/unbound/configure
==============================================================================
--- head/contrib/unbound/configure Thu Nov 1 23:11:47 2018 (r340036)
+++ head/contrib/unbound/configure Thu Nov 1 23:42:35 2018 (r340037)
@@ -15966,6 +15966,17 @@ fi
done
+# check if we can use SO_REUSEPORT
+if echo "$host" | grep -i -e linux -e dragonfly >/dev/null; then
+
+$as_echo "#define REUSEPORT_DEFAULT 1" >>confdefs.h
+
+else
+
+$as_echo "#define REUSEPORT_DEFAULT 0" >>confdefs.h
+
+fi
+
# set memory allocation checking if requested
# Check whether --enable-alloc-checks was given.
if test "${enable_alloc_checks+set}" = set; then :
Modified: head/contrib/unbound/configure.ac
==============================================================================
--- head/contrib/unbound/configure.ac Thu Nov 1 23:11:47 2018 (r340036)
+++ head/contrib/unbound/configure.ac Thu Nov 1 23:42:35 2018 (r340037)
@@ -461,6 +461,13 @@ ACX_CHECK_NONBLOCKING_BROKEN
ACX_MKDIR_ONE_ARG
AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])])
+# check if we can use SO_REUSEPORT
+if echo "$host" | grep -i -e linux -e dragonfly >/dev/null; then
+ AC_DEFINE(REUSEPORT_DEFAULT, 1, [if REUSEPORT is enabled by default])
+else
+ AC_DEFINE(REUSEPORT_DEFAULT, 0, [if REUSEPORT is enabled by default])
+fi
+
# set memory allocation checking if requested
AC_ARG_ENABLE(alloc-checks, AC_HELP_STRING([--enable-alloc-checks],
[ enable to memory allocation statistics, for debug purposes ]),
Modified: head/contrib/unbound/util/config_file.c
==============================================================================
--- head/contrib/unbound/util/config_file.c Thu Nov 1 23:11:47 2018 (r340036)
+++ head/contrib/unbound/util/config_file.c Thu Nov 1 23:42:35 2018 (r340037)
@@ -177,7 +177,7 @@ config_create(void)
cfg->if_automatic = 0;
cfg->so_rcvbuf = 0;
cfg->so_sndbuf = 0;
- cfg->so_reuseport = 1;
+ cfg->so_reuseport = REUSEPORT_DEFAULT;
cfg->ip_transparent = 0;
cfg->ip_freebind = 0;
cfg->num_ifs = 0;
More information about the svn-src-head
mailing list