From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 17 Dec 2010 09:10:46 +0000 (+0000)
Subject: squelch 'tcp connect: bla' errors in logfile.
X-Git-Tag: release-1.4.8rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8796f94f4a81dc5209a96249ff85311aa9fdcdc;p=thirdparty%2Funbound.git

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 feca4dc9a..46ddd13f3 100644
--- 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 4b8739ef4..e25f5ddae 100644
--- 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));