From: Yorgos Thessalonikefs Date: Mon, 11 May 2026 18:39:38 +0000 (+0200) Subject: - Fix comment and verbose logging for EDNS fallback buffer size. X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=13716dc8bea2a6c766f760624d45b136519462f0;p=thirdparty%2Funbound.git - Fix comment and verbose logging for EDNS fallback buffer size. --- diff --git a/doc/Changelog b/doc/Changelog index 705013b20..1a2d9a64b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +11 May 2026: Yorgos + - Fix comment and verbose logging for EDNS fallback buffer size. + 8 May 2026: Wouter - Fix to relax assertions after the TTL 0 handling change. This relaxes an assertion in cachedb (it fails instead), diff --git a/services/outside_network.c b/services/outside_network.c index b19d58622..be65c6114 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -3351,9 +3351,9 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, if(error == NETEVENT_TIMEOUT) { if(sq->status == serviced_query_UDP_EDNS && sq->last_rtt < 5000 && (serviced_query_udp_size(sq, serviced_query_UDP_EDNS_FRAG) < serviced_query_udp_size(sq, serviced_query_UDP_EDNS))) { - /* fallback to 1480/1280 */ + /* fallback to 1472/1232 */ sq->status = serviced_query_UDP_EDNS_FRAG; - log_name_addr(VERB_ALGO, "try edns1xx0", sq->qbuf+10, + log_name_addr(VERB_ALGO, "try edns1xx2", sq->qbuf+10, &sq->addr, sq->addrlen); if(!serviced_udp_send(sq, c->buffer)) { serviced_callbacks(sq, NETEVENT_CLOSED, c, rep); diff --git a/testdata/stat_values.tdir/stat_values.test b/testdata/stat_values.tdir/stat_values.test index 9156f95a9..c02bfcf19 100644 --- a/testdata/stat_values.tdir/stat_values.test +++ b/testdata/stat_values.tdir/stat_values.test @@ -282,7 +282,7 @@ if grep "192.0.2.1" outfile; then else end 1 fi -sleep 1 # make sure the outgoing UDP (and no edns1xx0 retry because not a smaller buffer size) are accounted for. +sleep 1 # make sure the outgoing UDP (and no edns1xx2 retry because not a smaller buffer size) are accounted for. check_stats "\ total.num.queries=1 total.num.expired=1