From 381046a7d5c92f5ec1b9bf4566eecacfde269099 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 7 Sep 2011 14:38:59 +0000 Subject: [PATCH] Added new test for multiple clients on one peer Fixed dumb obvious bug in api --- src/mesh/Makefile.am | 14 ++- src/mesh/gnunet-service-mesh.c | 1 + src/mesh/mesh_api_new.c | 7 +- src/mesh/test_mesh_api.c | 19 +-- src/mesh/test_mesh_local.c | 208 +++++++++++++++++++++++++++++++++ 5 files changed, 236 insertions(+), 13 deletions(-) create mode 100644 src/mesh/test_mesh_local.c diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index cea6152e2..f49b3e326 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -48,14 +48,22 @@ libgnunetmeshnew_la_LDFLAGS = \ check_PROGRAMS = \ test_mesh_api \ + test_mesh_local \ test_mesh_small test_mesh_api_SOURCES = \ test_mesh_api.c test_mesh_api_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ - $(top_builddir)/src/dht/libgnunetdht.la + $(top_builddir)/src/mesh/libgnunetmeshnew.la +test_mesh_api_DEPENDENCIES = \ + libgnunetmeshnew.la + +test_mesh_local_SOURCES = \ + test_mesh_local.c +test_mesh_local_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/mesh/libgnunetmeshnew.la test_mesh_api_DEPENDENCIES = \ libgnunetmeshnew.la @@ -69,7 +77,7 @@ test_mesh_small_DEPENDENCIES = \ libgnunetmeshnew.la if ENABLE_TEST_RUN -TESTS = test_mesh_api +TESTS = test_mesh_api test_mesh_local endif EXTRA_DIST = \ diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 87f259c22..625481c6b 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -74,6 +74,7 @@ mesh_debug (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } #endif +/* TODO: move into configuration file */ #define CORE_QUEUE_SIZE 10 #define LOCAL_QUEUE_SIZE 100 #define REFRESH_PATH_TIME GNUNET_TIME_relative_multiply(\ diff --git a/src/mesh/mesh_api_new.c b/src/mesh/mesh_api_new.c index 21b264701..0c818c908 100644 --- a/src/mesh/mesh_api_new.c +++ b/src/mesh/mesh_api_new.c @@ -431,6 +431,7 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t) return; } + /** * Get the peer descriptor for the peer with id from the given tunnel * @param t Tunnel handle @@ -1176,10 +1177,14 @@ void GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle) { struct GNUNET_MESH_Tunnel *t; + struct GNUNET_MESH_Tunnel *aux; - for (t = handle->tunnels_head; NULL != t; t = t->next) + t = handle->tunnels_head; + while (NULL != t) { + aux = t->next; destroy_tunnel (t); + t = aux; } if (NULL != handle->th) { diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index 060db9c8a..ada8e10e7 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c @@ -34,9 +34,10 @@ static struct GNUNET_OS_Process *arm_pid; static struct GNUNET_MESH_Handle *mesh; +static struct GNUNET_MESH_Tunnel *t; static int result; -GNUNET_SCHEDULER_TaskIdentifier abort_task; -GNUNET_SCHEDULER_TaskIdentifier test_task; +static GNUNET_SCHEDULER_TaskIdentifier abort_task; +static GNUNET_SCHEDULER_TaskIdentifier test_task; /** * Function is called whenever a message is received. @@ -101,26 +102,26 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) struct GNUNET_CONFIGURATION_Handle *cfg = cls; static const GNUNET_MESH_ApplicationType app[] = { 1, 2, 3, 4, 5, 6, 7, 8, 0 }; - struct GNUNET_MESH_Tunnel *t; test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0; mesh = GNUNET_MESH_connect (cfg, 10, NULL, NULL, NULL, handlers, app); if (NULL == mesh) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't connect to mesh :(\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n"); return; } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO MESH :D\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n"); } t = GNUNET_MESH_tunnel_create (mesh, NULL, NULL, NULL, NULL); + if (NULL != t) + { + GNUNET_MESH_tunnel_destroy (t); + } - GNUNET_MESH_tunnel_destroy (t); - - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 1), &do_shutdown, + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL); } diff --git a/src/mesh/test_mesh_local.c b/src/mesh/test_mesh_local.c new file mode 100644 index 000000000..789a2f63e --- /dev/null +++ b/src/mesh/test_mesh_local.c @@ -0,0 +1,208 @@ +/* + This file is part of GNUnet. + (C) 2011 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. +*/ + +/** + * @file mesh/test_mesh_local.c + * @brief test mesh local: test of tunnels with just one peer + * @author Bartlomiej Polot + */ + +#include "platform.h" +#include "gnunet_util_lib.h" +#include "gnunet_dht_service.h" +#include "gnunet_mesh_service_new.h" + +#define VERBOSE 1 +#define VERBOSE_ARM 0 + +static struct GNUNET_OS_Process *arm_pid; +static struct GNUNET_MESH_Handle *mesh_peer_1; +static struct GNUNET_MESH_Handle *mesh_peer_2; +static struct GNUNET_MESH_Tunnel *t_1; +static struct GNUNET_MESH_Tunnel *t_2; +static int result; +static GNUNET_SCHEDULER_TaskIdentifier abort_task; +static GNUNET_SCHEDULER_TaskIdentifier test_task; + +/** + * Function is called whenever a message is received. + * + * @param cls closure (set from GNUNET_MESH_connect) + * @param tunnel connection to the other end + * @param tunnel_ctx place to store local state associated with the tunnel + * @param sender who sent the message + * @param message the actual message + * @param atsi performance data for the connection + * @return GNUNET_OK to keep the connection open, + * GNUNET_SYSERR to close it (signal serious error) + */ +static int +callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx, + const struct GNUNET_PeerIdentity *sender, + const struct GNUNET_MessageHeader *message, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) +{ + return GNUNET_OK; +} + +static struct GNUNET_MESH_MessageHandler handlers1[] = { + {&callback, 1, 0}, + {NULL, 0, 0} +}; + +static struct GNUNET_MESH_MessageHandler handlers2[] = {{NULL, 0, 0}}; + + +static void +do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n"); + if (0 != abort_task) + { + GNUNET_SCHEDULER_cancel (abort_task); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D1\n"); + if (NULL != mesh_peer_1) + { + GNUNET_MESH_disconnect (mesh_peer_1); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D2\n"); + if (NULL != mesh_peer_2) + { + GNUNET_MESH_disconnect (mesh_peer_2); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n"); + if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); + GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); + GNUNET_OS_process_close (arm_pid); +} + +static void +do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + if (0 != test_task) + { + GNUNET_SCHEDULER_cancel (test_task); + } + result = GNUNET_SYSERR; + abort_task = 0; + do_shutdown (cls, tc); +} + +static void +test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct GNUNET_CONFIGURATION_Handle *cfg = cls; + static const GNUNET_MESH_ApplicationType app1[] = + { 1, 2, 3, 4, 5, 6, 7, 8, 0 }; + static const GNUNET_MESH_ApplicationType app2[] = + { 0 }; + + test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0; + mesh_peer_1 = GNUNET_MESH_connect (cfg, 10, 1, NULL, NULL, handlers1, app1); + mesh_peer_2 = GNUNET_MESH_connect (cfg, 10, 2, NULL, NULL, handlers2, app2); + if (NULL == mesh_peer_1 || NULL == mesh_peer_2) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n"); + return; + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n"); + } + + t_1 = GNUNET_MESH_tunnel_create (mesh_peer_1, NULL, NULL, NULL, 1); +// t_2 = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, NULL, NULL, 2); + + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply( + GNUNET_TIME_UNIT_SECONDS, + 2), + &do_shutdown, + NULL); +} + + +static void +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + GNUNET_log_setup ("test_mesh_local", +#if VERBOSE + "DEBUG", +#else + "WARNING", +#endif + NULL); + arm_pid = + GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", + "gnunet-service-arm", +#if VERBOSE_ARM + "-L", "DEBUG", +#endif + "-c", "test_mesh.conf", NULL); + + abort_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, + NULL); + + test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg); + +} + + +int +main (int argc, char *argv[]) +{ + int ret; + + char *const argv2[] = { "test-mesh-local", + "-c", "test_mesh.conf", +#if VERBOSE + "-L", "DEBUG", +#endif + NULL + }; + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_END + }; + + ret = + GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, + "test-mesh-local", "nohelp", options, &run, NULL); + + if (GNUNET_OK != ret) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n", + ret); + return 1; + } + if (GNUNET_SYSERR == result) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n"); + return 1; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); + return 0; +} -- 2.25.1