mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Enable the load-balance-sockets configuration

Browse Source 
Previously, HAVE_SO_REUSEPORT_LB has been defined only in the private
netmgr-int.h header file, making the configuration of load balanced
sockets inoperable.

Move the missing HAVE_SO_REUSEPORT_LB define the isc/netmgr.h and add
missing isc_nm_getloadbalancesockets() implementation.
This commit is contained in:
Ondřej Surý
2022-04-05 01:20:13 +02:00
parent 9217f1e200
commit 142c63dda8
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/named/config.c
View File

@@ -20,6 +20,7 @@
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/log.h> #include <isc/log.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/netmgr.h>
#include <isc/parseint.h> #include <isc/parseint.h>
#include <isc/region.h> #include <isc/region.h>
#include <isc/result.h> #include <isc/result.h>

1
bin/named/server.c
View File

@@ -39,6 +39,7 @@
#include <isc/httpd.h> #include <isc/httpd.h>
#include <isc/lex.h> #include <isc/lex.h>
#include <isc/meminfo.h> #include <isc/meminfo.h>
#include <isc/netmgr.h>
#include <isc/nonce.h> #include <isc/nonce.h>
#include <isc/parseint.h> #include <isc/parseint.h>
#include <isc/portset.h> #include <isc/portset.h>

9
lib/isc/include/isc/netmgr.h
View File

@@ -13,12 +13,21 @@
#pragma once #pragma once
#include <unistd.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/region.h> #include <isc/region.h>
#include <isc/result.h> #include <isc/result.h>
#include <isc/tls.h> #include <isc/tls.h>
#include <isc/types.h> #include <isc/types.h>
#include <sys/socket.h>
#include <sys/types.h>
#if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
#define HAVE_SO_REUSEPORT_LB 1
#endif
/* /*
* Replacement for isc_sockettype_t provided by socket.h. * Replacement for isc_sockettype_t provided by socket.h.
*/ */

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

@@ -111,10 +111,6 @@ STATIC_ASSERT(ISC_NETMGR_TCP_RECVBUF_SIZE <= ISC_NETMGR_RECVBUF_SIZE,
*/ */
#define NM_MAXSEG (1280 - 20 - 40) #define NM_MAXSEG (1280 - 20 - 40)
#if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
#define HAVE_SO_REUSEPORT_LB 1
#endif
/* /*
* Define NETMGR_TRACE to activate tracing of handles and sockets. * Define NETMGR_TRACE to activate tracing of handles and sockets.
* This will impair performance but enables us to quickly determine, * This will impair performance but enables us to quickly determine,

7
lib/isc/netmgr/netmgr.c
View File

@@ -578,6 +578,13 @@ isc_nm_setnetbuffers(isc_nm_t *mgr, int32_t recv_tcp, int32_t send_tcp,
atomic_store(&mgr->send_udp_buffer_size, send_udp); atomic_store(&mgr->send_udp_buffer_size, send_udp);
} }
bool
isc_nm_getloadbalancesockets(isc_nm_t *mgr) {
REQUIRE(VALID_NM(mgr));
return (mgr->load_balance_sockets);
}
void void
isc_nm_setloadbalancesockets(isc_nm_t *mgr, bool enabled) { isc_nm_setloadbalancesockets(isc_nm_t *mgr, bool enabled) {
REQUIRE(VALID_NM(mgr)); REQUIRE(VALID_NM(mgr));