From: George Thessalonikefs Date: Tue, 18 Oct 2022 10:29:07 +0000 (+0200) Subject: - Clarify the use of MAX_SENT_COUNT in the iterator code. X-Git-Tag: release-1.17.1rc1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9107907e5e037590b631d4a7f1a160394c95a53;p=thirdparty%2Funbound.git - Clarify the use of MAX_SENT_COUNT in the iterator code. --- diff --git a/doc/Changelog b/doc/Changelog index 36192be81..a30373f52 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +18 October 2022: George + - Clarify the use of MAX_SENT_COUNT in the iterator code. + 17 October 2022: Wouter - testcode/dohclient sets log identity to its name. diff --git a/iterator/iterator.c b/iterator/iterator.c index 2f3ad06fe..9c8d256d3 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -2276,7 +2276,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, iq->num_current_queries, iq->sent_count); /* Make sure that we haven't run away */ - /* FIXME: is this check even necessary? */ if(iq->referral_count > MAX_REFERRAL_COUNT) { verbose(VERB_QUERY, "request has exceeded the maximum " "number of referrrals with %d", iq->referral_count); diff --git a/iterator/iterator.h b/iterator/iterator.h index e35718cf3..18d3270a0 100644 --- a/iterator/iterator.h +++ b/iterator/iterator.h @@ -67,7 +67,8 @@ struct rbtree_type; #define MAX_RESTART_COUNT 11 /** max number of referrals. Makes sure resolver does not run away */ #define MAX_REFERRAL_COUNT 130 -/** max number of queries-sent-out. Make sure large NS set does not loop */ +/** max number of queries-sent-out. Make sure large NS set does not loop. + * Resets on query restarts (e.g., CNAMES) and referrals. */ #define MAX_SENT_COUNT 32 /** max number of queries for which to perform dnsseclameness detection, * (rrsigs missing detection) after that, just pick up that response */