Commit 1ce582ca authored by Michał Kępień's avatar Michał Kępień

Merge branch '2024-fix-idle-timeout-for-connected-tcp-sockets' into 'main'

Fix idle timeout for connected TCP sockets

Closes #2024

See merge request !3854
parents e7771dc9 18efb245
Pipeline #47817 passed with stages
in 2 minutes and 11 seconds
5477. [bug] The idle timeout for connected TCP sockets is now
derived from the client query processing timeout
configured for a resolver. [GL #2024]
5476. [placeholder] 5476. [placeholder]
5475. [bug] Fix RPZ wildcard passthru ignored when a rejection 5475. [bug] Fix RPZ wildcard passthru ignored when a rejection
......
...@@ -3012,12 +3012,15 @@ resquery_connected(isc_task_t *task, isc_event_t *event) { ...@@ -3012,12 +3012,15 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
case ISC_R_SUCCESS: case ISC_R_SUCCESS:
/* /*
* Extend the idle timer for TCP. 20 seconds * Extend the idle timer for TCP. Half of
* should be long enough for a TCP connection to be * "resolver-query-timeout" will hopefully be long
* established, a single DNS request to be sent, * enough for a TCP connection to be established, a
* and the response received. * single DNS request to be sent, and the response
* received.
*/ */
isc_interval_set(&interval, 20, 0); isc_interval_set(&interval,
fctx->res->query_timeout / 1000 / 2,
0);
result = fctx_startidletimer(query->fctx, &interval); result = fctx_startidletimer(query->fctx, &interval);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
FCTXTRACE("query canceled: idle timer failed; " FCTXTRACE("query canceled: idle timer failed; "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment