From: Yorgos Thessalonikefs Date: Tue, 23 Jul 2024 07:07:06 +0000 (+0200) Subject: - Fix #1106: ratelimit-below-domain logs the wrong FROM address. X-Git-Tag: release-1.21.0rc1~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3512eaec4851d472f509c5a7bd67c7d360a7e0b7;p=thirdparty%2Funbound.git - Fix #1106: ratelimit-below-domain logs the wrong FROM address. --- diff --git a/doc/Changelog b/doc/Changelog index 815773d1a..6bac83a7c 100644 --- 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 eab94535c..58f1e6d58 100644 --- 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,