- Fix #1106: ratelimit-below-domain logs the wrong FROM address.

diff --git a/doc/Changelog b/doc/Changelog
index 815773d1a3ebb8f5520436bb1598dc04c14b0b3d..6bac83a7caebecd858b32cc6badebec2fda1df8c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+23 July 2024: Yorgos
+       - Fix #1106: ratelimit-below-domain logs the wrong FROM address.
+
 19 July 2024: Wouter
        - Add dnstap-sample-rate that logs only 1/N messages, for high volume
          server environments. Thanks Dan Luther.

diff --git a/services/outside_network.c b/services/outside_network.c
index eab94535c9c3abc38777ee820d309fc248cc7989..58f1e6d586aa378bc44a240120c3192c37d7d42a 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -3466,7 +3466,10 @@ outnet_serviced_query(struct outside_network* outnet,
                        timenow = *env->now;
                        if(!infra_ratelimit_inc(env->infra_cache, zone,
                                zonelen, timenow, env->cfg->ratelimit_backoff,
-                               &qstate->qinfo, qstate->reply)) {
+                               &qstate->qinfo,
+                               qstate->mesh_info->reply_list
+                                       ?&qstate->mesh_info->reply_list->query_reply
+                                       :NULL)) {
                                /* Can we pass through with slip factor? */
                                if(env->cfg->ratelimit_factor == 0 ||
                                        ub_random_max(env->rnd,