Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / dht / dht_test_lib.c

diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index de41b2eccc935e4faad5c3bda88dad56df7d3213..4c1bd3057e0e737de372f2f2d02896a4f0865d8c 100644 (file)
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 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
@@ -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.
 */
 /**
  * @file dht/dht_test_lib.c
@@ -49,7 +49,7 @@ struct GNUNET_DHT_TEST_Context
    * Main function of the test to run once all DHTs are available.
    */
   GNUNET_DHT_TEST_AppMain app_main;
-  
+
   /**
    * Closure for 'app_main'.
    */
@@ -73,7 +73,7 @@ struct GNUNET_DHT_TEST_Context
  *          from GNUNET_TESTBED_service_connect()
  * @return service handle to return in 'op_result', NULL on error
  */
-static void * 
+static void *
 dht_connect_adapter (void *cls,
                     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
@@ -88,7 +88,7 @@ dht_connect_adapter (void *cls,
  * @param cls closure
  * @param op_result service handle returned from the connect adapter
  */
-static void 
+static void
 dht_disconnect_adapter (void *cls,
                        void *op_result)
 {
@@ -107,7 +107,7 @@ dht_disconnect_adapter (void *cls,
  * @param emsg error message in case the operation has failed; will be NULL if
  *          operation has executed successfully.
  */
-static void 
+static void
 dht_connect_cb (void *cls,
                struct GNUNET_TESTBED_Operation *op,
                void *ca_result,
@@ -115,10 +115,11 @@ dht_connect_cb (void *cls,
 {
   struct GNUNET_DHT_TEST_Context *ctx = cls;
   unsigned int i;
- 
+
   if (NULL != emsg)
   {
-    fprintf (stderr, "Failed to connect to DHT service: %s\n",
+    fprintf (stderr,
+             "Failed to connect to DHT service: %s\n",
             emsg);
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -134,7 +135,7 @@ dht_connect_cb (void *cls,
                 ctx,
                 ctx->num_peers,
                 ctx->peers,
-                ctx->dhts);             
+                ctx->dhts);
 }
 
 
@@ -192,7 +193,7 @@ dht_test_run (void *cls,
  * @param tmain main function to run once the testbed is ready
  * @param tmain_cls closure for 'tmain'
  */
-void 
+void
 GNUNET_DHT_TEST_run (const char *testname,
                     const char *cfgname,
                     unsigned int num_peers,
@@ -200,11 +201,13 @@ GNUNET_DHT_TEST_run (const char *testname,
                     void *tmain_cls)
 {
   struct GNUNET_DHT_TEST_Context *ctx;
-  
-  ctx = GNUNET_malloc (sizeof (struct GNUNET_DHT_TEST_Context));
+
+  ctx = GNUNET_new (struct GNUNET_DHT_TEST_Context);
   ctx->num_peers = num_peers;
-  ctx->ops = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Operation *));
-  ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *));
+  ctx->ops = GNUNET_new_array (num_peers,
+                               struct GNUNET_TESTBED_Operation *);
+  ctx->dhts = GNUNET_new_array (num_peers,
+                                struct GNUNET_DHT_Handle *);
   ctx->app_main = tmain;
   ctx->app_main_cls = tmain_cls;
   (void) GNUNET_TESTBED_test_run (testname,