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

Add FreeBSD connection timeout socket option

Browse Source 
On FreeBSD, the option to configure connection timeout is called
TCP_KEEPINIT, use it to configure the connection timeout there.

This also fixes the dangling socket problems in the unit test, so
re-enable them.
This commit is contained in:
Ondřej Surý
2020-12-02 21:54:25 +01:00
parent 1d066e4bc5
commit 4adeaab73d
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2283,6 +2283,10 @@ isc__nm_socket_dontfrag(uv_os_sock_t fd, sa_family_t sa_family) {
#define TIMEOUT_TYPE unsigned int #define TIMEOUT_TYPE unsigned int
#define TIMEOUT_DIV 1 #define TIMEOUT_DIV 1
#define TIMEOUT_OPTNAME TCP_USER_TIMEOUT #define TIMEOUT_OPTNAME TCP_USER_TIMEOUT
#elif defined(TCP_KEEPINIT)
#define TIMEOUT_TYPE int
#define TIMEOUT_DIV 1000
#define TIMEOUT_OPTNAME TCP_KEEPINIT
#endif #endif
isc_result_t isc_result_t

2
lib/isc/tests/tcp_quota_test.c
View File

@@ -9,7 +9,7 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
#if HAVE_CMOCKA && defined(__linux__) #if HAVE_CMOCKA
#include <sched.h> /* IWYU pragma: keep */ #include <sched.h> /* IWYU pragma: keep */
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h> #include <stdarg.h>

2
lib/isc/tests/tcp_test.c
View File

@@ -9,7 +9,7 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
#if HAVE_CMOCKA && defined(__linux__) #if HAVE_CMOCKA
#include <sched.h> /* IWYU pragma: keep */ #include <sched.h> /* IWYU pragma: keep */
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h> #include <stdarg.h>

2
lib/isc/tests/tcpdns_test.c
View File

@@ -9,7 +9,7 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
#if HAVE_CMOCKA && defined(__linux__) #if HAVE_CMOCKA
#include <sched.h> /* IWYU pragma: keep */ #include <sched.h> /* IWYU pragma: keep */
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h> #include <stdarg.h>

2
lib/isc/tests/udp_test.c
View File

@@ -9,7 +9,7 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
#if HAVE_CMOCKA && defined(__linux__) #if HAVE_CMOCKA
#include <sched.h> /* IWYU pragma: keep */ #include <sched.h> /* IWYU pragma: keep */
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h> #include <stdarg.h>