From 27c5602e08caa837cf8bfcfe4bb9629f5d76231b Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Fri, 9 Sep 2011 17:19:52 +0000 Subject: [PATCH] Added testcase for explicit case of DHT not finding apptype --- src/mesh/Makefile.am | 21 +- src/mesh/gnunet-service-mesh.c | 7 +- ...{test_mesh_local.c => test_mesh_local_1.c} | 1 + src/mesh/test_mesh_local_2.c | 348 ++++++++++++++++++ 4 files changed, 368 insertions(+), 9 deletions(-) rename src/mesh/{test_mesh_local.c => test_mesh_local_1.c} (99%) create mode 100644 src/mesh/test_mesh_local_2.c diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 0c7d598d4..1a6852a54 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -48,7 +48,8 @@ libgnunetmeshnew_la_LDFLAGS = \ check_PROGRAMS = \ test_mesh_api \ - test_mesh_local \ + test_mesh_local_1 \ + test_mesh_local_2 \ test_mesh_small test_mesh_api_SOURCES = \ @@ -59,12 +60,20 @@ test_mesh_api_LDADD = \ test_mesh_api_DEPENDENCIES = \ libgnunetmeshnew.la -test_mesh_local_SOURCES = \ - test_mesh_local.c -test_mesh_local_LDADD = \ +test_mesh_local_1_SOURCES = \ + test_mesh_local_1.c +test_mesh_local_1_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/mesh/libgnunetmeshnew.la -test_mesh_api_DEPENDENCIES = \ +test_mesh_api_1_DEPENDENCIES = \ + libgnunetmeshnew.la + +test_mesh_local_2_SOURCES = \ + test_mesh_local_2.c +test_mesh_local_2_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/mesh/libgnunetmeshnew.la +test_mesh_api_2_DEPENDENCIES = \ libgnunetmeshnew.la test_mesh_small_SOURCES = \ @@ -77,7 +86,7 @@ test_mesh_small_DEPENDENCIES = \ libgnunetmeshnew.la if ENABLE_TEST_RUN -TESTS = test_mesh_api +TESTS = test_mesh_api test_mesh_local_1 test_mesh_local_2 endif EXTRA_DIST = \ diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 6f628f2ce..063339489 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -823,9 +823,10 @@ announce_application (void *cls, const GNUNET_HashCode * key, void *value) GNUNET_DHT_put (dht_handle, key, 10U, GNUNET_DHT_RO_RECORD_ROUTE, GNUNET_BLOCK_TYPE_TEST, sizeof (struct GNUNET_PeerIdentity), (const char *) &my_full_id, - GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), - APP_ANNOUNCE_TIME), - APP_ANNOUNCE_TIME, +// GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), +// APP_ANNOUNCE_TIME), FIXME +// APP_ANNOUNCE_TIME, + GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_TIME_UNIT_FOREVER_REL, #if MESH_DEBUG &mesh_debug, "DHT_put for app completed"); #else diff --git a/src/mesh/test_mesh_local.c b/src/mesh/test_mesh_local_1.c similarity index 99% rename from src/mesh/test_mesh_local.c rename to src/mesh/test_mesh_local_1.c index b21c975e2..7ccab0916 100644 --- a/src/mesh/test_mesh_local.c +++ b/src/mesh/test_mesh_local_1.c @@ -80,6 +80,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); if (0 != test_task) { GNUNET_SCHEDULER_cancel (test_task); diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c new file mode 100644 index 000000000..9da611bf4 --- /dev/null +++ b/src/mesh/test_mesh_local_2.c @@ -0,0 +1,348 @@ +/* + 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; + +static int result; +static GNUNET_SCHEDULER_TaskIdentifier abort_task; +static GNUNET_SCHEDULER_TaskIdentifier test_task; + + +/** + * Shutdown nicely + */ +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); +} + + +/** + * Something went wrong and timed out. Kill everything and set error flag + */ +static void +do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); + if (0 != test_task) + { + GNUNET_SCHEDULER_cancel (test_task); + } + result = GNUNET_SYSERR; + abort_task = 0; + do_shutdown (cls, tc); +} + + +/** + * 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 +data_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) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n"); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 2), &do_shutdown, + NULL); + return GNUNET_OK; +} + + +/** + * Method called whenever another peer has added us to a tunnel + * the other peer initiated. + * + * @param cls closure + * @param tunnel new handle to the tunnel + * @param initiator peer that started the tunnel + * @param atsi performance information for the tunnel + * @return initial tunnel context for the tunnel (can be NULL -- that's not an error) + */ +static void * +inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel, + const struct GNUNET_PeerIdentity *initiator, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) +{ + unsigned int id = (unsigned int) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: received incoming tunnel\n"); + if (id != 1) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "test: received incoming tunnel on peer 2\n"); + result = GNUNET_SYSERR; + } + return NULL; +} + + +/** + * Function called whenever an inbound tunnel is destroyed. Should clean up + * any associated state. + * + * @param cls closure (set from GNUNET_MESH_connect) + * @param tunnel connection to the other end (henceforth invalid) + * @param tunnel_ctx place where local state associated + * with the tunnel is stored + */ +static void +inbound_end (void *cls, + const struct GNUNET_MESH_Tunnel * tunnel, + void *tunnel_ctx) +{ + unsigned int id = (unsigned int) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: incoming tunnel closed\n"); + if (id != 1) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "test: received closing tunnel on peer 2\n"); + result = GNUNET_SYSERR; + } +} + + +/** + * Method called whenever a peer has disconnected from the tunnel. + * + * @param cls closure + * @param peer peer identity the tunnel stopped working with + */ +static void peer_conected ( + void *cls, + const struct GNUNET_PeerIdentity * peer) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n"); + GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL); +} + + +/** + * Method called whenever a peer has connected to the tunnel. + * + * @param cls closure + * @param peer peer identity the tunnel was created to, NULL on timeout + * @param atsi performance data for the connection + */ +static void peer_disconnected ( + void *cls, + const struct GNUNET_PeerIdentity * peer, + const struct GNUNET_TRANSPORT_ATS_Information * atsi) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n"); +} + + +/** + * Handler array for traffic received on peer1 + */ +static struct GNUNET_MESH_MessageHandler handlers1[] = { + {&data_callback, 1, 0}, + {NULL, 0, 0} +}; + + +/** + * Handler array for traffic received on peer2 (none expected) + */ +static struct GNUNET_MESH_MessageHandler handlers2[] = { {NULL, 0, 0} }; + + +/** + * Start looking for a peer by type + */ +static void +do_connect_peer_1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct GNUNET_CONFIGURATION_Handle *cfg = cls; + static const GNUNET_MESH_ApplicationType app1[] = { 1, 0 }; + + test_task = GNUNET_SCHEDULER_NO_TASK; + mesh_peer_1 = GNUNET_MESH_connect (cfg, /* configuration */ + 10, /* queue size */ + (void *) 1, /* cls */ + &inbound_tunnel, /* inbound new hndlr */ + &inbound_end, /* inbound end hndlr */ + handlers1, /* traffic handlers */ + app1); /* apps offered */ +} + + +/** + * Main test function + */ +static void +test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct GNUNET_CONFIGURATION_Handle *cfg = cls; + static const GNUNET_MESH_ApplicationType app2[] = { 0 }; + + test_task = GNUNET_SCHEDULER_NO_TASK; + + mesh_peer_2 = GNUNET_MESH_connect (cfg, /* configuration */ + 10, /* queue size */ + (void *) 2, /* cls */ + &inbound_tunnel, /* inbound new hndlr */ + &inbound_end, /* inbound end hndlr */ + handlers2, /* traffic handlers */ + app2); /* apps offered */ + if (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 = GNUNET_MESH_tunnel_create (mesh_peer_2, + NULL, + &peer_conected, + &peer_disconnected, + (void *) 2); + GNUNET_MESH_peer_request_connect_by_type(t, 1); + test_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, + &do_connect_peer_1, + cfg); +} + + +/** + * Initialize framework and start test + */ +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); + +} + + +/** + * Main + */ +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