refactor DHT for new service API

[oweals/gnunet.git] / src / cadet / cadet_test_lib.c

diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c
index 663972cad1d075cb0c2d95b2c4eeb04a6a935e6e..9a70dad4937b9eef60d488940985aa3c783c3be9 100644 (file)
--- a/src/cadet/cadet_test_lib.c
+++ b/src/cadet/cadet_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 cadet/cadet_test_lib.c
@@ -80,7 +80,7 @@ struct GNUNET_CADET_TEST_Context
   /**
    * Application ports.
    */
-  const uint32_t *ports;
+  const struct GNUNET_HashCode **ports;
 
 };
 
@@ -94,7 +94,7 @@ struct GNUNET_CADET_TEST_AdapterContext
    * Peer number for the particular peer.
    */
   unsigned int peer;
-
+ 
   /**
    * General context.
    */
@@ -122,10 +122,18 @@ cadet_connect_adapter (void *cls,
 
   h = GNUNET_CADET_connect (cfg,
                            (void *) (long) actx->peer,
-                           ctx->new_channel,
                            ctx->cleaner,
-                           ctx->handlers,
-                           ctx->ports);
+                           ctx->handlers);
+  if (NULL == ctx->ports)
+    return h;
+
+  for (int i = 0; NULL != ctx->ports[i]; i++)
+  {
+    (void ) GNUNET_CADET_open_port (h, ctx->ports[i],
+                                    ctx->new_channel,
+                                    (void *) (long) actx->peer);
+  }
+
   return h;
 }
 
@@ -271,7 +279,7 @@ GNUNET_CADET_TEST_run (const char *testname,
                       GNUNET_CADET_InboundChannelNotificationHandler new_channel,
                       GNUNET_CADET_ChannelEndHandler cleaner,
                       struct GNUNET_CADET_MessageHandler* handlers,
-                      const uint32_t *ports)
+                      const struct GNUNET_HashCode **ports)
 {
   struct GNUNET_CADET_TEST_Context *ctx;