From: Nils Durner <durner@gnunet.org>
Date: Thu, 19 Nov 2009 20:42:52 +0000 (+0000)
Subject: fix MinGW
X-Git-Tag: initial-import-from-subversion-38251~23051
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3707a0f7ac3205b6ba73c02f275f2c2f84bbcedc;p=oweals%2Fgnunet.git

fix MinGW
---

diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index d6ac309f7..8f76b8e74 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -60,6 +60,7 @@ open_listen_socket ()
 #if HAVE_SOCKADDR_IN_SIN_LEN
   sa.sin_len = sizeof (sa);
 #endif
+  sa.sin_family = AF_INET;
   sa.sin_port = htons (PORT);
   desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);
   GNUNET_assert (desc != 0);
@@ -67,9 +68,13 @@ open_listen_socket ()
       (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)) == GNUNET_OK);
+  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (desc,
+      (const struct sockaddr *) &sa, sizeof(sa)))
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+          "bind");
+      GNUNET_assert (0);
+    }
   GNUNET_NETWORK_socket_listen (desc, 5);
   return desc;
 }
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index b90191384..9b00bbdf7 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -59,6 +59,7 @@ open_listen_socket ()
 #if HAVE_SOCKADDR_IN_SIN_LEN
   sa.sin_len = sizeof (sa);
 #endif
+  sa.sin_family = AF_INET;
   sa.sin_port = htons (PORT);
   desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);
   GNUNET_assert (desc != NULL);
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 0590d36d5..44609fffe 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -56,6 +56,7 @@ open_listen_socket ()
 #if HAVE_SOCKADDR_IN_SIN_LEN
   sa.sin_len = sizeof (sa);
 #endif
+  sa.sin_family = AF_INET;
   sa.sin_port = htons (PORT);
   desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);
   GNUNET_assert (desc != NULL);