From 8829518fefd8621b85140b794ab33215dc7ee1d8 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 3 Jul 2012 11:01:56 +0000 Subject: - added mesh regex testcase, fixed bugs --- src/mesh/Makefile.am | 11 + src/mesh/gnunet-service-mesh_new.c | 33 ++- src/mesh/mesh_api.c | 2 + src/mesh/plugin_block_mesh.c | 2 + src/mesh/test_mesh_regex.c | 521 +++++++++++++++++++++++++++++++++++++ 5 files changed, 567 insertions(+), 2 deletions(-) create mode 100644 src/mesh/test_mesh_regex.c diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 419ef40f9..77e305b02 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -98,6 +98,7 @@ check_PROGRAMS = \ test_mesh_local_1 \ test_mesh_local_2 \ test_mesh_2dtorus \ + test_mesh_regex \ test_mesh_small_unicast \ test_mesh_small_multicast \ test_mesh_small_speed \ @@ -146,6 +147,16 @@ test_mesh_2dtorus_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing_old/libgnunettesting_old.la +test_mesh_regex_SOURCES = \ + test_mesh_regex.c +test_mesh_regex_LDADD = \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la +test_mesh_regex_DEPENDENCIES = \ + libgnunetmesh.la + + test_mesh_small_unicast_SOURCES = \ test_mesh_small.c test_mesh_small_unicast_LDADD = \ diff --git a/src/mesh/gnunet-service-mesh_new.c b/src/mesh/gnunet-service-mesh_new.c index abec7de1c..0e1eda15c 100644 --- a/src/mesh/gnunet-service-mesh_new.c +++ b/src/mesh/gnunet-service-mesh_new.c @@ -708,13 +708,24 @@ regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof, size_t size; size_t len; unsigned int i; + unsigned int offset; char *aux; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " regex dht put for state %s\n", + GNUNET_h2s(key)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " proof: %s\n", + proof); + opt = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE; if (GNUNET_YES == accepting) { struct MeshRegexAccept block; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " state %s is accepting, putting own id\n", + GNUNET_h2s(key)); size = sizeof (block); block.key = *key; block.id = my_full_id; @@ -749,11 +760,19 @@ regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof, */ for (i = 0; i < num_edges; i++) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " edge %s towards %s\n", + edges[i].label, + GNUNET_h2s(&edges[i].destination)); + /* aux points at the end of the last block */ - block_edge = (struct MeshRegexEdge *) aux; len = strlen (edges[i].label); size += sizeof (struct MeshRegexEdge) + len; + // Calculate offset FIXME is this ok? use size instead? + offset = aux - (char *) block; block = GNUNET_realloc (block, size); + aux = &((char *) block)[offset]; + block_edge = (struct MeshRegexEdge *) aux; block_edge->key = edges[i].destination; block_edge->n_token = htonl (len); aux = (char *) &block_edge[1]; @@ -784,9 +803,11 @@ regex_put (const char *regex) { struct GNUNET_REGEX_Automaton *dfa; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "regex_put (%s) start\n", regex); dfa = GNUNET_REGEX_construct_dfa (regex, strlen(regex)); GNUNET_REGEX_iterate_all_edges (dfa, ®ex_iterator, NULL); GNUNET_REGEX_automaton_destroy (dfa); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "regex_put (%s) end\n", regex); } @@ -4184,6 +4205,14 @@ dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp, size_t len; // FIXME: does proof have to be NULL terminated? + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "*******************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "DHT GET STRING RETURNED RESULTS\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " key: %s\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "DHT GET STRING RETURNED RESULTS\n"); proof = (char *) &block[1]; if (GNUNET_OK != GNUNET_REGEX_check_proof (proof, key)) { @@ -4973,7 +5002,7 @@ handle_local_connect_by_string (void *cls, struct GNUNET_SERVER_Client *client, size_t size; size_t len; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connect by string started\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connect by string started\n"); msg = (struct GNUNET_MESH_ConnectPeerByString *) message; size = htons (message->size); diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index 8b4efce70..b12fdc1fe 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c @@ -27,6 +27,8 @@ * - RECEIVE HANDLERS * - SEND FUNCTIONS * - API CALL DEFINITIONS + * + * TODO: add regex to reconnect */ #include "platform.h" #include "gnunet_common.h" diff --git a/src/mesh/plugin_block_mesh.c b/src/mesh/plugin_block_mesh.c index 6f024845b..1a530cdc0 100644 --- a/src/mesh/plugin_block_mesh.c +++ b/src/mesh/plugin_block_mesh.c @@ -209,6 +209,8 @@ libgnunet_plugin_block_mesh_init (void *cls) { GNUNET_BLOCK_TYPE_MESH_PEER, GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE, + GNUNET_BLOCK_TYPE_MESH_REGEX, + GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT, GNUNET_BLOCK_TYPE_ANY /* end of list */ }; struct GNUNET_BLOCK_PluginFunctions *api; diff --git a/src/mesh/test_mesh_regex.c b/src/mesh/test_mesh_regex.c new file mode 100644 index 000000000..89539042c --- /dev/null +++ b/src/mesh/test_mesh_regex.c @@ -0,0 +1,521 @@ +/* + This file is part of GNUnet. + (C) 2012 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_regex.c + * + * @brief Test for regex announce / by_string connect. + * based on the 2dtorus testcase + */ +#include "platform.h" +#include "gnunet_testing_lib.h" +#include "gnunet_mesh_service.h" + +#define VERBOSE GNUNET_YES +#define REMOVE_DIR GNUNET_YES + +/** + * How long until we give up on connecting the peers? + */ +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500) + +/** + * Time to wait for stuff that should be rather fast + */ +#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) + + +/** + * How many events have happened + */ +static int ok; + +/** + * Be verbose + */ +static int verbose; + +/** + * Total number of peers in the test. + */ +static unsigned long long num_peers; + +/** + * Global configuration file + */ +static struct GNUNET_CONFIGURATION_Handle *testing_cfg; + +/** + * Total number of currently running peers. + */ +static unsigned long long peers_running; + +/** + * Total number of successful connections in the whole network. + */ +static unsigned int total_connections; + +/** + * Total number of failed connections in the whole network. + */ +static unsigned int failed_connections; + +/** + * The currently running peer group. + */ +static struct GNUNET_TESTING_PeerGroup *pg; + +/** + * Task called to disconnect peers + */ +static GNUNET_SCHEDULER_TaskIdentifier disconnect_task; + +/** + * Task called to shutdown test. + */ +static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle; + + +static struct GNUNET_TESTING_Daemon *d1; + +static struct GNUNET_TESTING_Daemon *d2; + +static struct GNUNET_MESH_Handle *h1; + +static struct GNUNET_MESH_Handle *h2; + +static struct GNUNET_MESH_Tunnel *t; + +static struct GNUNET_MESH_Tunnel *incoming_t; + +/** + * Check whether peers successfully shut down. + * + * @param cls Closure (unused). + * @param emsg Error message, NULL on success. + */ +static void +shutdown_callback (void *cls, const char *emsg) +{ + if (emsg != NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "test: Shutdown of peers failed! (%s)\n", emsg); + ok--; + } +#if VERBOSE + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "test: All peers successfully shut down!\n"); + } +#endif + GNUNET_CONFIGURATION_destroy (testing_cfg); +} + + +/** + * Task to run for shutdown: stops peers, ends test. + * + * @param cls Closure (not used). + * @param tc TaskContext. + * + */ +static void +shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Ending test.\n"); +#endif + shutdown_handle = GNUNET_SCHEDULER_NO_TASK; + GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); +} + + +/** + * Ends test: Disconnects peers and calls shutdown. + * @param cls Closure (not used). + * @param tc TaskContext. + */ +static void +disconnect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: disconnecting peers\n"); + + GNUNET_MESH_tunnel_destroy (t); + GNUNET_MESH_disconnect (h1); + GNUNET_MESH_disconnect (h2); + if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle) + { + GNUNET_SCHEDULER_cancel (shutdown_handle); + } + shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, 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 +tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel, + void *tunnel_ctx) +{ + long i = (long) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Incoming tunnel disconnected at peer %d\n", + i); + return; +} + + +/** + * Method called whenever a tunnel falls apart. + * + * @param cls closure + * @param peer peer identity the tunnel stopped working with + */ +static void +dh (void *cls, const struct GNUNET_PeerIdentity *peer) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "peer %s disconnected\n", + GNUNET_i2s (peer)); + return; +} + + +/** + * Method called whenever a peer connects to a 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 +ch (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_ATS_Information *atsi) +{ + long i = (long) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "************************************************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Peer connected: %s\n", + GNUNET_i2s (peer)); + + if (i != 1L || peer == NULL) + ok = 0; + else + ok = 1; + if (GNUNET_SCHEDULER_NO_TASK != disconnect_task) + { + GNUNET_SCHEDULER_cancel (disconnect_task); + disconnect_task = + GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL); + } +} + +/** + * 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 * +incoming_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel, + const struct GNUNET_PeerIdentity *initiator, + const struct GNUNET_ATS_Information *atsi) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Incoming tunnel from %s to peer %d\n", + GNUNET_i2s (initiator), (long) cls); + ok++; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); + if ((long) cls == 2L) + incoming_t = tunnel; + else + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Incoming tunnel for unknown client %lu\n", (long) cls); + } + if (GNUNET_SCHEDULER_NO_TASK != disconnect_task) + { + GNUNET_SCHEDULER_cancel (disconnect_task); + disconnect_task = + GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_peers, NULL); + } + return NULL; +} + +/** + * 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) + */ +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_ATS_Information *atsi) +{ + + return GNUNET_OK; +} + +/** + * Handlers, for diverse services + */ +static struct GNUNET_MESH_MessageHandler handlers[] = { + {&data_callback, 1, sizeof (struct GNUNET_MessageHeader)}, + {NULL, 0, 0} +}; + + +/** + * peergroup_ready: start test when all peers are connected + * @param cls closure + * @param emsg error message + */ +static void +peergroup_ready (void *cls, const char *emsg) +{ + GNUNET_MESH_ApplicationType app; + + if (emsg != NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "test: Peergroup callback called with error, aborting test!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Error from testing: `%s'\n", + emsg); + ok--; + GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); + return; + } +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "************************************************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "test: Peer Group started successfully!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test: Have %u connections\n", + total_connections); +#endif + + peers_running = GNUNET_TESTING_daemons_running (pg); + if (0 < failed_connections) + { + ok = GNUNET_SYSERR; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: %u connections have FAILED!\n", + failed_connections); + disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL); + return; + } + ok = 0; + disconnect_task = + GNUNET_SCHEDULER_add_delayed (TIMEOUT, &disconnect_peers, NULL); + d1 = GNUNET_TESTING_daemon_get (pg, 1); + d2 = GNUNET_TESTING_daemon_get (pg, 10); + app = (GNUNET_MESH_ApplicationType) 0; + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "************************************************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Connect to mesh\n"); + h1 = GNUNET_MESH_connect (d1->cfg, 5, (void *) 1L, + NULL, + NULL, + handlers, + &app); + h2 = GNUNET_MESH_connect (d2->cfg, 5, (void *) 2L, + &incoming_tunnel, + &tunnel_cleaner, + handlers, + &app); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "************************************************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Announce REGEX\n"); + GNUNET_MESH_announce_regex (h2, "abc"); + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "************************************************************\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Create tunnel & connect by string\n"); + t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, NULL); + GNUNET_MESH_peer_request_connect_by_string (t, "abc"); + /* connect handler = success, timeout = error */ + +} + + +/** + * Function that will be called whenever two daemons are connected by + * the testing library. + * + * @param cls closure + * @param first peer id for first daemon + * @param second peer id for the second daemon + * @param distance distance between the connected peers + * @param first_cfg config for the first daemon + * @param second_cfg config for the second daemon + * @param first_daemon handle for the first daemon + * @param second_daemon handle for the second daemon + * @param emsg error message (NULL on success) + */ +static void +connect_cb (void *cls, const struct GNUNET_PeerIdentity *first, + const struct GNUNET_PeerIdentity *second, uint32_t distance, + const struct GNUNET_CONFIGURATION_Handle *first_cfg, + const struct GNUNET_CONFIGURATION_Handle *second_cfg, + struct GNUNET_TESTING_Daemon *first_daemon, + struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg) +{ + if (emsg == NULL) + { + total_connections++; + } + else + { + failed_connections++; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "test: Problem with new connection (%s)\n", emsg); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: (%s)\n", GNUNET_i2s (first)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: (%s)\n", GNUNET_i2s (second)); + } +} + + +/** + * run: load configuration options and schedule test to run (start peergroup) + * @param cls closure + * @param args argv + * @param cfgfile configuration file name (can be NULL) + * @param cfg configuration handle + */ +static void +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + struct GNUNET_TESTING_Host *hosts; + + ok = GNUNET_NO; + total_connections = 0; + failed_connections = 0; + testing_cfg = GNUNET_CONFIGURATION_dup (cfg); + + GNUNET_log_setup ("test_mesh_regex", +#if VERBOSE + "DEBUG", +#else + "WARNING", +#endif + NULL); + +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n"); + GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing_old", + "use_progressbars", "YES"); +#endif + + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing_old", + "num_peers", &num_peers)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Option TESTING:NUM_PEERS is required!\n"); + return; + } + + hosts = GNUNET_TESTING_hosts_load (testing_cfg); + + pg = GNUNET_TESTING_peergroup_start (testing_cfg, num_peers, TIMEOUT, + &connect_cb, &peergroup_ready, NULL, + hosts); + GNUNET_assert (pg != NULL); + shutdown_handle = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, + &shutdown_task, NULL); +} + + +/** + * test_mesh_regex command line options + */ +static struct GNUNET_GETOPT_CommandLineOption options[] = { + {'V', "verbose", NULL, + gettext_noop ("be verbose (print progress information)"), + 0, &GNUNET_GETOPT_set_one, &verbose}, + GNUNET_GETOPT_OPTION_END +}; + + +/** + * Main: start test + */ +int +main (int argc, char *argv[]) +{ + char *const argv2[] = { + argv[0], + "-c", + "test_mesh_2dtorus.conf", +#if VERBOSE + "-L", + "DEBUG", +#endif + NULL + }; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Start\n"); + + + GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, + "test_mesh_regex", + gettext_noop ("Test mesh regex integration."), + options, &run, NULL); +#if REMOVE_DIR + GNUNET_DISK_directory_remove ("/tmp/test_mesh_2dtorus"); +#endif + if (GNUNET_OK != ok) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: FAILED!\n"); + return 1; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: success\n"); + return 0; +} + +/* end of test_mesh_regex.c */ -- cgit v1.2.3