- silence 'tcp connect: broken pipe' at low verbosity.

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

diff --git a/doc/Changelog b/doc/Changelog
index 146588931157f1628a1cffce314548ea492cdb0c..88119ac2a3fb6b0c3d5d7c59fcab57a6c4ac364f 100644 (file)
--- 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 283a0d76fc1a322330ac5ce10ffa756ddb3bcc44..8148bc877a383bf6329afced3ddf6b237fc129ef 100644 (file)
--- 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));