From: Christian Allred <christian@theallreds.net>
Date: Mon, 18 Apr 2022 19:16:40 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/NLnetLabs/unbound into restart_conf
X-Git-Tag: release-1.17.1rc1~6^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19e12ab5d1becd57c5385f6af3c1f57be977886;p=thirdparty%2Funbound.git

Merge branch 'master' of https://github.com/NLnetLabs/unbound into restart_conf
---

d19e12ab5d1becd57c5385f6af3c1f57be977886
diff --cc iterator/iter_utils.c
index 637acf736,f3bea46d6..5c811c6d3
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@@ -176,9 -176,7 +176,9 @@@ iter_apply_cfg(struct iter_env* iter_en
  	}
  	iter_env->supports_ipv6 = cfg->do_ip6;
  	iter_env->supports_ipv4 = cfg->do_ip4;
- 
 +	iter_env->max_query_restarts = cfg->max_query_restarts;
+ 	iter_env->outbound_msg_retry = cfg->outbound_msg_retry;
 +
  	return 1;
  }
  
diff --cc iterator/iterator.h
index d3ca716fc,8b840528d..57d06ef8a
--- a/iterator/iterator.h
+++ b/iterator/iterator.h
@@@ -140,8 -138,8 +138,10 @@@ struct iter_env 
  	/** number of queries that have been ratelimited */
  	size_t num_queries_ratelimited;
  
 +	/** max number of query restarts to limit length of CNAME chain */
 +	size_t max_query_restarts;
+ 	/** number of retries on outgoing queries */
+ 	int outbound_msg_retry;
  };
  
  /**