- 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.

diff --git a/doc/Changelog b/doc/Changelog
index 5f3e8d4feb7f2d1dd4b80912160437fc652d073f..84edafcee708383ee6d8a4edd80bf08b31ddc5e0 100644 (file)
--- 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 980829d087e9a8ff8a46da75b6aec0d231a56b9b..3663144b24ecf17b31ee382f89850441eb442b79 100644 (file)
--- 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;
 }