From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 25 Jun 2025 07:10:19 +0000 (+0200)
Subject: datamodel/templates: fix swapped edns-buffer-size
X-Git-Tag: v6.0.15~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-edns-buffer-uuxvqp%2Fdeployments%2F7074;p=thirdparty%2Fknot-resolver.git

datamodel/templates: fix swapped edns-buffer-size
---

diff --git a/NEWS b/NEWS
index 226e97be4..bbd5cc16c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Bugfixes
 - manager: prometheus metrics update (!1703, #917)
   - added missing metrics split by IPv4 and IPv6
 - /dnssec/trust-anchors-files: fix resolver startup (!1704)
+- /network/edns-buffer-size: fix swapped upstream+downstream (!1711)
 
 
 Knot Resolver 6.0.14 (2025-06-03)
diff --git a/lib/resolve.h b/lib/resolve.h
index 8aad3bbae..c463118a3 100644
--- a/lib/resolve.h
+++ b/lib/resolve.h
@@ -155,10 +155,9 @@ struct kr_context
 	/** Default kr_request flags.  For startup defaults see init_resolver() */
 	struct kr_qflags options;
 
-	/** Default EDNS towards *both* clients and upstream.
-	 * LATER: consider splitting the two, e.g. allow separately
-	 * configured limits for UDP packet size (say, LAN is under control). */
+	/** Default EDNS towards clients */
 	knot_rrset_t *downstream_opt_rr;
+	/** Default EDNS towards authoritative servers or forward targets */
 	knot_rrset_t *upstream_opt_rr;
 
 	trie_t *trust_anchors;
diff --git a/python/knot_resolver/datamodel/templates/network.lua.j2 b/python/knot_resolver/datamodel/templates/network.lua.j2
index 665ee4543..cfc152cd3 100644
--- a/python/knot_resolver/datamodel/templates/network.lua.j2
+++ b/python/knot_resolver/datamodel/templates/network.lua.j2
@@ -27,8 +27,8 @@ modules.unload('edns_keepalive')
 
 -- network.edns-buffer-size
 net.bufsize(
-    {{ cfg.network.edns_buffer_size.upstream.bytes() }},
-    {{ cfg.network.edns_buffer_size.downstream.bytes() }}
+    {{ cfg.network.edns_buffer_size.downstream.bytes() }},
+    {{ cfg.network.edns_buffer_size.upstream.bytes() }}
 )
 
 {% if cfg.network.tls.cert_file and cfg.network.tls.key_file %}
@@ -99,4 +99,4 @@ net.proxy_allowed({})
 -- network.listen
 {% for listen in cfg.network.listen %}
 {{ network_listen(listen) }}
-{% endfor %}
\ No newline at end of file
+{% endfor %}