clean up for configs

[oweals/gnunet.git] / src / mesh / test_mesh_local.c

diff --git a/src/mesh/test_mesh_local.c b/src/mesh/test_mesh_local.c
index e5d9dd3132b8643ae6295547a64b6e6487044d8f..932f01a2ef4d4198b861923da74f93582403da3c 100644 (file)
--- a/src/mesh/test_mesh_local.c
+++ b/src/mesh/test_mesh_local.c
@@ -28,7 +28,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_enc.h"
+#include "gnunet_mesh_service.h"
 
 struct GNUNET_TESTING_Peer *me;
 
@@ -141,13 +141,14 @@ data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
  * @param channel new handle to the channel
  * @param initiator peer that started the channel
  * @param port port number
+ * @param options channel options
  * @return initial channel context for the channel
  *         (can be NULL -- that's not an error)
  */
 static void *
 inbound_channel (void *cls, struct GNUNET_MESH_Channel *channel,
                 const struct GNUNET_PeerIdentity *initiator,
-                uint32_t port)
+                uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
   long id = (long) cls;
 
@@ -256,7 +257,7 @@ do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_TESTING_peer_get_identity (me, &id);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CONNECT BY PORT\n");
   ch = GNUNET_MESH_channel_create (mesh_peer_1, NULL, &id, 1,
-                                  GNUNET_YES, GNUNET_NO);
+                                   GNUNET_MESH_OPTION_DEFAULT);
   mth = GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
                                            GNUNET_TIME_UNIT_FOREVER_REL,
                                            sizeof (struct GNUNET_MessageHeader),
@@ -284,8 +285,8 @@ run (void *cls,
                                     (GNUNET_TIME_UNIT_SECONDS, 15), &do_abort,
                                     NULL);
   mesh_peer_1 = GNUNET_MESH_connect (cfg,       /* configuration */
-                                     (void *) 1L,     /* cls */
-                                     &inbound_channel,   /* inbound new hndlr */
+                                     (void *) 1L,       /* cls */
+                                     NULL,              /* inbound new hndlr */
                                      &channel_end,      /* channel end hndlr */
                                      handlers1, /* traffic handlers */
                                      NULL);     /* ports offered */