summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-11-21 22:02:20 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-11-21 22:02:20 +0000
commitffabb052fa64eded69dffa1387b72df0ad1b0211 (patch)
treefb5fb6a36a0f885adcc7c44e84347a1cfa7e75b8
parentd3871e80fec5e7fcd5ff7cc7ff64284bb7051b38 (diff)
transport testing:
peer restart functionality + testcases if peers reconnect when restarted
-rw-r--r--src/transport/Makefile.am22
-rw-r--r--src/transport/test_transport_api_restart_1peer.c446
-rw-r--r--src/transport/test_transport_api_restart_2peers.c447
-rw-r--r--src/transport/transport-testing.c101
-rw-r--r--src/transport/transport-testing.h11
5 files changed, 1024 insertions, 3 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 32fe682cc..4b95545ac 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -260,6 +260,8 @@ check_PROGRAMS = \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
+ test_transport_api_restart_1peer \
+ test_transport_api_restart_2peers \
test_transport_api_timeout_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
@@ -299,6 +301,8 @@ TESTS = \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
+ test_transport_api_restart_1peer \
+ test_transport_api_restart_2peers \
test_transport_api_timeout_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
@@ -381,6 +385,24 @@ test_transport_api_bidirectional_connect_LDADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_restart_1peer_SOURCES = \
+ test_transport_api_restart_1peer.c
+test_transport_api_restart_1peer_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_restart_2peers_SOURCES = \
+ test_transport_api_restart_2peers.c
+test_transport_api_restart_2peers_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
test_transport_api_limited_sockets_tcp_SOURCES = \
test_transport_api_limited_sockets.c
diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c
new file mode 100644
index 000000000..fb06c26ab
--- /dev/null
+++ b/src/transport/test_transport_api_restart_1peer.c
@@ -0,0 +1,446 @@
+/*
+ This file is part of GNUnet.
+ (C) 2009, 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 transport/test_transport_api_restart_1peer.c
+ * @brief base test case for transport implementations
+ *
+ * This test case starts 2 peers, connects and exchanges a message
+ * 1 peer is restarted and tested if peers reconnect
+ * C code apparently.
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_getopt_lib.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_program_lib.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_transport_service.h"
+#include "transport.h"
+#include "transport-testing.h"
+
+#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+
+#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, 120)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+#define MTYPE 12345
+
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
+
+static int ok;
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier send_task;
+
+struct PeerContext *p1;
+
+struct PeerContext *p2;
+
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
+struct GNUNET_TRANSPORT_TransmitHandle *th;
+
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
+char *cfg_file_p1;
+
+char *cfg_file_p2;
+
+static int restarted;
+
+#if VERBOSE
+#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#else
+#define OKPP do { ok++; } while (0)
+#endif
+
+
+static void
+end ()
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
+
+ if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (send_task);
+
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+}
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+
+ if (restarted == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was restarted\n");
+
+ if (restarted == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was NO restarted\n");
+
+ if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (send_task);
+
+ if (cc != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ cc = NULL;
+ }
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ if (p1 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ if (p2 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+ ok = GNUNET_SYSERR;
+}
+
+static
+void restart (struct PeerContext *p , char * cfg_file)
+{
+ GNUNET_assert (p != NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting peer %u (`%4s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_TRANSPORT_TESTING_restart_peer (tth, p1, cfg_file);
+ return;
+}
+
+static void
+notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+ struct PeerContext *p = cls;
+ struct PeerContext *t = NULL;
+
+ if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p1;
+ if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p2;
+ GNUNET_assert (t != NULL);
+
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
+ p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
+ GNUNET_i2s (&t->id));
+
+ if ((MTYPE == ntohs (message->type)) &&
+ (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)))
+ {
+ restarted = GNUNET_YES;
+ restart (p1, cfg_file_p1);
+ }
+ else
+ {
+ GNUNET_break (0);
+ ok = 1;
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
+}
+
+
+static size_t
+notify_ready (void *cls, size_t size, void *buf)
+{
+ struct PeerContext *p = cls;
+ struct GNUNET_MessageHeader *hdr;
+
+ th = NULL;
+
+ if (buf == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout occurred while waiting for transmit_ready\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ ok = 42;
+ return 0;
+ }
+
+ GNUNET_assert (size >= 256);
+
+ if (buf != NULL)
+ {
+ hdr = buf;
+ hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
+ hdr->type = htons (MTYPE);
+ }
+ char *ps = strdup (GNUNET_i2s (&p2->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n",
+ p2->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (ps);
+ return sizeof (struct GNUNET_MessageHeader);
+}
+
+
+static void
+sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ send_task = GNUNET_SCHEDULER_NO_TASK;
+
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ return;
+ char *receiver_s = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
+ p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
+ GNUNET_free (receiver_s);
+
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, 256, 0,
+ TIMEOUT_TRANSMIT, &notify_ready,
+ p1);
+}
+
+
+static void
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+ static int c;
+
+ c++;
+ struct PeerContext *p = cls;
+ struct PeerContext *t = NULL;
+
+ if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p1;
+ if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p2;
+ GNUNET_assert (t != NULL);
+
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peer %u (`%4s'): peer %u (`%s') connected to me!\n", p->no, ps,
+ t->no, GNUNET_i2s (peer));
+ GNUNET_free (ps);
+
+ if ((restarted == GNUNET_YES) && (c == 4))
+ end ();
+}
+
+
+static void
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ struct PeerContext *p = cls;
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps,
+ GNUNET_i2s (peer));
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+}
+
+static void
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+{
+ cc = NULL;
+ char *p1_c = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n",
+ p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
+ GNUNET_free (p1_c);
+
+ send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL);
+}
+
+
+
+void
+start_cb (struct PeerContext *p, void *cls)
+{
+ static int started;
+
+ started++;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+ GNUNET_i2s (&p->id));
+
+ if (started != 2)
+ return;
+
+ char *sender_c = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
+ p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
+
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+ NULL);
+
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
+ &notify_receive, &notify_connect,
+ &notify_disconnect, &start_cb,
+ NULL);
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+ &notify_receive, &notify_connect,
+ &notify_disconnect, &start_cb,
+ NULL);
+
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+}
+
+
+static int
+check ()
+{
+ static char *const argv[] = { "test-transport-api",
+ "-c",
+ "test_transport_api_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+#if WRITECONFIG
+ setTransportOptions ("test_transport_api_data.conf");
+#endif
+ send_task = GNUNET_SCHEDULER_NO_TASK;
+
+ ok = 1;
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+ "nohelp", options, &run, &ok);
+
+ return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+ int ret;
+ int nat_res;
+
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+
+ GNUNET_log_setup (test_name,
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+
+ tth = GNUNET_TRANSPORT_TESTING_init ();
+
+ if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+ (strcmp (test_plugin, "udp_nat") == 0))
+ {
+ nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+ if (GNUNET_NO == nat_res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+ "gnunet-nat-server", "SUID not set");
+ return 0;
+ }
+ if (GNUNET_SYSERR == nat_res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+ "gnunet-nat-server", "file not found");
+ return 0;
+ }
+ }
+
+ GNUNET_asprintf(&cfg_file_p1,"test_transport_api_tcp_peer1.conf");
+ GNUNET_asprintf(&cfg_file_p2,"test_transport_api_tcp_peer2.conf");
+
+
+ ret = check ();
+
+ GNUNET_free (cfg_file_p1);
+ GNUNET_free (cfg_file_p2);
+
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
+
+ GNUNET_TRANSPORT_TESTING_done (tth);
+
+ return ret;
+}
+
+/* end of test_transport_api_restart_1peer.c */
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c
new file mode 100644
index 000000000..af9b46385
--- /dev/null
+++ b/src/transport/test_transport_api_restart_2peers.c
@@ -0,0 +1,447 @@
+/*
+ This file is part of GNUnet.
+ (C) 2009, 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 transport/test_transport_api_restart_2peers.c
+ * @brief base test case for transport implementations
+ *
+ * This test case starts 2 peers, connects and exchanges a message
+ * boths peer are restarted and tested if peers reconnect
+ * C code apparently.
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_getopt_lib.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_program_lib.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_transport_service.h"
+#include "transport.h"
+#include "transport-testing.h"
+
+#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+
+#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, 120)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+#define MTYPE 12345
+
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
+
+static int ok;
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier send_task;
+
+struct PeerContext *p1;
+
+struct PeerContext *p2;
+
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
+struct GNUNET_TRANSPORT_TransmitHandle *th;
+
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
+char *cfg_file_p1;
+
+char *cfg_file_p2;
+
+static int restarted;
+
+#if VERBOSE
+#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#else
+#define OKPP do { ok++; } while (0)
+#endif
+
+
+static void
+end ()
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
+
+ if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (send_task);
+
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+}
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+
+ if (restarted == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers were restarted\n");
+
+ if (restarted == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers were NOT restarted\n");
+
+ if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (send_task);
+
+ if (cc != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ cc = NULL;
+ }
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ if (p1 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ if (p2 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+ ok = GNUNET_SYSERR;
+}
+
+static
+void restart (struct PeerContext *p , char * cfg_file)
+{
+ GNUNET_assert (p != NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting peer %u (`%4s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file);
+ return;
+}
+
+static void
+notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+ struct PeerContext *p = cls;
+ struct PeerContext *t = NULL;
+
+ if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p1;
+ if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p2;
+ GNUNET_assert (t != NULL);
+
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
+ p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
+ GNUNET_i2s (&t->id));
+
+ if ((MTYPE == ntohs (message->type)) &&
+ (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)))
+ {
+ restarted = GNUNET_YES;
+ restart (p1, cfg_file_p1);
+ restart (p2, cfg_file_p2);
+ }
+ else
+ {
+ GNUNET_break (0);
+ ok = 1;
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
+}
+
+
+static size_t
+notify_ready (void *cls, size_t size, void *buf)
+{
+ struct PeerContext *p = cls;
+ struct GNUNET_MessageHeader *hdr;
+
+ th = NULL;
+
+ if (buf == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout occurred while waiting for transmit_ready\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ ok = 42;
+ return 0;
+ }
+
+ GNUNET_assert (size >= 256);
+
+ if (buf != NULL)
+ {
+ hdr = buf;
+ hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
+ hdr->type = htons (MTYPE);
+ }
+ char *ps = strdup (GNUNET_i2s (&p2->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n",
+ p2->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (ps);
+ return sizeof (struct GNUNET_MessageHeader);
+}
+
+
+static void
+sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ send_task = GNUNET_SCHEDULER_NO_TASK;
+
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ return;
+ char *receiver_s = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
+ p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
+ GNUNET_free (receiver_s);
+
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, 256, 0,
+ TIMEOUT_TRANSMIT, &notify_ready,
+ p1);
+}
+
+
+static void
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+ static int c;
+
+ c++;
+ struct PeerContext *p = cls;
+ struct PeerContext *t = NULL;
+
+ if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p1;
+ if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
+ t = p2;
+ GNUNET_assert (t != NULL);
+
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peer %u (`%4s'): peer %u (`%s') connected to me!\n", p->no, ps,
+ t->no, GNUNET_i2s (peer));
+ GNUNET_free (ps);
+
+ if ((restarted == GNUNET_YES) && (c == 4))
+ end ();
+}
+
+
+static void
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ struct PeerContext *p = cls;
+ char *ps = strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps,
+ GNUNET_i2s (peer));
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+}
+
+static void
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+{
+ cc = NULL;
+ char *p1_c = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n",
+ p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
+ GNUNET_free (p1_c);
+
+ send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL);
+}
+
+
+
+void
+start_cb (struct PeerContext *p, void *cls)
+{
+ static int started;
+
+ started++;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+ GNUNET_i2s (&p->id));
+
+ if (started != 2)
+ return;
+
+ char *sender_c = strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
+ p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
+
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+ NULL);
+
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
+ &notify_receive, &notify_connect,
+ &notify_disconnect, &start_cb,
+ NULL);
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+ &notify_receive, &notify_connect,
+ &notify_disconnect, &start_cb,
+ NULL);
+
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+}
+
+
+static int
+check ()
+{
+ static char *const argv[] = { "test-transport-api",
+ "-c",
+ "test_transport_api_data.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+#if WRITECONFIG
+ setTransportOptions ("test_transport_api_data.conf");
+#endif
+ send_task = GNUNET_SCHEDULER_NO_TASK;
+
+ ok = 1;
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+ "nohelp", options, &run, &ok);
+
+ return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+ int ret;
+ int nat_res;
+
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+
+ GNUNET_log_setup (test_name,
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+
+ tth = GNUNET_TRANSPORT_TESTING_init ();
+
+ if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+ (strcmp (test_plugin, "udp_nat") == 0))
+ {
+ nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+ if (GNUNET_NO == nat_res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+ "gnunet-nat-server", "SUID not set");
+ return 0;
+ }
+ if (GNUNET_SYSERR == nat_res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+ "gnunet-nat-server", "file not found");
+ return 0;
+ }
+ }
+
+ GNUNET_asprintf(&cfg_file_p1,"test_transport_api_tcp_peer1.conf");
+ GNUNET_asprintf(&cfg_file_p2,"test_transport_api_tcp_peer2.conf");
+
+
+ ret = check ();
+
+ GNUNET_free (cfg_file_p1);
+ GNUNET_free (cfg_file_p2);
+
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
+
+ GNUNET_TRANSPORT_TESTING_done (tth);
+
+ return ret;
+}
+
+/* end of test_transport_api_restart_2peers.c */
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 6892b2556..28d0db256 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -283,11 +283,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle
struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext));
p->cfg = GNUNET_CONFIGURATION_create ();
-
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-
- if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
+ if (GNUNET_CONFIGURATION_have_value (p->
+ cfg, "PATHS", "SERVICEHOME"))
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS",
"SERVICEHOME",
@@ -350,6 +349,100 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle
}
/**
+* Restart the given peer
+* @param tth testing handle
+* @param p the peer
+*/
+void
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+ struct PeerContext *p,
+ const char *cfgname)
+{
+ GNUNET_assert (p != NULL);
+ /* shutdown */
+#if VERBOSE
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Stopping peer %u (`%s')\n", p->no,
+ GNUNET_i2s (&p->id));
+#endif
+ if (p->ghh != NULL)
+ GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+ p->ghh = NULL;
+
+ if (p->th != NULL)
+ GNUNET_TRANSPORT_disconnect (p->th);
+
+ if (NULL != p->arm_proc)
+ {
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (p->arm_proc);
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
+ }
+ if (p->hello != NULL)
+ GNUNET_free (p->hello);
+ p->hello = NULL;
+
+ if (p->cfg != NULL)
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+ p->cfg = NULL;
+
+ /* start */
+#if VERBOSE
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+ "Restarting peer %u (`%s')\n", p->no,
+ GNUNET_i2s (&p->id));
+#endif
+ struct GNUNET_DISK_FileHandle *fn;
+
+ GNUNET_assert (tth != NULL);
+ if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+ "File not found: `%s' \n", cfgname);
+ return;
+ }
+
+ p->cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+ if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS",
+ "SERVICEHOME",
+ &p->servicehome));
+
+ GNUNET_assert (p->hostkeyfile != NULL);
+ GNUNET_asprintf (&p->hostkeyfile, "%s/.hostkey", p->servicehome);
+ fn = GNUNET_DISK_file_open (p->hostkeyfile,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
+ GNUNET_assert (fn != NULL);
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fn));
+
+ p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm", "-c", cfgname,
+ #if VERBOSE_PEERS
+ "-L", "DEBUG",
+ #else
+ "-L", "ERROR",
+ #endif
+ NULL);
+
+ p->th =
+ GNUNET_TRANSPORT_connect (p->cfg, NULL, p, &notify_receive,
+ &notify_connect, &notify_disconnect);
+ GNUNET_assert (p->th != NULL);
+
+ p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
+ GNUNET_assert (p->ghh != NULL);
+
+ return ;
+}
+
+/**
* shutdown the given peer
* @param p the peer
*/
@@ -389,9 +482,11 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
if (p->hello != NULL)
GNUNET_free (p->hello);
+ p->hello = NULL;
if (p->cfg != NULL)
GNUNET_CONFIGURATION_destroy (p->cfg);
+ p->cfg = NULL;
GNUNET_CONTAINER_DLL_remove (tth->p_head, tth->p_tail, p);
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index cec7eb724..32641d8bc 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -58,6 +58,7 @@ typedef void (*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext * p1,
void *cls);
+
struct GNUNET_TRANSPORT_TESTING_handle;
/**
@@ -160,6 +161,16 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
/**
+ * Restart the given peer
+ * @param tth testing handle
+ * @param p the peer
+ */
+void
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+ struct PeerContext *p,
+ const char *cfgname);
+
+/**
* Connect the given peers and call the callback when both peers report the
* inbound connection. Remarks: start_peer's notify_connect callback can be called
* before.