Keep quiet about expected errors on incoming connections.

diff --git a/debian/changelog b/debian/changelog
index c00b120..5717a50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 catacomb (2.0.1) experimental; urgency=low
 
   * Debianization!
+  * (pixie): Don't report uninteresting errors when accepting connections.
 
- -- Mark Wooding <mdw@nsict.org>  Mon, 10 Nov 2003 22:02:52 +0000
+ -- Mark Wooding <mdw@nsict.org>  Thu, 11 Dec 2003 10:47:59 +0000

diff --git a/pixie.c b/pixie.c
index a1d1e2a..ba1285a 100644 (file)
--- a/pixie.c
+++ b/pixie.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pixie.c,v 1.12 2002/01/13 13:50:42 mdw Exp $
+ * $Id: pixie.c,v 1.13 2004/03/21 22:43:05 mdw Exp $
  *
  * Passphrase pixie for Catacomb
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: pixie.c,v $
+ * Revision 1.13  2004/03/21 22:43:05  mdw
+ * Keep quiet about expected errors on incoming connections.
+ *
  * Revision 1.12  2002/01/13 13:50:42  mdw
  * Various fixes tracking mLib changes.
  *
@@ -902,7 +905,8 @@ static void pixserv_accept(int fd, unsigned mode, void *p)
   if (mode != SEL_READ)
     return;
   if ((nfd = accept(fd, (struct sockaddr *)&sun, &sunsz)) < 0) {
-    if (verbose)
+    if (verbose && errno != EAGAIN && errno != EWOULDBLOCK &&
+       errno != ECONNABORTED && errno != EPROTO && errno != EINTR)
       log("new connection failed: %s", strerror(errno));
     return;
   }