upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-03 13:29:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

squelch 'tcp connect: bla' errors in logfile.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2354 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-12-17 09:10:46 +00:00
parent ecb9db442d
commit f8796f94f4
2 changed files with 6 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

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

32
util/netevent.c
View file

@ -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));