ack florian

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

diff --git a/src/util/test_client.c b/src/util/test_client.c
index 89adf41a36e87fc164db81b6b8654e2b7fa5d876..558a3cf1e74b52b99413a27a7378ac43467fa7b4 100644 (file)
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -52,7 +52,7 @@ copy_msg (void *cls, size_t size, void *buf)
 
   GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (cpy->size));
   GNUNET_assert (size >= ntohs (cpy->size));
-  memcpy (buf, cpy, ntohs (cpy->size));
+  GNUNET_memcpy (buf, cpy, ntohs (cpy->size));
   GNUNET_SERVER_receive_done (ctx->client, GNUNET_OK);
   GNUNET_free (cpy);
   GNUNET_free (ctx);
@@ -79,7 +79,7 @@ echo_cb (void *cls,
   cc = GNUNET_new (struct CopyContext);
   cc->client = client;
   cpy = GNUNET_malloc (ntohs (message->size));
-  memcpy (cpy, message, ntohs (message->size));
+  GNUNET_memcpy (cpy, message, ntohs (message->size));
   cc->cpy = cpy;
   GNUNET_assert (NULL !=
                  GNUNET_SERVER_notify_transmit_ready (client,
@@ -136,11 +136,11 @@ task (void *cls)
   socklen_t slens[2];
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
-  GNUNET_MQ_hd_fixed_size (bounce,
-                           MY_TYPE,
-                           struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler chandlers[] = {
-    make_bounce_handler (cls),
+    GNUNET_MQ_hd_fixed_size (bounce,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             cls),
     GNUNET_MQ_handler_end ()
   };