Fix perf_crypto_rsa.c after various changes

[oweals/gnunet.git] / src / util / server_tc.c

diff --git a/src/util/server_tc.c b/src/util/server_tc.c
index 020fd86db0fb6bd841ffaf5b8d6895777ad99a9e..986bc9b434a53c5ca0126ea4d2de6ac4c49f24ff 100644 (file)
--- a/src/util/server_tc.c
+++ b/src/util/server_tc.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -26,11 +26,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
@@ -82,11 +78,11 @@ transmit_response (void *cls, size_t size, void *buf)
   struct GNUNET_SERVER_TransmitContext *tc = cls;
   size_t msize;
 
-  if (buf == NULL)
-    {
-      GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
-      return 0;
-    }
+  if (NULL == buf)
+  {
+    GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
+    return 0;
+  }
   if (tc->total - tc->off > size)
     msize = size;
   else
@@ -94,28 +90,26 @@ transmit_response (void *cls, size_t size, void *buf)
   memcpy (buf, &tc->buf[tc->off], msize);
   tc->off += msize;
   if (tc->total == tc->off)
-    {
-
-      GNUNET_SERVER_receive_done (tc->client, GNUNET_OK);
-      GNUNET_SERVER_client_drop (tc->client);
-      GNUNET_free_non_null (tc->buf);
-      GNUNET_free (tc);
-    }
+  {
+    GNUNET_SERVER_receive_done (tc->client, GNUNET_OK);
+    GNUNET_SERVER_client_drop (tc->client);
+    GNUNET_free_non_null (tc->buf);
+    GNUNET_free (tc);
+  }
   else
+  {
+    if (NULL ==
+        GNUNET_SERVER_notify_transmit_ready (tc->client,
+                                             GNUNET_MIN (MIN_BLOCK_SIZE,
+                                                         tc->total - tc->off),
+                                             GNUNET_TIME_absolute_get_remaining
+                                             (tc->timeout), &transmit_response,
+                                             tc))
     {
-      if (NULL ==
-         GNUNET_SERVER_notify_transmit_ready (tc->client,
-                                              GNUNET_MIN (MIN_BLOCK_SIZE,
-                                                          tc->total -
-                                                          tc->off),
-                                              GNUNET_TIME_absolute_get_remaining
-                                              (tc->timeout),
-                                              &transmit_response, tc))
-       {
-         GNUNET_break (0);
-         GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
-       }
+      GNUNET_break (0);
+      GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
     }
+  }
   return msize;
 }
 
@@ -132,8 +126,8 @@ GNUNET_SERVER_transmit_context_create (struct GNUNET_SERVER_Client *client)
 {
   struct GNUNET_SERVER_TransmitContext *tc;
 
-  GNUNET_assert (client != NULL);
-  tc = GNUNET_malloc (sizeof (struct GNUNET_SERVER_TransmitContext));
+  GNUNET_assert (NULL != client);
+  tc = GNUNET_new (struct GNUNET_SERVER_TransmitContext);
   GNUNET_SERVER_client_keep (client);
   tc->client = client;
   return tc;
@@ -151,10 +145,9 @@ GNUNET_SERVER_transmit_context_create (struct GNUNET_SERVER_Client *client)
  * @param type type of the message
  */
 void
-GNUNET_SERVER_transmit_context_append_data (struct
-                                           GNUNET_SERVER_TransmitContext *tc,
-                                           const void *data, size_t length,
-                                           uint16_t type)
+GNUNET_SERVER_transmit_context_append_data (struct GNUNET_SERVER_TransmitContext
+                                            *tc, const void *data,
+                                            size_t length, uint16_t type)
 {
   struct GNUNET_MessageHeader *msg;
   size_t size;
@@ -181,10 +174,10 @@ GNUNET_SERVER_transmit_context_append_data (struct
  */
 void
 GNUNET_SERVER_transmit_context_append_message (struct
-                                              GNUNET_SERVER_TransmitContext
-                                              *tc,
-                                              const struct
-                                              GNUNET_MessageHeader *msg)
+                                               GNUNET_SERVER_TransmitContext
+                                               *tc,
+                                               const struct GNUNET_MessageHeader
+                                               *msg)
 {
   struct GNUNET_MessageHeader *m;
   uint16_t size;
@@ -199,27 +192,27 @@ GNUNET_SERVER_transmit_context_append_message (struct
 
 /**
  * Execute a transmission context.  If there is
- * an error in the transmission, the receive_done
- * method will be called with an error code (GNUNET_SYSERR),
- * otherwise with GNUNET_OK.
+ * an error in the transmission, the #GNUNET_SERVER_receive_done()
+ * method will be called with an error code (#GNUNET_SYSERR),
+ * otherwise with #GNUNET_OK.
  *
  * @param tc transmission context to use
  * @param timeout when to time out and abort the transmission
  */
 void
 GNUNET_SERVER_transmit_context_run (struct GNUNET_SERVER_TransmitContext *tc,
-                                   struct GNUNET_TIME_Relative timeout)
+                                    struct GNUNET_TIME_Relative timeout)
 {
   tc->timeout = GNUNET_TIME_relative_to_absolute (timeout);
   if (NULL ==
       GNUNET_SERVER_notify_transmit_ready (tc->client,
-                                          GNUNET_MIN (MIN_BLOCK_SIZE,
-                                                      tc->total), timeout,
-                                          &transmit_response, tc))
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
-    }
+                                           GNUNET_MIN (MIN_BLOCK_SIZE,
+                                                       tc->total), timeout,
+                                           &transmit_response, tc))
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_transmit_context_destroy (tc, GNUNET_SYSERR);
+  }
 }
 
 
@@ -237,7 +230,7 @@ GNUNET_SERVER_transmit_context_run (struct GNUNET_SERVER_TransmitContext *tc,
  */
 void
 GNUNET_SERVER_transmit_context_destroy (struct GNUNET_SERVER_TransmitContext
-                                       *tc, int success)
+                                        *tc, int success)
 {
   GNUNET_SERVER_receive_done (tc->client, success);
   GNUNET_SERVER_client_drop (tc->client);