return codes

diff --git a/src/util/connection.c b/src/util/connection.c
index 2e3a64370b3ab4c221b771e1e61790966948885a..4eef53f4ad08c3e07b901475b79783f7abccd2d6 100644 (file)
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -309,7 +309,7 @@ GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle
        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                    _("Access denied to `%s'\n"),
                    GNUNET_a2s(uaddr, addrlen));
-      GNUNET_break (0 == GNUNET_NETWORK_socket_shutdown (sock, SHUT_RDWR));
+      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_shutdown (sock, SHUT_RDWR));
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
       GNUNET_free (uaddr);
       return NULL;

diff --git a/src/util/server.c b/src/util/server.c
index b437351321fdfe2b4fd30723775f29fa0ef99af1..339dfae7c62916d094056af960af8a07ca925afb 100644 (file)
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -398,7 +398,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                          "fcntl");
 #endif
-  if (GNUNET_NETWORK_socket_setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
+  if (GNUNET_NETWORK_socket_setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                          "setsockopt");
   /* bind the socket */
@@ -412,7 +412,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
       return NULL;
     }
-  if (0 != GNUNET_NETWORK_socket_listen (sock, 5))
+  if (GNUNET_OK != GNUNET_NETWORK_socket_listen (sock, 5))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "listen");
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));

diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index 2f82072f9e880fa449afc8d784acfa956870663b..6a04f1f4cf3dff0a6d5395c3ce8c3e1adb2b98f3 100644 (file)
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -61,7 +61,7 @@ open_listen_socket ()
   sa.sin_family = AF_INET;
   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, 

diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index b1decebc3731c1685aeb7367dbbe37f989bf35c0..0d6462b170eddbadfdbf1c1c6d271e9c0f204af5 100644 (file)
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -60,7 +60,7 @@ open_listen_socket ()
   sa.sin_port = htons (PORT);
   desc = GNUNET_NETWORK_socket_socket (AF_INET, SOCK_STREAM, 0);
   GNUNET_assert (desc != 0);
-  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,

diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index 003138530a2a850f67ead6bfd54d8a7849e50e4d..a759cf54644a0da4cb597287e08121be21e1d731 100644 (file)
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -61,7 +61,7 @@ open_listen_socket ()
   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,

diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 3a4b69d6776a8248f564a1f25d37f03dcc81adad..daadc03030b38f52f9b9e32140a532a05ae1ca6d 100644 (file)
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -54,7 +54,7 @@ open_listen_socket ()
   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,