X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fmesh_test_lib.h;h=19625d2ab74790ac367ddebd165d89e3952c9495;hb=056f559d916d785164f40e63ca56c153ea0e9ebe;hp=7ca535c23d619fd07a98adbe46e17642ded1756a;hpb=e81af2729192d83753f2b0f58add02a449f6ab23;p=oweals%2Fgnunet.git

diff --git a/src/mesh/mesh_test_lib.h b/src/mesh/mesh_test_lib.h
index 7ca535c23..19625d2ab 100644
--- a/src/mesh/mesh_test_lib.h
+++ b/src/mesh/mesh_test_lib.h
@@ -25,8 +25,16 @@
 #ifndef MESH_TEST_LIB_H
 #define MESH_TEST_LIB_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
 #include "gnunet_testbed_service.h"
-#include "gnunet_mesh_service.h"
+#include "gnunet_mesh_service_enc.h"
 
 /**
  * Test context for a MESH Test.
@@ -60,21 +68,21 @@ typedef void (*GNUNET_MESH_TEST_AppMain) (void *cls,
  * @param num_peers Number of peers to start.
  * @param tmain Main function to run once the testbed is ready.
  * @param tmain_cls Closure for 'tmain'.
- * @param new_tunnel Handler for incoming tunnels.
+ * @param new_channel Handler for incoming tunnels.
  * @param cleaner Cleaner for destroyed incoming tunnels.
  * @param handlers Message handlers.
- * @param stypes Application types.
+ * @param ports Ports the peers offer.
  */
-void 
+void
 GNUNET_MESH_TEST_run (const char *testname,
                       const char *cfgname,
                       unsigned int num_peers,
                       GNUNET_MESH_TEST_AppMain tmain,
                       void *tmain_cls,
-                      GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel,
-                      GNUNET_MESH_TunnelEndHandler cleaner,
-                      GNUNET_MESH_MessageHandler* handlers,
-                      const GNUNET_MESH_ApplicationType* stypes);
+                      GNUNET_MESH_InboundChannelNotificationHandler new_channel,
+                      GNUNET_MESH_ChannelEndHandler cleaner,
+                      struct GNUNET_MESH_MessageHandler* handlers,
+                      const uint32_t* ports);
 
 
 /**
@@ -86,4 +94,13 @@ void
 GNUNET_MESH_TEST_cleanup (struct GNUNET_MESH_TEST_Context *ctx);
 
 
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
+/* ifndef MESH_TEST_LIB_H */
 #endif