From 86fe9cbce533549e4310bd3fc7c1b89df70a33d4 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Mon, 3 Jun 2024 12:14:51 +0200 Subject: [PATCH] - Fix to squelch connection reset by peer errors from log. And fix that the tcp read errors are labeled as initial for the first calls. --- doc/Changelog | 4 ++++ util/netevent.c | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 5f3e8d4fe..84edafcee 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +3 June 2024: Wouter + - Fix to squelch connection reset by peer errors from log. And fix + that the tcp read errors are labeled as initial for the first calls. + 30 May 2024: Wouter - Fix #1079: tags from tagged rpz zones are no longer honored after upgrade from 1.19.3 to 1.20.0. diff --git a/util/netevent.c b/util/netevent.c index 980829d08..3663144b2 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -2365,11 +2365,11 @@ recv_error: #ifndef USE_WINSOCK if(errno == EINTR || errno == EAGAIN) return 1; - if(recv_initial) { #ifdef ECONNRESET - if(errno == ECONNRESET && verbosity < 2) - return 0; /* silence reset by peer */ + if(errno == ECONNRESET && verbosity < 2) + return 0; /* silence reset by peer */ #endif + if(recv_initial) { #ifdef ECONNREFUSED if(errno == ECONNREFUSED && verbosity < 2) return 0; /* silence reset by peer */ @@ -2396,7 +2396,7 @@ recv_error: #endif #ifdef ENOTCONN if(errno == ENOTCONN) { - log_err_addr("read (in tcp s) failed and this " + log_err_addr("read (in tcp initial) failed and this " "could be because TCP Fast Open is " "enabled [--disable-tfo-client " "--disable-tfo-server] but does not " @@ -2430,8 +2430,9 @@ recv_error: return 1; } #endif - log_err_addr("read (in tcp s)", sock_strerror(errno), - &c->repinfo.remote_addr, c->repinfo.remote_addrlen); + log_err_addr((recv_initial?"read (in tcp initial)":"read (in tcp)"), + sock_strerror(errno), &c->repinfo.remote_addr, + c->repinfo.remote_addrlen); return 0; } -- 2.47.3