Quieter low verbosity logging.

git-svn-id: file:///svn/unbound/trunk@719 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index c4d314003d38d7d073fc2e68e94b95c784171313..f2d7dbe296d42818588bdabf09f92ed224330327 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - fixup assertion failure that relied on compressed names to be
          smaller than uncompressed names. A packet from comrite.com was seen
          to be compressed to a larger size. Added it as unit test.
+       - quieter logging at low verbosity level for common tcp messages.
 
 23 October 2007: Wouter
        - fixup (grand-)parent problem for dnssec-lameness detection.

diff --git a/util/netevent.c b/util/netevent.c
index 696fd31444b9515b09bcb6d688e1af9791e60d40..64cc5ee73228bb5ab0050362b6b799dea6a858b1 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -347,6 +347,8 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
                else if(r == -1) {
                        if(errno == EINTR || errno == EAGAIN)
                                return 1;
+                       if(errno == ECONNRESET && verbosity < 2)
+                               return 0; /* silence reset by peer */
                        log_err("read (in tcp s): %s", strerror(errno));
                        return 0;
                } 
@@ -411,6 +413,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
                }
                if(error == EINPROGRESS || error == EWOULDBLOCK)
                        return 1; /* try again later */
+               if(error == ECONNREFUSED && verbosity < 2)
+                       return 0; /* silence 'connection refused' */
                if(error != 0) {
                        log_err("tcp connect: %s", strerror(error));
                        return 0;