From 8ed3fd0ed3c99354dee4e5c9bbf471f527007cab Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 20 Dec 2010 22:11:46 +0000 Subject: reconnect test --- src/hostlist/Makefile.am | 8 + .../test_gnunet_daemon_hostlist_reconnect.c | 263 +++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 src/hostlist/test_gnunet_daemon_hostlist_reconnect.c (limited to 'src/hostlist') diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index e2dd27a29..8fa95c50e 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -33,12 +33,14 @@ gnunet_daemon_hostlist_CPPFLAGS = \ check_PROGRAMS = \ test_gnunet_daemon_hostlist \ + test_gnunet_daemon_hostlist_reconnect \ test_gnunet_daemon_hostlist_learning if HAVE_MHD if !DISABLE_TEST_RUN TESTS = \ test_gnunet_daemon_hostlist \ + test_gnunet_daemon_hostlist_reconnect \ test_gnunet_daemon_hostlist_learning endif endif @@ -49,6 +51,12 @@ test_gnunet_daemon_hostlist_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la +test_gnunet_daemon_hostlist_reconnect_SOURCES = \ + test_gnunet_daemon_hostlist_reconnect.c +test_gnunet_daemon_hostlist_reconnect_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la + test_gnunet_daemon_hostlist_learning_SOURCES = \ test_gnunet_daemon_hostlist_learning.c test_gnunet_daemon_hostlist_learning_LDADD = \ diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c new file mode 100644 index 000000000..f3ce5747c --- /dev/null +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -0,0 +1,263 @@ +/* + This file is part of GNUnet + (C) 2010 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 hostlist/test_gnunet_daemon_hostlist_reconnect.c + * @brief test for gnunet_daemon_hostslist.c; tries to re-start the peers + * and connect a second time + * @author Christian Grothoff + */ +#include "platform.h" +#include "gnunet_util_lib.h" +#include "gnunet_arm_service.h" +#include "gnunet_transport_service.h" + +#define VERBOSE GNUNET_NO + +#define START_ARM GNUNET_YES + + +/** + * How long until we give up on transmitting the message? + */ +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150) + +static int ok; + +static GNUNET_SCHEDULER_TaskIdentifier timeout_task; + +struct PeerContext +{ + struct GNUNET_CONFIGURATION_Handle *cfg; + struct GNUNET_TRANSPORT_Handle *th; + struct GNUNET_MessageHeader *hello; +#if START_ARM + struct GNUNET_OS_Process *arm_proc; +#endif +}; + +static struct PeerContext p1; + +static struct PeerContext p2; + + +static void +clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + if (p1.th != NULL) + { + GNUNET_TRANSPORT_disconnect (p1.th); + p1.th = NULL; + } + if (p2.th != NULL) + { + GNUNET_TRANSPORT_disconnect (p2.th); + p2.th = NULL; + } + GNUNET_SCHEDULER_shutdown (); +} + +/** + * Timeout, give up. + */ +static void +timeout_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + timeout_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Timeout trying to connect peers, test failed.\n"); + clean_up (NULL, tc); +} + + +/** + * Function called to notify transport users that another + * peer connected to us. + * + * @param cls closure + * @param peer the peer that connected + * @param latency current latency of the connection + * @param distance in overlay hops, as given by transport plugin + */ +static void +notify_connect (void *cls, + const struct GNUNET_PeerIdentity * peer, + const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count) +{ + if (peer == NULL) + return; +#if VERBOSE + fprintf (stderr, "Peer %s connected\n", GNUNET_i2s (peer)); +#endif + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peers connected, shutting down.\n"); + ok = 0; + if (timeout_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel (timeout_task); + timeout_task = GNUNET_SCHEDULER_NO_TASK; + } + GNUNET_SCHEDULER_add_now (&clean_up, NULL); +} + + +static void +process_hello (void *cls, + const struct GNUNET_MessageHeader *message) +{ + struct PeerContext *p = cls; + + GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received HELLO, starting hostlist service.\n"); +} + + +static void +setup_peer (struct PeerContext *p, const char *cfgname) +{ + p->cfg = GNUNET_CONFIGURATION_create (); +#if START_ARM + p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", + "gnunet-service-arm", +#if VERBOSE + "-L", "DEBUG", +#endif + "-c", cfgname, NULL); +#endif + GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); + p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, + ¬ify_connect, NULL); + GNUNET_assert (p->th != NULL); + GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); +} + + +static void +waitpid_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct PeerContext *p = cls; + +#if START_ARM + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Killing ARM process.\n"); + if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); + GNUNET_OS_process_close (p->arm_proc); + p->arm_proc = NULL; +#endif + GNUNET_CONFIGURATION_destroy (p->cfg); +} + + +static void +stop_arm (struct PeerContext *p) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Asking ARM to stop core service\n"); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &waitpid_task, p); +} + + +/** + * Try again to connect to transport service. + */ +static void +shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + stop_arm (&p1); + stop_arm (&p2); +} + + +static void +run (void *cls, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + GNUNET_assert (ok == 1); + ok++; + timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &timeout_error, + NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, + &shutdown_task, + NULL); + setup_peer (&p1, "test_gnunet_daemon_hostlist_peer1.conf"); + setup_peer (&p2, "test_gnunet_daemon_hostlist_peer2.conf"); +} + + +static int +check () +{ + char *const argv[] = { "test-gnunet-daemon-hostlist", + "-c", "test_gnunet_daemon_hostlist_data.conf", +#if VERBOSE + "-L", "DEBUG", +#endif + NULL + }; + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_END + }; + ok = 1; + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, "test-gnunet-daemon-hostlist", + "nohelp", options, &run, &ok); + return ok; +} + + +int +main (int argc, char *argv[]) +{ + + int ret; + + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); + GNUNET_log_setup ("test-gnunet-daemon-hostlist", +#if VERBOSE + "DEBUG", +#else + "WARNING", +#endif + NULL); + ret = check (); + if (ret == 0) + { + fprintf (stderr, "."); + /* now do it again */ + ret = check (); + fprintf (stderr, ".\n"); + } + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); + return ret; +} + +/* end of test_gnunet_daemon_hostlist.c */ -- cgit v1.2.3