gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9585 - gnunet/src/util


From: gnunet
Subject: [GNUnet-SVN] r9585 - gnunet/src/util
Date: Thu, 19 Nov 2009 13:42:52 -0700

Author: durner
Date: 2009-11-19 13:42:52 -0700 (Thu, 19 Nov 2009)
New Revision: 9585

Modified:
   gnunet/src/util/test_connection_addressing.c
   gnunet/src/util/test_connection_receive_cancel.c
   gnunet/src/util/test_connection_timeout.c
Log:
fix MinGW

Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c        2009-11-19 20:15:45 UTC 
(rev 9584)
+++ gnunet/src/util/test_connection_addressing.c        2009-11-19 20:42:52 UTC 
(rev 9585)
@@ -60,6 +60,7 @@
 #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 @@
       (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;
 }

Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c    2009-11-19 20:15:45 UTC 
(rev 9584)
+++ gnunet/src/util/test_connection_receive_cancel.c    2009-11-19 20:42:52 UTC 
(rev 9585)
@@ -59,6 +59,7 @@
 #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);

Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c   2009-11-19 20:15:45 UTC (rev 
9584)
+++ gnunet/src/util/test_connection_timeout.c   2009-11-19 20:42:52 UTC (rev 
9585)
@@ -56,6 +56,7 @@
 #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);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]