summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-10 16:41:45 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-10 16:41:45 +0000
commitc6444a089a860da694842942283079a25bc1e957 (patch)
treed35d30bc35acf05681f7f89057ffdc2e774b33ec
parent4f77ea5b2b3d53a21f70237f8b92a9a2273c21bf (diff)
fold bidirectional test into main test_ats_api
-rw-r--r--src/transport/Makefile.am22
-rw-r--r--src/transport/test_transport_api.c40
-rw-r--r--src/transport/test_transport_api_bidirectional_connect.c448
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer1.conf43
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer2.conf43
-rw-r--r--src/transport/test_transport_api_blacklisting.c450
-rw-r--r--src/transport/test_transport_api_blacklisting_tcp_peer1.conf9
-rw-r--r--src/transport/test_transport_api_blacklisting_tcp_peer2.conf9
-rw-r--r--src/transport/test_transport_api_slow_ats_peer2.conf2
-rw-r--r--src/transport/transport-testing-main.c69
-rw-r--r--src/transport/transport-testing.c45
-rw-r--r--src/transport/transport-testing.h23
12 files changed, 265 insertions, 938 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 34fbe9caf..2c6c7dfd8 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -445,9 +445,8 @@ check_PROGRAMS = \
$(HTTPS_CLIENT_PLUGIN_TEST) \
$(HTTP_SERVER_PLUGIN_TEST) \
$(HTTPS_SERVER_PLUGIN_TEST) \
- test_transport_api_blacklisting \
+ test_transport_api_blacklisting_tcp \
test_transport_api_disconnect_tcp \
- test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_restart_1peer \
test_transport_api_timeout_tcp \
@@ -516,9 +515,8 @@ TESTS = \
$(UNIX_TEST) \
$(WLAN_PLUGIN_TEST) \
$(BT_PLUGIN_TEST) \
- test_transport_api_blacklisting \
+ test_transport_api_blacklisting_tcp \
test_transport_api_disconnect_tcp \
- test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_restart_1peer \
test_transport_api_restart_2peers \
@@ -592,9 +590,9 @@ test_transport_testing_restart_LDADD = \
$(top_builddir)/src/hello/libgnunethello.la \
libgnunettransporttesting.la
-test_transport_api_blacklisting_SOURCES = \
+test_transport_api_blacklisting_tcp_SOURCES = \
test_transport_api_blacklisting.c
-test_transport_api_blacklisting_LDADD = \
+test_transport_api_blacklisting_tcp_LDADD = \
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -763,14 +761,6 @@ test_transport_api_tcp_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
-test_transport_api_bidirectional_connect_SOURCES = \
- test_transport_api_bidirectional_connect.c
-test_transport_api_bidirectional_connect_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
test_transport_api_restart_1peer_SOURCES = \
test_transport_api_restart_1peer.c
test_transport_api_restart_1peer_LDADD = \
@@ -1264,6 +1254,8 @@ test_quota_compliance_wlan_asymmetric_peer2.conf\
test_quota_compliance_bluetooth_asymmetric_peer1.conf\
test_quota_compliance_bluetooth_asymmetric_peer2.conf\
test_transport_api_data.conf\
+test_transport_api_blacklisting_tcp_peer1.conf \
+test_transport_api_blacklisting_tcp_peer2.conf \
test_transport_api_http_peer1.conf\
test_transport_api_http_peer2.conf\
test_transport_api_https_peer1.conf\
@@ -1286,8 +1278,6 @@ test_transport_api_reliability_wlan_peer1.conf\
test_transport_api_reliability_wlan_peer2.conf\
test_transport_api_reliability_bluetooth_peer1.conf\
test_transport_api_reliability_bluetooth_peer2.conf\
-test_transport_api_bidirectional_connect_peer1.conf\
-test_transport_api_bidirectional_connect_peer2.conf\
test_transport_api_manipulation_send_tcp_peer1.conf\
test_transport_api_manipulation_send_tcp_peer2.conf\
test_transport_api_manipulation_recv_tcp_peer1.conf\
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index bb10116e2..ad078f582 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -20,6 +20,7 @@
/**
* @file transport/test_transport_api.c
* @brief base test case for transport implementations
+ * @author Christian Grothoff
*
* This test case serves as a base for tcp, udp, and udp-nat
* transport test cases. Based on the executable being run
@@ -33,12 +34,12 @@
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
#define TEST_MESSAGE_SIZE 2600
@@ -58,9 +59,6 @@ custom_shutdown (void *cls)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
}
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Peers were not ready to send data\n");
}
@@ -148,7 +146,7 @@ sendtask (void *cls)
char *receiver_s = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id));
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
+ "Sending message from peer %u (`%s') -> peer %u (`%s') !\n",
ccc->p[1]->no,
GNUNET_i2s (&ccc->p[1]->id),
ccc->p[0]->no,
@@ -162,6 +160,7 @@ sendtask (void *cls)
TIMEOUT_TRANSMIT,
&notify_ready,
ccc->p[0]);
+ GNUNET_assert (NULL != th);
}
@@ -181,9 +180,16 @@ notify_disconnect (void *cls,
}
-int
-main (int argc,
- char *argv[])
+/**
+ * Runs the test.
+ *
+ * @param argv the argv argument from main()
+ * @param bi_directional should we try to establish connections
+ * in both directions simultaneously?
+ */
+static int
+test (char *argv[],
+ int bi_directional)
{
struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
.connect_continuation = &sendtask,
@@ -192,7 +198,8 @@ main (int argc,
.nc = &GNUNET_TRANSPORT_TESTING_log_connect,
.nd = &notify_disconnect,
.shutdown_task = &custom_shutdown,
- .timeout = TIMEOUT
+ .timeout = TIMEOUT,
+ .bi_directional = bi_directional
};
ccc = &my_ccc;
@@ -204,4 +211,17 @@ main (int argc,
return 0;
}
+
+int
+main (int argc,
+ char *argv[])
+{
+ if ( (0 != test (argv,
+ GNUNET_NO)) ||
+ (0 != test (argv,
+ GNUNET_YES) ) )
+ return 1;
+ return 0;
+}
+
/* end of test_transport_api.c */
diff --git a/src/transport/test_transport_api_bidirectional_connect.c b/src/transport/test_transport_api_bidirectional_connect.c
deleted file mode 100644
index 10b20e21e..000000000
--- a/src/transport/test_transport_api_bidirectional_connect.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2009, 2010 GNUnet e.V.
-
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-/**
- * @file transport/test_transport_api_bidirectional_connect.c
- * @brief base test case for transport implementations
- *
- * Perform a 3-way handshake connection set up in both directions at
- * (almost) the same time
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-
-/**
- * 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 struct GNUNET_SCHEDULER_Task * die_task;
-
-static struct GNUNET_SCHEDULER_Task * send_task;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc1;
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc2;
-
-static struct GNUNET_TRANSPORT_TransmitHandle *th;
-
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-static char *cfg_file_p1;
-
-static char *cfg_file_p2;
-
-
-static void
-end ()
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
-
- if (send_task != NULL)
- {
- GNUNET_SCHEDULER_cancel (send_task);
- send_task = NULL;
- }
-
- if (die_task != NULL)
- GNUNET_SCHEDULER_cancel (die_task);
-
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
-
- GNUNET_TRANSPORT_TESTING_stop_peer (p1);
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-}
-
-
-static void
-end_badly (void *cls)
-{
- die_task = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (send_task != NULL)
- {
- GNUNET_SCHEDULER_cancel (send_task);
- send_task = NULL;
- }
-
- if (NULL != cc2)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc2);
- cc2 = NULL;
- }
- if (NULL != cc1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc1);
- cc1 = NULL;
- }
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
- if (p1 != NULL)
- GNUNET_TRANSPORT_TESTING_stop_peer (p1);
- if (p2 != NULL)
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-
- ok = GNUNET_SYSERR;
-}
-
-
-static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
-{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_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 = GNUNET_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));
- GNUNET_free (ps);
- if ((MTYPE == ntohs (message->type)) &&
- (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)))
- {
- ok = 0;
- end ();
- }
- else
- {
- GNUNET_break (0);
- ok = 1;
- end ();
- }
-}
-
-
-static size_t
-notify_ready (void *cls, size_t size, void *buf)
-{
- struct GNUNET_TRANSPORT_TESTING_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 (NULL != die_task)
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- ok = 42;
- return 0;
- }
-
- GNUNET_assert (size >= 256);
- hdr = buf;
- hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
- hdr->type = htons (MTYPE);
-
- {
- char *ps = GNUNET_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)
-{
- char *receiver_s;
-
- send_task = NULL;
- receiver_s = GNUNET_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,
- TIMEOUT_TRANSMIT, &notify_ready,
- p1);
-}
-
-
-static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- static int c;
-
- c++;
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_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 = GNUNET_strdup (GNUNET_i2s (&p->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Peer %u (`%4s'): peer %u (`%s') connected to me!\n",
- p->no,
- ps,
- t->no,
- GNUNET_i2s (peer));
- GNUNET_free (ps);
- }
-}
-
-
-static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-
- {
- char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Peer %u (`%4s'): peer (`%s') disconnected from me!\n",
- p->no,
- ps,
- GNUNET_i2s (peer));
- GNUNET_free (ps);
- }
- if (NULL != send_task)
- {
- GNUNET_SCHEDULER_cancel(send_task);
- GNUNET_break (0);
- send_task = NULL;
- }
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
-}
-
-
-static void
-testing_connect_cb (void *cls)
-{
- static int connected = GNUNET_NO;
-
- if ((cls == cc1) && (NULL != cc2))
- {
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc2);
- }
- if ((cls == cc2) && (NULL != cc1))
- {
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc1);
- }
- cc1 = NULL;
- cc2 = NULL;
-
- if (connected > 0)
- return;
- connected++;
-
- {
- char *p1_c = GNUNET_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_delayed (GNUNET_TIME_UNIT_SECONDS,
- &sendtask,
- NULL);
-}
-
-
-static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_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 = GNUNET_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));
- GNUNET_free (sender_c);
- cc1 =
- GNUNET_TRANSPORT_TESTING_connect_peers (p2,
- p1,
- &testing_connect_cb,
- cc1);
- cc2 =
- GNUNET_TRANSPORT_TESTING_connect_peers (p1,
- p2,
- &testing_connect_cb,
- cc2);
-}
-
-
-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 != NULL)
- 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",
- NULL
- };
- static struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
-#if WRITECONFIG
- setTransportOptions ("test_transport_api_data.conf");
-#endif
- send_task = NULL;
-
- 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;
-
- test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]);
- GNUNET_log_setup (test_name,
- "WARNING",
- NULL);
-
- test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__);
- test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0],
- test_source);
-
- tth = GNUNET_TRANSPORT_TESTING_init ();
-
- cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1);
- cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 2);
-
- 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_bidirectional_connect.c */
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
deleted file mode 100644
index dff464e45..000000000
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
-
-[arm]
-PORT = 12000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[transport-tcp]
-PORT = 12005
-TIMEOUT = 5 s
-
-[transport-udp]
-PORT = 12006
-TIMEOUT = 5 s
-
-[transport-unix]
-PORT = 12007
-TIMEOUT = 5 s
-
-[transport-http]
-PORT = 12008
-TIMEOUT = 5 s
-
-[transport-https]
-PORT = 12009
-TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
deleted file mode 100644
index 245175788..000000000
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
-
-[arm]
-PORT = 12010
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[transport-udp]
-PORT = 12016
-TIMEOUT = 5 s
-
-[transport-unix]
-PORT = 12017
-TIMEOUT = 5 s
-
-[transport-http]
-PORT = 12018
-TIMEOUT = 5 s
-
-[transport-https]
-PORT = 12019
-TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index 8dce4d48d..72f8a71a3 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2009, 2010, 2011 GNUnet e.V.
+ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -19,242 +19,127 @@
*/
/**
- * @file transport/transport_api_blacklisting.c
+ * @file transport/test_transport_api_blacklisting.c
* @brief test for the blacklisting API
* @author Matthias Wachs
- *
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_transport_service.h"
#include "transport-testing.h"
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
-
-static struct GNUNET_TRANSPORT_TransmitHandle *th;
-
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-/**
- * 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 TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
#define TEST_MESSAGE_SIZE 2600
#define TEST_MESSAGE_TYPE 12345
-static int ok;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
+
+static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
+
static int connected;
-static int blacklist_request_p1;
-static int blacklist_request_p2;
-static struct GNUNET_TRANSPORT_Blacklist * blacklist_p1;
+static int blacklist_request_p1;
-static struct GNUNET_TRANSPORT_Blacklist * blacklist_p2;
+static int blacklist_request_p2;
-static struct GNUNET_SCHEDULER_Task * die_task;
+static struct GNUNET_TRANSPORT_Blacklist *blacklist_p1;
-static struct GNUNET_SCHEDULER_Task * send_task;
+static struct GNUNET_TRANSPORT_Blacklist *blacklist_p2;
-static struct GNUNET_SCHEDULER_Task * shutdown_task;
+static struct GNUNET_SCHEDULER_Task *send_task;
-#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 struct GNUNET_SCHEDULER_Task *shutdown_task;
static void
end (void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
-
- if (send_task != NULL)
- GNUNET_SCHEDULER_cancel (send_task);
-
- if (die_task != NULL)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = NULL;
- }
-
- if (cc != NULL)
- {
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel(cc);
- cc = NULL;
- }
-
- if (th != NULL)
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
-
- if (blacklist_p1 != NULL)
- {
- GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1);
- blacklist_p1 = NULL;
- }
-
- if (blacklist_p2 != NULL)
- {
- GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2);
- blacklist_p2 = NULL;
- }
-
- if (p1 != NULL)
- {
- GNUNET_TRANSPORT_TESTING_stop_peer (p1);
- p1 = NULL;
- }
- if (p2 != NULL)
- {
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
- p2 = NULL;
- }
-
- if ((blacklist_request_p1 == GNUNET_YES) &&
- (blacklist_request_p2 == GNUNET_YES) &&
- (connected == GNUNET_NO))
+ shutdown_task = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping\n");
+ if ((GNUNET_YES == blacklist_request_p1) &&
+ (GNUNET_YES == blacklist_request_p2) &&
+ (GNUNET_NO == connected) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Peers were not connected, success\n"));
- ok = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers were never connected, success\n");
+ ccc->global_ret = GNUNET_OK;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Peers were not connected, fail\n"));
- ok = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peers were not connected, fail\n");
+ ccc->global_ret = GNUNET_SYSERR;
}
+ GNUNET_SCHEDULER_shutdown ();
}
static void
-end_badly (void *cls)
+custom_shutdown (void *cls)
{
- if (send_task != NULL)
+ if (NULL != send_task)
{
GNUNET_SCHEDULER_cancel (send_task);
send_task = NULL;
}
-
- if (shutdown_task != NULL)
+ if (NULL != shutdown_task)
{
GNUNET_SCHEDULER_cancel (shutdown_task);
shutdown_task = NULL;
}
-
- if (cc != NULL)
+ if (NULL != th)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n"));
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
- cc = NULL;
- }
-
- if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
-
- if (blacklist_p1 != NULL)
+ th = NULL;
+ }
+ if (NULL != blacklist_p1)
+ {
GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1);
-
- if (blacklist_p2 != NULL)
+ blacklist_p1 = NULL;
+ }
+ if (NULL != blacklist_p2)
+ {
GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2);
-
- if (p1 != NULL)
- GNUNET_TRANSPORT_TESTING_stop_peer (p1);
- if (p2 != NULL)
- GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-
- ok = GNUNET_SYSERR;
+ blacklist_p2 = NULL;
+ }
}
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+notify_receive (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
+ const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_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 = GNUNET_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));
- GNUNET_free (ps);
-
- if ((TEST_MESSAGE_TYPE == ntohs (message->type)) &&
- (TEST_MESSAGE_SIZE == ntohs (message->size)))
- {
- ok = 0;
- shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
- }
- else
- {
- GNUNET_break (0);
- ok = 1;
- shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpectedly even received the message despite blacklist\n");
+ GNUNET_SCHEDULER_shutdown ();
}
static size_t
-notify_ready (void *cls, size_t size, void *buf)
+notify_ready (void *cls,
+ size_t size,
+ void *buf)
{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
struct GNUNET_MessageHeader *hdr;
th = NULL;
-
- if (buf == NULL)
+ if (NULL == buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
- if (NULL != die_task)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = NULL;
- }
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- ok = 42;
+ GNUNET_SCHEDULER_shutdown ();
return 0;
}
-
GNUNET_assert (size >= TEST_MESSAGE_SIZE);
hdr = buf;
hdr->size = htons (TEST_MESSAGE_SIZE);
hdr->type = htons (TEST_MESSAGE_TYPE);
-
- {
- char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "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 TEST_MESSAGE_SIZE;
}
@@ -262,222 +147,123 @@ notify_ready (void *cls, size_t size, void *buf)
static void
sendtask (void *cls)
{
- send_task = NULL;
- char *receiver_s = GNUNET_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,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[1]->th,
+ &ccc->p[0]->id,
TEST_MESSAGE_SIZE,
- TIMEOUT_TRANSMIT, &notify_ready,
- p1);
+ TIMEOUT,
+ &notify_ready,
+ ccc->p[0]);
}
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_connect (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
+ const struct GNUNET_PeerIdentity *other)
{
- static int c;
-
- c++;
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- struct GNUNET_TRANSPORT_TESTING_PeerContext *t = NULL;
-
- connected = GNUNET_YES;
- 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 = GNUNET_strdup (GNUNET_i2s (&p->id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%4s'): peer %u (`%s') connected to me!\n",
- p->no,
- ps,
- t->no,
- GNUNET_i2s (peer));
- GNUNET_free (ps);
- }
+ GNUNET_TRANSPORT_TESTING_log_connect (cls,
+ me,
+ other);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Peers connected despite blacklist!\n");
+ connected = GNUNET_YES; /* this test now failed */
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ end (NULL);
}
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
+ const struct GNUNET_PeerIdentity *other)
{
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- char *ps = GNUNET_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));
-
- GNUNET_free (ps);
-
- if (th != NULL)
+ GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
+ me,
+ other);
+ if (NULL != th)
+ {
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
-}
-
-
-static void
-testing_connect_cb (void *cls)
-{
- cc = NULL;
- char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
-
- connected = GNUNET_YES;
- 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);
+ th = NULL;
+ }
}
static int
blacklist_cb (void *cls,
- const struct
- GNUNET_PeerIdentity * pid)
+ const struct GNUNET_PeerIdentity *pid)
{
- struct GNUNET_TRANSPORT_TESTING_PeerContext * p = cls;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
int res = GNUNET_SYSERR;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u : Blacklist request for peer `%s'\n",
+ "Peer %u: Blacklist request for peer `%s'\n",
p->no,
GNUNET_i2s (pid));
- if (p == p1)
+ if (p == ccc->p[0])
{
blacklist_request_p1 = GNUNET_YES;
res = GNUNET_OK;
}
- else if (p == p2)
+ if (p == ccc->p[1])
{
blacklist_request_p2 = GNUNET_YES;
res = GNUNET_SYSERR;
}
- if (((blacklist_request_p2 == GNUNET_YES) && (blacklist_request_p1 == GNUNET_YES)) && (shutdown_task == NULL))
+ if ( (GNUNET_YES == blacklist_request_p2) &&
+ (GNUNET_YES == blacklist_request_p1) &&
+ (NULL == shutdown_task) )
{
- shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &end, NULL);
+ shutdown_task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3),
+ &end,
+ NULL);
}
-
return res;
}
static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls)
+start_blacklist (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 = GNUNET_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));
- GNUNET_free (sender_c);
-
- cc = GNUNET_TRANSPORT_TESTING_connect_peers (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);
- connected = GNUNET_NO;
- blacklist_request_p1 = GNUNET_NO;
- blacklist_request_p2 = GNUNET_NO;
-
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_api_tcp_peer1.conf", 1,
- &notify_receive,
- &notify_connect,
- &notify_disconnect,
- &start_cb,
- NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
- "test_transport_api_tcp_peer2.conf", 2,
- &notify_receive,
- &notify_connect,
- &notify_disconnect,
- &start_cb,
- NULL);
-
- blacklist_p1 = GNUNET_TRANSPORT_blacklist (p1->cfg,
+ "Starting blacklists\n");
+ blacklist_p1 = GNUNET_TRANSPORT_blacklist (ccc->p[0]->cfg,
&blacklist_cb,
- p1);
-
- blacklist_p2 = GNUNET_TRANSPORT_blacklist (p2->cfg,
+ ccc->p[0]);
+ GNUNET_assert (NULL != blacklist_p1);
+ blacklist_p2 = GNUNET_TRANSPORT_blacklist (ccc->p[1]->cfg,
&blacklist_cb,
- p2);
-
- GNUNET_assert (blacklist_p1 != NULL);
- GNUNET_assert (blacklist_p2 != NULL);
+ ccc->p[1]);
+ GNUNET_assert (NULL != blacklist_p2);
}
-static int
-check ()
+int
+main (int argc,
+ char *argv[])
{
- static char *const argv[] = { "test-transport-api-blacklisting",
- "-c",
- "test_transport_api_data.conf",
- NULL
+ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
+ .pre_connect_task = &start_blacklist,
+ .connect_continuation = &sendtask,
+ .config_file = "test_transport_api_data.conf",
+ .rec = &notify_receive,
+ .nc = &notify_connect,
+ .nd = &notify_disconnect,
+ .shutdown_task = &custom_shutdown,
+ .timeout = TIMEOUT,
+ .bi_directional = GNUNET_YES
};
- static struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- ok = 1;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-transport-api-blacklisting",
- "nohelp", options, &run, &ok);
- return ok;
+ ccc = &my_ccc;
+ if (GNUNET_OK !=
+ GNUNET_TRANSPORT_TESTING_main (2,
+ &GNUNET_TRANSPORT_TESTING_connect_check,
+ ccc))
+ return 1;
+ return 0;
}
-int
-main (int argc, char *argv[])
-{
- int ret;
-
- GNUNET_log_setup ("test-transport-api-blacklisting",
- "WARNING",
- NULL);
-
- tth = GNUNET_TRANSPORT_TESTING_init ();
-
- ret = check ();
-
- GNUNET_TRANSPORT_TESTING_done (tth);
-
- return ret;
-}
/* end of transport_api_blacklisting.c */
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer1.conf b/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
new file mode 100644
index 000000000..4bfe9b6ca
--- /dev/null
+++ b/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
@@ -0,0 +1,9 @@
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+
+[transport]
+PLUGINS = tcp
+
+#[transport]
+#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer2.conf b/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
new file mode 100644
index 000000000..e68cdbee4
--- /dev/null
+++ b/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
@@ -0,0 +1,9 @@
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+
+[transport]
+PLUGINS = tcp
+
+#[transport]
+#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_slow_ats_peer2.conf b/src/transport/test_transport_api_slow_ats_peer2.conf
index 4895e4c4f..6b67c89d8 100644
--- a/src/transport/test_transport_api_slow_ats_peer2.conf
+++ b/src/transport/test_transport_api_slow_ats_peer2.conf
@@ -6,4 +6,4 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-slow-ats-p2/
PLUGINS = tcp
[ats]
-PREFIX = ./test_delay -t 30 --
+PREFIX = ./test_delay -t 10 --
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
index b8dbb9c03..de2ec3d0c 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -83,6 +83,11 @@ do_shutdown (void *cls)
GNUNET_SCHEDULER_cancel (ccc->timeout_task);
ccc->timeout_task = NULL;
}
+ if (NULL != ccc->connect_task)
+ {
+ GNUNET_SCHEDULER_cancel (ccc->connect_task);
+ ccc->connect_task = NULL;
+ }
while (NULL != (crl = ccc->crl_head))
{
GNUNET_CONTAINER_DLL_remove (ccc->crl_head,
@@ -263,33 +268,23 @@ my_rec (void *cls,
/**
- * Function called once we have successfully launched a peer.
- * Once all peers have been launched, we connect all of them
- * in a clique.
+ * Connect the peers as a clique.
*
- * @param p peer that was launched (redundant, kill ASAP)
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
+ * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
*/
static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
- void *cls)
+do_connect (void *cls)
{
- struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
- struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-
- ccc->started++;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Peer %u (`%s') started\n",
- p->no,
- GNUNET_i2s (&p->id));
- if (ccc->started != ccc->num_peers)
- return;
+ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
+ ccc->connect_task = NULL;
for (unsigned int i=0;i<ccc->num_peers;i++)
- for (unsigned int j=i+1;j<ccc->num_peers;j++)
+ for (unsigned int j=(ccc->bi_directional ? 0 : i+1);j<ccc->num_peers;j++)
{
struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl;
+ if (i == j)
+ continue;
crl = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequestList);
GNUNET_CONTAINER_DLL_insert (ccc->crl_head,
ccc->crl_tail,
@@ -317,6 +312,44 @@ start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
/**
+ * Function called once we have successfully launched a peer.
+ * Once all peers have been launched, we connect all of them
+ * in a clique.
+ *
+ * @param p peer that was launched (redundant, kill ASAP)
+ * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
+ */
+static void
+start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
+ void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
+ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
+
+ ccc->started++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Peer %u (`%s') started\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ if (ccc->started != ccc->num_peers)
+ return;
+ if (NULL != ccc->pre_connect_task)
+ {
+ /* Run the custom per-connect job, then give it a second to
+ go into effect before we continue connecting peers. */
+ ccc->pre_connect_task (ccc->pre_connect_task_cls);
+ ccc->connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &do_connect,
+ ccc);
+ }
+ else
+ {
+ do_connect (ccc);
+ }
+}
+
+
+/**
* Function run from #GNUNET_TRANSPORT_TESTING_connect_check
* once the scheduler is up. Should launch the peers and
* then in the continuations try to connect them.
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 95f4eb671..ae878a79e 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -44,23 +44,30 @@ find_peer_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
}
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
-find_connecting_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
- struct GNUNET_TRANSPORT_TESTING_PeerContext *p2)
+static void
+notify_connecting_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2)
{
struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
- for (cc = tth->cc_head; NULL != cc; cc = cc->next)
+ for (cc = tth->cc_head; NULL != cc; cc = ccn)
{
+ ccn = cc->next;
if ( (cc->p1 == p1) &&
(cc->p2 == p2) )
- return cc;
+ cc->p1_c = GNUNET_YES;
if ( (cc->p1 == p2) &&
(cc->p2 == p1) )
- return cc;
+ cc->p2_c = GNUNET_YES;
+ if ( (cc->p1_c == GNUNET_YES) &&
+ (cc->p2_c == GNUNET_YES) )
+ {
+ cc->cb (cc->cb_cls);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
+ }
}
- return NULL;
}
@@ -71,7 +78,6 @@ notify_connect (void *cls,
struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
char *p2_s;
struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
- struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
p2 = find_peer_context (p->tth,
peer);
@@ -94,24 +100,9 @@ notify_connect (void *cls,
p->no,
GNUNET_i2s (&p->id));
GNUNET_free (p2_s);
-
- /* Find ConnectingContext */
- cc = find_connecting_context (p->tth,
- p,
- p2);
- if (NULL == cc)
- return;
- if (p == cc->p1)
- cc->p1_c = GNUNET_YES;
- if (p == cc->p2)
- cc->p2_c = GNUNET_YES;
-
- if ( (cc->p1_c == GNUNET_YES) &&
- (cc->p2_c == GNUNET_YES) )
- {
- cc->cb (cc->cb_cls);
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
- }
+ notify_connecting_context (p->tth,
+ p,
+ p2);
}
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 842c88374..b78d11dbe 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -459,10 +459,28 @@ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext
void *shutdown_task_cls;
/**
+ * Custom task to run after peers were started but before we try to
+ * connect them. If this function is set, we wait ONE second after
+ * running this function until we continue with connecting the
+ * peers.
+ */
+ GNUNET_SCHEDULER_TaskCallback pre_connect_task;
+
+ /**
+ * Closure for @e shutdown_task.
+ */
+ void *pre_connect_task_cls;
+
+ /**
* When should the testcase time out?
*/
struct GNUNET_TIME_Relative timeout;
+ /**
+ * Should we try to create connections in both directions?
+ */
+ int bi_directional;
+
/* ******* fields set by #GNUNET_TRANSPORT_TESTING_connect_check **** */
/**
@@ -514,6 +532,11 @@ struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext
struct GNUNET_SCHEDULER_Task *timeout_task;
/**
+ * Task run to connect peers.
+ */
+ struct GNUNET_SCHEDULER_Task *connect_task;
+
+ /**
* Number of peers that have been started.
*/
unsigned int started;