mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Fix HAVE_SO_REUSEPORT_LB macro name definition

Browse Source 
A typo in macro definition caused the load-balanced sockets to be
disabled even on platforms with existing support for load-balanced
sockets.
This commit is contained in:
Ondřej Surý
2020-12-04 13:19:44 +01:00
parent 7176530ecd
commit 5caf33feda
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/netmgr/netmgr-int.h
View File

@@ -53,7 +53,7 @@
#endif #endif
#if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__)) #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
#define HAVE_REUSEPORT_LB 1 #define HAVE_SO_REUSEPORT_LB 1
#endif #endif
/* /*

2
lib/isc/netmgr/tcp.c
View File

@@ -406,7 +406,9 @@ isc_nm_listentcp(isc_nm_t *mgr, isc_nmiface_t *iface,
isc_nmsocket_t *sock = NULL; isc_nmsocket_t *sock = NULL;
sa_family_t sa_family = iface->addr.type.sa.sa_family; sa_family_t sa_family = iface->addr.type.sa.sa_family;
size_t children_size = 0; size_t children_size = 0;
#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
uv_os_sock_t fd = -1; uv_os_sock_t fd = -1;
#endif
REQUIRE(VALID_NM(mgr)); REQUIRE(VALID_NM(mgr));

2
lib/isc/netmgr/tcpdns.c
View File

@@ -450,7 +450,9 @@ isc_nm_listentcpdns(isc_nm_t *mgr, isc_nmiface_t *iface,
isc_nmsocket_t *sock = NULL; isc_nmsocket_t *sock = NULL;
sa_family_t sa_family = iface->addr.type.sa.sa_family; sa_family_t sa_family = iface->addr.type.sa.sa_family;
size_t children_size = 0; size_t children_size = 0;
#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
uv_os_sock_t fd = -1; uv_os_sock_t fd = -1;
#endif
REQUIRE(VALID_NM(mgr)); REQUIRE(VALID_NM(mgr));

4
lib/isc/netmgr/udp.c
View File

@@ -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; isc_nmsocket_t *sock = NULL;
sa_family_t sa_family = iface->addr.type.sa.sa_family; sa_family_t sa_family = iface->addr.type.sa.sa_family;
size_t children_size = 0; size_t children_size = 0;
#if !HAVE_SO_REUSEPORT_LB && !defined(WIN32)
uv_os_sock_t fd = -1; uv_os_sock_t fd = -1;
#endif
REQUIRE(VALID_NM(mgr)); 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; 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, r = isc_uv_udp_freebind(&sock->uv_handle.udp,
&sock->parent->iface->addr.type.sa, &sock->parent->iface->addr.type.sa,
uv_bind_flags); uv_bind_flags);