- Fix for #41: change outbound retry to int to fix signed comparison

  warnings.

diff --git a/doc/Changelog b/doc/Changelog
index 6592d3207656c47e01fcc213b31abba1974a035e..2bd68409d462487a4312aae74e02a71756f49866 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,8 @@
          processQueryResponse takes an iterator env argument like other
          functions in the iterator, no colon in string for set_option,
          and some whitespace style, to make it similar to the rest.
+       - Fix for #41: change outbound retry to int to fix signed comparison
+         warnings.
 
 3 September 2021: Wouter
        - Fix #538: Fix subnetcache statistics.

diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
index ac7f5c1b2a00ab3c4ed352a88262bc4ead338ece..2482a1f40f03f057073081af172c456f8ae98e28 100644 (file)
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@ -1285,7 +1285,7 @@ iter_scrub_nxdomain(struct dns_msg* msg)
        msg->rep->an_numrrsets = 0;
 }
 
-void iter_dec_attempts(struct delegpt* dp, int d, size_t outbound_msg_retry)
+void iter_dec_attempts(struct delegpt* dp, int d, int outbound_msg_retry)
 {
        struct delegpt_addr* a;
        for(a=dp->target_list; a; a = a->next_target) {
@@ -1300,7 +1300,8 @@ void iter_dec_attempts(struct delegpt* dp, int d, size_t outbound_msg_retry)
        }
 }
 
-void iter_merge_retry_counts(struct delegpt* dp, struct delegpt* old, size_t outbound_msg_retry)
+void iter_merge_retry_counts(struct delegpt* dp, struct delegpt* old,
+       int outbound_msg_retry)
 {
        struct delegpt_addr* a, *o, *prev;
        for(a=dp->target_list; a; a = a->next_target) {

diff --git a/iterator/iter_utils.h b/iterator/iter_utils.h
index c6dc1e4017e8c4588d6d83331b0d72103b61b773..0a40916c0e0238fb672c7d545de7687b2b001442 100644 (file)
--- a/iterator/iter_utils.h
+++ b/iterator/iter_utils.h
@@ -349,7 +349,7 @@ void iter_scrub_nxdomain(struct dns_msg* msg);
  * @param d: decrease.
  * @param outbound_msg_retry: number of retries of outgoing queries
  */
-void iter_dec_attempts(struct delegpt* dp, int d, size_t outbound_msg_retry);
+void iter_dec_attempts(struct delegpt* dp, int d, int outbound_msg_retry);
 
 /**
  * Add retry counts from older delegpt to newer delegpt.
@@ -359,7 +359,7 @@ void iter_dec_attempts(struct delegpt* dp, int d, size_t outbound_msg_retry);
  * @param outbound_msg_retry: number of retries of outgoing queries
  */
 void iter_merge_retry_counts(struct delegpt* dp, struct delegpt* old,
-       size_t outbound_msg_retry);
+       int outbound_msg_retry);
 
 /**
  * See if a DS response (type ANSWER) is too low: a nodata answer with 

diff --git a/iterator/iterator.h b/iterator/iterator.h
index f99193231eed57c0f982e9ae387ba3dcd95b8ea2..a9e58569fcf394160bdeb41ac2a7fca250a35338 100644 (file)
--- a/iterator/iterator.h
+++ b/iterator/iterator.h
@@ -139,7 +139,7 @@ struct iter_env {
        size_t num_queries_ratelimited;
 
        /** number of retries on outgoing queries */
-       size_t outbound_msg_retry;
+       int outbound_msg_retry;
 };
 
 /**

diff --git a/util/config_file.c b/util/config_file.c
index a68099e58f44195c558f5523b6d66afd8de2eb54..39050f553e612a3cfd1fb9d16fb0cf04e18f52ea 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -753,7 +753,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
        else S_POW2("ratelimit-slabs:", ratelimit_slabs)
        else S_NUMBER_OR_ZERO("ip-ratelimit-factor:", ip_ratelimit_factor)
        else S_NUMBER_OR_ZERO("ratelimit-factor:", ratelimit_factor)
-       else S_SIZET_NONZERO("outbound-msg-retry:", outbound_msg_retry)
+       else S_NUMBER_NONZERO("outbound-msg-retry:", outbound_msg_retry)
        else S_SIZET_NONZERO("fast-server-num:", fast_server_num)
        else S_NUMBER_OR_ZERO("fast-server-permil:", fast_server_permil)
        else S_YNO("qname-minimisation:", qname_minimisation)

diff --git a/util/config_file.h b/util/config_file.h
index 618a8865106df6724d060bafb6bbf94a283ad1f1..cd1bc7931c9c862cb45d16b8f7453e69a2160bfd 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -579,7 +579,7 @@ struct config_file {
        /** ratelimit factor, 0 blocks all, 10 allows 1/10 of traffic */
        int ratelimit_factor;
        /** number of retries on outgoing queries */
-       size_t outbound_msg_retry;
+       int outbound_msg_retry;
        /** minimise outgoing QNAME and hide original QTYPE if possible */
        int qname_minimisation;
        /** minimise QNAME in strict mode, minimise according to RFC.