- Clarify the use of MAX_SENT_COUNT in the iterator code.

diff --git a/doc/Changelog b/doc/Changelog
index 36192be81f25964140298b700adbaadfad646f1c..a30373f527fa0d7340fe9523bf9d63371dc732df 100644 (file)
--- 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 2f3ad06fe6ea44cf48abf19a1332ceb70d5b1a77..9c8d256d36132021088c7d7deac38058dd186ae3 100644 (file)
--- 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 e35718cf33bdc4103f3a4652440445b2a37fe9fe..18d3270a0c159c9b0a0c47be57f0c48b28b6340a 100644 (file)
--- 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 */