[GNUnet-SVN] r6863 - GNUnet/src/util/network

[gnunet]

Author: amatus
Date: 2008-05-21 20:14:53 -0600 (Wed, 21 May 2008)
New Revision: 6863

Modified:
   GNUnet/src/util/network/io.c
Log:
A few changes that FreeBSD 7 seems to like

Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c        2008-05-21 18:49:13 UTC (rev 6862)
+++ GNUnet/src/util/network/io.c        2008-05-22 02:14:53 UTC (rev 6863)
@@ -112,6 +112,9 @@
           (errno != EINVAL) &&  /* OS X returns these instead of ENOTCONN */
           (errno != EHOSTDOWN) && (errno != EHOSTUNREACH) &&
 #endif
+#ifdef FREEBSD
+          (errno != ECONNRESET) &&
+#endif
           (errno != ENOTCONN))
         GNUNET_GE_LOG_STRERROR (s->ectx,
                                 GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
@@ -126,7 +129,7 @@
 }
 
 /* TODO: log errors! */
-#ifdef OSX
+#if OSX || SOMEBSD
 static int
 socket_set_nosigpipe (struct GNUNET_SocketHandle *s, int dontSigPipe)
 {
@@ -203,11 +206,11 @@
 #ifdef CYGWIN
   if (0 == (nc & GNUNET_NC_IGNORE_INT))
     flags |= MSG_NOSIGNAL;
-#elif OSX
+#elif OSX || SOMEBSD
   socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
-#elif SOMEBSD || SOLARIS
+#elif SOLARIS
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
 #elif LINUX
@@ -287,11 +290,11 @@
 #ifdef CYGWIN
   if (0 == (nc & GNUNET_NC_IGNORE_INT))
     flags |= MSG_NOSIGNAL;
-#elif OSX
+#elif OSX || SOMEBSD
   socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
-#elif SOMEBSD || SOLARIS
+#elif SOLARIS
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
 #elif LINUX
@@ -360,10 +363,10 @@
 
   GNUNET_socket_set_blocking (s, 0 != (nc & GNUNET_NC_BLOCKING));
   flags = 0;
-#if SOMEBSD || SOLARIS
+#if SOLARIS
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
-#elif OSX
+#elif OSX || SOMEBSD
   socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
@@ -437,10 +440,10 @@
 
   GNUNET_socket_set_blocking (s, 0 != (nc & GNUNET_NC_BLOCKING));
   flags = 0;
-#if SOMEBSD || SOLARIS
+#if SOLARIS
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;
-#elif OSX
+#elif OSX || SOMEBSD
   socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
   if (0 == (nc & GNUNET_NC_BLOCKING))
     flags |= MSG_DONTWAIT;