Fix HAVE_SO_REUSEPORT_LB macro name definition

A typo in macro definition caused the load-balanced sockets to be
disabled even on platforms with existing support for load-balanced
sockets.

(cherry picked from commit 5caf33feda92617e18514633cadaae60e934101f)

diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
index 1997ec1cc3e0f29a504991f66cc35e6ca7da0353..18fbe243c48a25d0359083f97f904da6e3fd7e7f 100644 (file)
--- a/lib/isc/netmgr/netmgr-int.h
+++ b/lib/isc/netmgr/netmgr-int.h
@@ -53,7 +53,7 @@
 #endif
 
 #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
-#define HAVE_REUSEPORT_LB 1
+#define HAVE_SO_REUSEPORT_LB 1
 #endif
 
 /*

diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
index 5dc121f655c346a7f10bffb2322d6bec73876f38..24f43c9856dbe80aaf032690ac900cab05dd750b 100644 (file)
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -406,7 +406,9 @@ isc_nm_listentcp(isc_nm_t *mgr, isc_nmiface_t *iface,
        isc_nmsocket_t *sock = NULL;
        sa_family_t sa_family = iface->addr.type.sa.sa_family;
        size_t children_size = 0;
+#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
        uv_os_sock_t fd = -1;
+#endif
 
        REQUIRE(VALID_NM(mgr));
 

diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
index f52cbca3e9e00618e2f65f665a6faa31e425a0fa..1372b63573a2b09b8280b386c30efca472c01789 100644 (file)
--- a/lib/isc/netmgr/tcpdns.c
+++ b/lib/isc/netmgr/tcpdns.c
@@ -450,7 +450,9 @@ isc_nm_listentcpdns(isc_nm_t *mgr, isc_nmiface_t *iface,
        isc_nmsocket_t *sock = NULL;
        sa_family_t sa_family = iface->addr.type.sa.sa_family;
        size_t children_size = 0;
+#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
        uv_os_sock_t fd = -1;
+#endif
 
        REQUIRE(VALID_NM(mgr));
 

diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
index f69f6feb197f62f169c17a81b78e43168b677919..411b8deacfbcb8cd736a102d9c58255455192b6c 100644 (file)
--- a/lib/isc/netmgr/udp.c
+++ b/lib/isc/netmgr/udp.c
@@ -106,7 +106,9 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb,
        isc_nmsocket_t *sock = NULL;
        sa_family_t sa_family = iface->addr.type.sa.sa_family;
        size_t children_size = 0;
+#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
        uv_os_sock_t fd = -1;
+#endif
 
        REQUIRE(VALID_NM(mgr));
 
@@ -269,7 +271,7 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
                uv_bind_flags |= UV_UDP_IPV6ONLY;
        }
 
-#if HAVE_SO_REUSEPORT_LB || WIN32
+#if HAVE_SO_REUSEPORT_LB || defined(WIN32)
        r = isc_uv_udp_freebind(&sock->uv_handle.udp,
                                &sock->parent->iface->addr.type.sa,
                                uv_bind_flags);