From 8bf311c769bf540b92d73625afcd130563da3c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 15 Jan 2025 13:02:20 +0100 Subject: [PATCH] Shutdown the fetch context after canceling the last fetch Currently, the fetch context will continue running even when the last fetch (response) has been removed from the context, so named can process and cache the answer. This can lead to a situation where the number of outgoing recursing clients exceeds the the configured number for recursive-clients. Be more stringent about the recursive-clients limit and shutdown the fetch context immediately after the last fetch has been canceled from that particular fetch context. --- lib/dns/resolver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index bc2d0bd519..e612eb7bb3 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -11210,10 +11210,9 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) { isc_task_sendanddetach(&etask, ISC_EVENT_PTR(&event_fetchdone)); } - /* - * The fctx continues running even if no fetches remain; - * the answer is still cached. - */ + if (ISC_LIST_EMPTY(fctx->events)) { + fctx_shutdown(fctx); + } UNLOCK(&res->buckets[fctx->bucketnum].lock); }