From 248f765e73027ca6d65bfa14536d6e125519895f Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 3 May 2023 14:12:25 -0700 Subject: [PATCH] set the default rndc read timeout to 60 seconds While the connect timeout was set to 60 seconds in rndc, the idle read timeout was left at the default value of 30 seconds. This commit sets it back to 60, to match the behavior in 9.16 and earlier. (cherry picked from commit 9cacf9e3365e8def6279a92f5b27537e1abcc75a) --- bin/rndc/rndc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 256587bdeb..87c36ba07a 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -54,7 +54,8 @@ #include "util.h" -#define SERVERADDRS 10 +#define SERVERADDRS 10 +#define RNDC_TIMEOUT 60 * 1000 const char *progname = NULL; bool verbose; @@ -599,7 +600,7 @@ rndc_startconnect(isc_sockaddr_t *addr) { atomic_fetch_add_relaxed(&connects, 1); isc_nm_tcpconnect(netmgr, local, addr, rndc_connected, &rndc_ccmsg, - 60000, 0); + RNDC_TIMEOUT, 0); } static void @@ -1035,6 +1036,9 @@ main(int argc, char **argv) { isc_mem_create(&rndc_mctx); isc_managers_create(rndc_mctx, 1, 0, &netmgr, &taskmgr, NULL); DO("create task", isc_task_create(taskmgr, 0, &rndc_task)); + + isc_nm_settimeouts(netmgr, RNDC_TIMEOUT, RNDC_TIMEOUT, RNDC_TIMEOUT, 0); + isc_log_create(rndc_mctx, &log, &logconfig); isc_log_setcontext(log); isc_log_settag(logconfig, progname);