Refactor incrementing query counters

Move the logic incrementing the query counter and the global query
counter into a dedicated helper function.

(cherry picked from commit 05d6da2de54c093689e675e81ae898ee41220666)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 2fa71eb31158cfa2b1d75fc11bfb35a63ca81fd0..406ea6c56f78ee3e24206a407b17e47099a25e6b 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4203,6 +4203,39 @@ fctx_nextaddress(fetchctx_t *fctx) {
        return addrinfo;
 }
 
+static isc_result_t
+incr_query_counters(fetchctx_t *fctx) {
+       isc_result_t result;
+
+       result = isc_counter_increment(fctx->qc);
+#if WANT_QUERYTRACE
+       FCTXTRACE5("query", "max-recursion-queries, querycount=",
+                  isc_counter_used(fctx->qc));
+#endif
+       if (result != ISC_R_SUCCESS) {
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+                             DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
+                             "exceeded max queries resolving '%s' "
+                             "(max-recursion-queries, querycount=%u)",
+                             fctx->info, isc_counter_used(fctx->qc));
+       } else if (fctx->gqc != NULL) {
+               result = isc_counter_increment(fctx->gqc);
+#if WANT_QUERYTRACE
+               FCTXTRACE5("query", "max-query-count, querycount=",
+                          isc_counter_used(fctx->gqc));
+#endif
+               if (result != ISC_R_SUCCESS) {
+                       isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+                                     DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
+                                     "exceeded global max queries resolving "
+                                     "'%s' (max-query-count, querycount=%u)",
+                                     fctx->info, isc_counter_used(fctx->gqc));
+               }
+       }
+
+       return result;
+}
+
 static void
 fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) {
        isc_result_t result;
@@ -4357,31 +4390,11 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) {
                return;
        }
 
-       result = isc_counter_increment(fctx->qc);
-       if (result != ISC_R_SUCCESS) {
-               isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
-                             DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
-                             "exceeded max queries resolving '%s' "
-                             "(max-recursion-queries, querycount=%u)",
-                             fctx->info, isc_counter_used(fctx->qc));
-               fctx_done_detach(&fctx, DNS_R_SERVFAIL);
-               return;
-       }
-
-       if (fctx->gqc != NULL) {
-               result = isc_counter_increment(fctx->gqc);
-               if (result != ISC_R_SUCCESS) {
-                       isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
-                                     DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
-                                     "exceeded global max queries resolving "
-                                     "'%s' (max-query-count, querycount=%u)",
-                                     fctx->info, isc_counter_used(fctx->gqc));
-                       fctx_done_detach(&fctx, DNS_R_SERVFAIL);
-                       return;
-               }
-       }
+       CHECK(incr_query_counters(fctx));
 
        result = fctx_query(fctx, addrinfo, fctx->options);
+
+cleanup:
        if (result != ISC_R_SUCCESS) {
                fctx_done_detach(&fctx, result);
        } else if (retrying) {