squelch 'tcp connect: bla' errors in logfile.

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

diff --git a/doc/Changelog b/doc/Changelog
index feca4dc9a0532e4cfa1525e21d9c988e4f85657f..46ddd13f39e367b5462fb8a1e6b64793a639f915 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+17 December 2010: Wouter
+       - squelch 'tcp connect: bla' in logfile, (set verbosity 2 to see them).
+
 16 December 2010: Wouter
        - Fix our 'BDS' license (typo reported by Xavier Belanger).
 

diff --git a/util/netevent.c b/util/netevent.c
index 4b8739ef4bdb84ff13ec28682d53f85cdb483ea2..e25f5ddae3660f3d866f3b2ef39f742e63b1d333 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -891,34 +891,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
                if(error == EINPROGRESS || error == EWOULDBLOCK)
                        return 1; /* try again later */
 #endif
-#ifdef ECONNREFUSED
-                else if(error == ECONNREFUSED && verbosity < 2)
-                        return 0; /* silence 'connection refused' */
-#endif
-#ifdef ENETUNREACH
-                else if(error == ENETUNREACH && verbosity < 2)
-                        return 0; /* silence 'network unreachable' */
-#endif
-#ifdef ENETDOWN
-                else if(error == ENETDOWN && verbosity < 2)
-                        return 0; /* silence 'network is down' */
-#endif
-#ifdef EHOSTUNREACH
-                else if(error == EHOSTUNREACH && verbosity < 2)
-                        return 0; /* silence 'no route to host' */
-#endif
-#ifdef EHOSTDOWN
-                else if(error == EHOSTDOWN && verbosity < 2)
-                        return 0; /* silence 'host is down' */
-#endif
-#ifdef ETIMEDOUT
-                else if(error == ETIMEDOUT && verbosity < 2)
-                        return 0; /* silence 'connection timed out' */
-#endif
-#ifdef EPIPE
-                else if(error == EPIPE && verbosity < 2)
-                        return 0; /* silence 'broken pipe' */
-#endif
+               else if(error != 0 && verbosity < 2)
+                       return 0; /* silence lots of chatter in the logs */
                 else if(error != 0) {
                        log_err("tcp connect: %s", strerror(error));
 #else /* USE_WINSOCK */
@@ -928,7 +902,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
                else if(error == WSAEWOULDBLOCK) {
                        winsock_tcp_wouldblock(&c->ev->ev, EV_WRITE);
                        return 1;
-               } else if(error == WSAECONNREFUSED || error == WSAEHOSTUNREACH)
+               } else if(error != 0 && verbosity < 2)
                        return 0;
                else if(error != 0) {
                        log_err("tcp connect: %s", wsa_strerror(error));