From 60dc97e5f97fe81014495f0cb28f7c7815b667d7 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 16 May 2013 14:45:29 +0000 Subject: [PATCH] - add mesh2 local testcase --- src/mesh/Makefile.am | 20 ++- src/mesh/mesh2_api.c | 2 +- src/mesh/test_mesh2_local.c | 260 ++++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 4 deletions(-) create mode 100644 src/mesh/test_mesh2_local.c diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index d7dada67c..3531d0647 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -23,6 +23,8 @@ AM_CLFAGS = -g if HAVE_EXPERIMENTAL EXP_LIB = libgnunetmesh2.la EXP_LIBEXEC = gnunet-service-mesh-new + EXP_TESTS = \ + test_mesh2_local endif libexec_PROGRAMS = \ @@ -93,7 +95,7 @@ gnunet_service_mesh_LDFLAGS = -lrt endif gnunet_mesh_SOURCES = \ - gnunet-mesh.c + gnunet-mesh.c gnunet_mesh_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -149,7 +151,8 @@ check_PROGRAMS = \ test_mesh_small_speed_nobuf \ test_mesh_small_speed_backwards \ test_mesh_small_speed_nobuf_backwards \ - test_mesh_small_speed_ack + test_mesh_small_speed_ack \ + $(EXP_TESTS) test_mesh_api_SOURCES = \ test_mesh_api.c @@ -267,8 +270,19 @@ test_mesh_small_speed_nobuf_backwards_LDADD = $(ld_mesh_test_lib) test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = $(dep_mesh_test_lib) +test_mesh2_local_SOURCES = \ + test_mesh2_local.c +test_mesh2_local_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/mesh/libgnunetmesh2.la +test_mesh2_local_DEPENDENCIES = \ + libgnunetmesh2.la + if ENABLE_TEST_RUN -TESTS = test_mesh_api \ +TESTS = \ + $(EXP_TESTS) \ + test_mesh_api \ test_mesh_tree_api \ test_mesh_local_1 test_mesh_local_2 \ test_mesh_local_traffic_fwd \ diff --git a/src/mesh/mesh2_api.c b/src/mesh/mesh2_api.c index 57a5ce1ed..88a013384 100644 --- a/src/mesh/mesh2_api.c +++ b/src/mesh/mesh2_api.c @@ -1602,7 +1602,7 @@ GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork, return th; if (GMC_is_pid_bigger(tunnel->next_send_pid, tunnel->max_send_pid)) return th; - LOG (GNUNET_ERROR_TYPE_DEBUG, " call notify tmt rdy\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, " call client notify tmt rdy\n"); tunnel->mesh->th = GNUNET_CLIENT_notify_transmit_ready (tunnel->mesh->client, th->size, GNUNET_TIME_UNIT_FOREVER_REL, diff --git a/src/mesh/test_mesh2_local.c b/src/mesh/test_mesh2_local.c new file mode 100644 index 000000000..49ea791e2 --- /dev/null +++ b/src/mesh/test_mesh2_local.c @@ -0,0 +1,260 @@ +/* + 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_1.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_testing_lib.h" +#include "gnunet_mesh2_service.h" + +struct GNUNET_TESTING_Peer *me; + +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 = GNUNET_OK; + +static GNUNET_SCHEDULER_TaskIdentifier abort_task; + +static GNUNET_SCHEDULER_TaskIdentifier shutdown_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); + } + if (NULL != t) + { + GNUNET_MESH_tunnel_destroy(t); + } + 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); + } +} + + +/** + * 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"); + result = GNUNET_SYSERR; + abort_task = 0; + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + { + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_NO_TASK; + } + 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 + * + * @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) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n"); + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &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 port port number + * @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, + uint32_t port) +{ + long id = (long) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "test: received incoming tunnel on peer %d, port %u\n", + id, port); + if (id != 1L) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "test: wrong peer\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; + } +} + + +/** + * 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_find (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct GNUNET_PeerIdentity id; + + GNUNET_TESTING_peer_get_identity (me, &id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: CONNECT BY TYPE\n"); + t = GNUNET_MESH_tunnel_create (mesh_peer_1, NULL, &id, 1); +} + + +/** + * Initialize framework and start test + */ +static void +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) +{ + static uint32_t ports[] = {1, 0}; + + me = peer; + abort_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, + NULL); + mesh_peer_1 = GNUNET_MESH_connect (cfg, /* configuration */ + (void *) 1L, /* cls */ + &inbound_tunnel, /* inbound new hndlr */ + &inbound_end, /* inbound end hndlr */ + handlers1, /* traffic handlers */ + NULL); /* ports offered */ + + mesh_peer_2 = GNUNET_MESH_connect (cfg, /* configuration */ + (void *) 2L, /* cls */ + &inbound_tunnel, /* inbound new hndlr */ + &inbound_end, /* inbound end hndlr */ + handlers2, /* traffic handlers */ + ports); /* ports offered */ + if (NULL == mesh_peer_1 || NULL == mesh_peer_2) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n"); + result = GNUNET_SYSERR; + return; + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n"); + } + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_find, NULL); +} + + +/** + * Main + */ +int +main (int argc, char *argv[]) +{ + if (0 != GNUNET_TESTING_peer_run ("test-mesh-local-1", + "test_mesh.conf", + &run, NULL)) + return 1; + return (result == GNUNET_OK) ? 0 : 1; +} + +/* end of test_mesh_local_1.c */ -- 2.25.1