X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_connection_timeout.c;h=2a1ce58f3a85ba7ee7d344ff377e27e42a05ec77;hb=76c024311489ede1bca79cf647e568dde70d8a48;hp=2580ae30a779034dde7fb6e1f9d8859030330574;hpb=cabc8ba699f76cab751b97014d9375ec74612448;p=oweals%2Fgnunet.git

diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 2580ae30a..2a1ce58f3 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -51,15 +51,18 @@ open_listen_socket ()
   struct GNUNET_NETWORK_Handle *desc;
 
   memset (&sa, 0, sizeof (sa));
+#if HAVE_SOCKADDR_IN_SIN_LEN
+  sa.sin_len = sizeof (sa);
+#endif
   sa.sin_port = htons (PORT);
   desc = GNUNET_NETWORK_socket_socket (AF_INET, SOCK_STREAM, 0);
   GNUNET_assert (desc != NULL);
-  if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
+  if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                 "setsockopt");
   GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, 
 					     (const struct sockaddr*) &sa, 
-					     sizeof (sa)) >= 0);
+					     sizeof (sa)) == GNUNET_OK);
   GNUNET_NETWORK_socket_listen (desc, 5);
   return desc;
 }