From c9dbc9907ad13710f0bc95f4ef6374b1b2e5e5e3 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 15 Nov 2010 13:15:23 +0000 Subject: [PATCH] - silence 'tcp connect: broken pipe' at low verbosity. git-svn-id: file:///svn/unbound/trunk@2341 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ util/netevent.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/doc/Changelog b/doc/Changelog index 146588931..88119ac2a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +15 November 2010: Wouter + - silence 'tcp connect: broken pipe' at low verbosity. + 9 November 2010: Wouter - unbound-anchor compiles with openssl 0.9.7. diff --git a/util/netevent.c b/util/netevent.c index 283a0d76f..8148bc877 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -895,6 +895,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #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) { log_err("tcp connect: %s", strerror(error)); @@ -933,6 +937,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #endif /* HAVE_WRITEV */ if(r == -1) { #ifndef USE_WINSOCK +#ifdef EPIPE + if(errno == EPIPE && verbosity < 2) + return 0; /* silence 'broken pipe' */ +#endif if(errno == EINTR || errno == EAGAIN) return 1; log_err("tcp writev: %s", strerror(errno)); -- 2.47.2