summaryrefslogtreecommitdiff
path: root/src/mesh
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-10-20 14:10:28 +0000
committerBart Polot <bart@net.in.tum.de>2011-10-20 14:10:28 +0000
commit9aa7853d6c5fa43d0384ae79476bb45242af61fb (patch)
tree8d81c58b5687bf52b2bf80f0f53826f3a0c5c782 /src/mesh
parent85e2435610b558e583f10eb6fe5a8f73d7aab3a7 (diff)
Changed testcases structure
Diffstat (limited to 'src/mesh')
-rw-r--r--src/mesh/Makefile.am21
-rw-r--r--src/mesh/gnunet-service-mesh.c7
-rw-r--r--src/mesh/test_mesh_small.c510
-rw-r--r--src/mesh/test_mesh_small_multicast.c776
-rw-r--r--src/mesh/test_mesh_small_unicast.c785
5 files changed, 449 insertions, 1650 deletions
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 2c4dc0b4c..4e7e5c323 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -54,7 +54,6 @@ check_PROGRAMS = \
test_mesh_path_api \
test_mesh_local_1 \
test_mesh_local_2 \
- test_mesh_small \
test_mesh_small_unicast \
test_mesh_small_unicast_far \
test_mesh_small_multicast
@@ -93,17 +92,8 @@ test_mesh_local_2_LDADD = \
test_mesh_local_2_DEPENDENCIES = \
libgnunetmeshnew.la
-test_mesh_small_SOURCES = \
- test_mesh_small.c
-test_mesh_small_LDADD = \
- $(top_builddir)/src/mesh/libgnunetmeshnew.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
-test_mesh_small_DEPENDENCIES = \
- libgnunetmeshnew.la
-
test_mesh_small_unicast_SOURCES = \
- test_mesh_small_unicast.c
+ test_mesh_small.c
test_mesh_small_unicast_LDADD = \
$(top_builddir)/src/mesh/libgnunetmeshnew.la \
$(top_builddir)/src/util/libgnunetutil.la \
@@ -112,7 +102,7 @@ test_mesh_small_unicast_DEPENDENCIES = \
libgnunetmeshnew.la
test_mesh_small_unicast_far_SOURCES = \
- test_mesh_small_unicast_far.c
+ test_mesh_small.c
test_mesh_small_unicast_far_LDADD = \
$(top_builddir)/src/mesh/libgnunetmeshnew.la \
$(top_builddir)/src/util/libgnunetutil.la \
@@ -121,7 +111,7 @@ test_mesh_small_unicast_far_DEPENDENCIES = \
libgnunetmeshnew.la
test_mesh_small_multicast_SOURCES = \
- test_mesh_small_multicast.c
+ test_mesh_small.c
test_mesh_small_multicast_LDADD = \
$(top_builddir)/src/mesh/libgnunetmeshnew.la \
$(top_builddir)/src/util/libgnunetutil.la \
@@ -131,9 +121,10 @@ test_mesh_small_multicast_DEPENDENCIES = \
if ENABLE_TEST_RUN
-TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small test_mesh_small_unicast
+TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small_unicast test_mesh_small_multicast
endif
EXTRA_DIST = \
test_mesh.conf \
- test_mesh_path.conf \ No newline at end of file
+ test_mesh_path.conf \
+ test_mesh_small.conf \ No newline at end of file
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 3108d9149..0f2bbe3cf 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -4241,17 +4241,12 @@ main (int argc, char *const *argv)
{
int ret;
-#if MESH_DEBUG
-// fprintf (stderr, "main ()\n");
-#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: main()\n");
ret =
(GNUNET_OK ==
GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE, &run,
NULL)) ? 0 : 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: main() END\n");
-#if MESH_DEBUG
-// fprintf (stderr, "main () END\n");
-#endif
+
return ret;
}
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index a7ea4ee79..9fe2c1292 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -20,7 +20,7 @@
/**
* @file mesh/test_mesh_small.c
*
- * @brief Test for the mesh service.
+ * @brief Test for the mesh service: retransmission of traffic.
*/
#include "platform.h"
#include "gnunet_testing_lib.h"
@@ -47,15 +47,31 @@ struct StatsContext
};
-// static struct MeshPeer *peer_head;
-//
-// static struct MeshPeer *peer_tail;
-
/**
* 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, 5)
+
+/**
+ * DIFFERENT TESTS TO RUN
+ */
+#define SETUP 0
+#define UNICAST 1
+#define MULTICAST 2
+
+/**
+ * Which test are we running?
+ */
+static int test;
+
+/**
+ * How many events have happened
+ */
static int ok;
/**
@@ -99,11 +115,21 @@ static struct GNUNET_DISK_FileHandle *output_file;
static struct GNUNET_DISK_FileHandle *data_file;
/**
+ * How many data points to capture before triggering next round?
+ */
+static struct GNUNET_TIME_Relative wait_time;
+
+/**
* Task called to disconnect peers.
*/
static GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
/**
+ * Task To perform tests
+ */
+static GNUNET_SCHEDULER_TaskIdentifier test_task;
+
+/**
* Task called to shutdown test.
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
@@ -112,7 +138,21 @@ static char *topology_file;
static char *data_filename;
-static struct GNUNET_TIME_Relative time_out;
+static struct GNUNET_TESTING_Daemon *d1;
+
+static GNUNET_PEER_Id pid1;
+
+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;
+
+static uint16_t *mesh_peers;
/**
* Check whether peers successfully shut down.
@@ -123,17 +163,15 @@ shutdown_callback (void *cls, const char *emsg)
if (emsg != NULL)
{
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Shutdown of peers failed!\n");
#endif
- if (ok == 0)
- ok = 666;
+ ok--;
}
else
{
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: All peers successfully shut down!\n");
#endif
- ok = 0;
}
}
@@ -142,7 +180,7 @@ static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
#if VERBOSE
- fprintf (stderr, "Ending test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Ending test.\n");
#endif
if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
@@ -150,6 +188,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
+
if (data_file != NULL)
GNUNET_DISK_file_close (data_file);
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
@@ -157,26 +196,132 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
}
+static void
+disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: disconnecting mesh service of peers\n");
+ disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_MESH_disconnect(h1);
+ GNUNET_MESH_disconnect(h2);
+ GNUNET_SCHEDULER_cancel (shutdown_handle);
+ shutdown_handle = GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
+}
+
+
+/**
+ * Transmit ready callback
+ */
+size_t
+tmt_rdy (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_MessageHeader *msg = buf;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: tmt_rdy called\n");
+ if (size < sizeof(struct GNUNET_MessageHeader) || NULL == buf)
+ return 0;
+ msg->size = htons (sizeof(struct GNUNET_MessageHeader));
+ msg->type = htons ((long) cls);
+ return sizeof(struct GNUNET_MessageHeader);
+}
+
+
+/**
+ * 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)
+{
+ long client = (long) cls;
+
+ switch (client)
+ {
+ case 1L:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Origin client got a response!\n");
+ ok++;
+ GNUNET_MESH_tunnel_destroy (tunnel);
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+ &disconnect_mesh_peers,
+ NULL);
+ break;
+ case 2L:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Destination client got a message \n");
+ ok++;
+ GNUNET_MESH_notify_transmit_ready(incoming_t,
+ GNUNET_NO,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ sender,
+ sizeof(struct GNUNET_MessageHeader),
+ &tmt_rdy,
+ (void *) 1L);
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+ &disconnect_mesh_peers,
+ NULL);
+ break;
+ default:
+ break;
+ }
+ return GNUNET_OK;
+}
+
+
/**
* Handlers, for diverse services
*/
static struct GNUNET_MESH_MessageHandler handlers[] = {
-// {&callback, 1, 0},
+ {&data_callback, 1, sizeof(struct GNUNET_MessageHeader)},
{NULL, 0, 0}
};
-static void
-disconnect_mesh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+/**
+ * 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_DEBUG,
- "test: disconnecting mesh service of peers\n");
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_cancel (shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
+ "test: Incoming tunnel from %s\n",
+ GNUNET_i2s(initiator));
+ ok++;
+ incoming_t = tunnel;
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+ &disconnect_mesh_peers,
+ NULL);
+ return NULL;
}
-
/**
* Function called whenever an inbound tunnel is destroyed. Should clean up
* any associated state.
@@ -190,12 +335,21 @@ static void
tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
void *tunnel_ctx)
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tunnel disconnected\n");
-#endif
+ long i = (long) cls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Incoming tunnel disconnected at peer %d\n",
+ i);
+ if (2L == i)
+ ok++;
+
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers, NULL);
+
return;
}
+
/**
* Method called whenever a tunnel falls apart.
*
@@ -205,13 +359,15 @@ tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
static void
dh (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer disconnected\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: peer %s disconnected\n",
+ GNUNET_i2s(peer));
return;
}
/**
- * Method called whenever a tunnel is established.
+ * Method called whenever a peer connects to a tunnel.
*
* @param cls closure
* @param peer peer identity the tunnel was created to, NULL on timeout
@@ -221,44 +377,180 @@ static void
ch (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_ATS_Information *atsi)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer connected\n");
+ struct GNUNET_PeerIdentity *dest;
+
+ switch (test)
+ {
+ case UNICAST:
+ dest = &d2->id;
+ break;
+ case MULTICAST:
+ dest = NULL;
+ break;
+ default:
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: peer %s connected\n",
+ GNUNET_i2s(peer));
+ if (0 == memcmp(&d2->id, peer, sizeof(d2->id)) && (long) cls == 1L)
+ ok++;
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+ &disconnect_mesh_peers,
+ NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Sending data...\n");
+ GNUNET_MESH_notify_transmit_ready(t,
+ GNUNET_NO,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ dest,
+ sizeof(struct GNUNET_MessageHeader),
+ &tmt_rdy,
+ (void *) 1L);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Disconnect already run?\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Aborting...\n");
+ }
return;
}
+static void
+do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\n");
+ GNUNET_MESH_peer_request_connect_add(t, &d2->id);
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed(
+ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30),
+ &disconnect_mesh_peers, NULL);
+}
+
+
+/**
+ * Prototype of a callback function indicating that two peers
+ * are currently connected.
+ *
+ * @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 emsg error message (NULL on success)
+ */
+void
+topo_cb (void *cls,
+ const struct GNUNET_PeerIdentity* first,
+ const struct GNUNET_PeerIdentity* second,
+ const char *emsg)
+{
+ GNUNET_PEER_Id p1;
+ GNUNET_PEER_Id p2;
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve(1, &id);
+ p1 = GNUNET_PEER_search(first);
+ if (p1 == pid1)
+ {
+ p2 = GNUNET_PEER_search(second);
+ GNUNET_assert(p2 < num_peers);
+ GNUNET_assert(p2 > 0);
+ mesh_peers[p2]++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: %s IS a neighbor\n",
+ GNUNET_i2s(second));
+ return;
+ }
+ p1 = GNUNET_PEER_search(second);
+ if (p1 == pid1)
+ {
+ p2 = GNUNET_PEER_search(first);
+ GNUNET_assert(p2 < num_peers);
+ GNUNET_assert(p2 > 0);
+ mesh_peers[p2]++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: %s IS a neighbor\n",
+ GNUNET_i2s(first));
+ return;
+ }
+}
+
/**
* connect_mesh_service: connect to the mesh service of one of the peers
*
*/
static void
-connect_mesh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_TESTING_Daemon *d;
- struct GNUNET_MESH_Handle *h;
- struct GNUNET_MESH_Tunnel *t;
GNUNET_MESH_ApplicationType app;
+ unsigned int i;
+ struct GNUNET_PeerIdentity id;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connect_mesh_service\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
- d = GNUNET_TESTING_daemon_get (pg, 1);
+ for (i = 1; i <= num_peers; i++)
+ {
+ GNUNET_PEER_resolve(i, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: peer %s has %u conns to d1\n",
+ GNUNET_i2s (&id),
+ mesh_peers[i]);
+ if (mesh_peers[i] == 0)
+ break;
+ }
+ GNUNET_assert (i < num_peers);
+ d2 = GNUNET_TESTING_daemon_get_by_id (pg, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Peer searched: %s\n",
+ GNUNET_i2s (&d2->id));
app = (GNUNET_MESH_ApplicationType) 0;
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "connecting to mesh service of peer %s\n", GNUNET_i2s (&d->id));
+ "test: connecting to mesh service of peer %s (%u)\n",
+ GNUNET_i2s (&d1->id),
+ mesh_peers[0]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: connecting to mesh service of peer %s (%u)\n",
+ GNUNET_i2s (&d2->id),
+ i);
#endif
- h = GNUNET_MESH_connect (d->cfg, 10, NULL, NULL, &tunnel_cleaner, handlers,
- &app);
+ h1 = GNUNET_MESH_connect (d1->cfg,
+ 10,
+ (void *) 1L,
+ NULL,
+ &tunnel_cleaner,
+ handlers,
+ &app);
+ h2 = GNUNET_MESH_connect (d2->cfg,
+ 10,
+ (void *) 2L,
+ &incoming_tunnel,
+ &tunnel_cleaner,
+ handlers,
+ &app);
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected to mesh service of peer %s\n",
- GNUNET_i2s (&d->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: connected to mesh service of peer %s\n",
+ GNUNET_i2s (&d1->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: connected to mesh service of peer %s\n",
+ GNUNET_i2s (&d2->id));
#endif
- t = GNUNET_MESH_tunnel_create (h, NULL, &ch, &dh, NULL);
- GNUNET_MESH_tunnel_destroy (t);
- GNUNET_MESH_disconnect (h);
+ t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
+ test_task =
+ GNUNET_SCHEDULER_add_delayed(
+ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 6),
+ &do_test, NULL);
}
+
/**
* peergroup_ready: start test when all peers are connected
* @param cls closure
@@ -269,22 +561,28 @@ peergroup_ready (void *cls, const char *emsg)
{
char *buf;
int buf_len;
+ unsigned int i;
if (emsg != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peergroup callback called with error, aborting test!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error from testing: `%s'\n");
- ok = 1;
+ "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_DEBUG, "Peer Group started successfully!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "************************************************************\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Peer Group started successfully!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Have %u connections\n",
+ total_connections);
#endif
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n",
- total_connections);
if (data_file != NULL)
{
buf = NULL;
@@ -294,10 +592,29 @@ peergroup_ready (void *cls, const char *emsg)
GNUNET_free (buf);
}
peers_running = GNUNET_TESTING_daemons_running (pg);
-
- GNUNET_SCHEDULER_add_now (&connect_mesh, NULL);
+ for (i = 0; i < num_peers; i++)
+ {
+ d1 = GNUNET_TESTING_daemon_get (pg, i);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: %u: %s\n",
+ GNUNET_PEER_intern(&d1->id),
+ GNUNET_i2s (&d1->id));
+ }
+ d1 = GNUNET_TESTING_daemon_get (pg, 0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Peer looking: %s\n",
+ GNUNET_i2s (&d1->id));
+ pid1 = GNUNET_PEER_intern(&d1->id);
+ mesh_peers[pid1] = 100;
+ GNUNET_TESTING_get_topology(pg, &topo_cb, NULL);
+
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ 4),
+ &connect_mesh_service,
+ NULL);
disconnect_task =
- GNUNET_SCHEDULER_add_delayed (time_out, &disconnect_mesh, NULL);
+ GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
}
@@ -325,7 +642,16 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg)
{
if (emsg == NULL)
+ {
total_connections++;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: Problem with new connection (%s)\n",
+ emsg);
+ }
+
}
@@ -341,9 +667,10 @@ run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *temp_str;
+ unsigned long long temp_wait;
struct GNUNET_TESTING_Host *hosts;
- ok = 1;
+ ok = 0;
testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_log_setup ("test_mesh_small",
@@ -355,28 +682,29 @@ run (void *cls, char *const *args, const char *cfgfile,
NULL);
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n");
GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
"use_progressbars", "YES");
#endif
- time_out = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
"num_peers", &num_peers))
{
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_load (testing_cfg,
- "test_mesh_small.conf"));
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
- "num_peers", &num_peers))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option TESTING:NUM_PEERS is required!\n");
- return;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Option TESTING:NUM_PEERS is required!\n");
+ return;
+ }
+
+ mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
+ "wait_time", &temp_wait))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Option test_mesh_small:wait_time is required!\n");
+ return;
}
if (GNUNET_OK !=
@@ -412,6 +740,9 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_free (data_filename);
}
+ wait_time =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
+
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
"output_file", &temp_str))
@@ -458,13 +789,56 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
int
main (int argc, char *argv[])
{
- GNUNET_PROGRAM_run (argc, argv, "test_mesh_small",
- gettext_noop ("Test mesh in a small network."), options,
- &run, NULL);
+ char *const argv2[] = {
+ argv[0],
+ "-c",
+ "test_mesh_small.conf",
+#if VERBOSE
+ "-L",
+ "DEBUG",
+#endif
+ NULL
+ };
+ int ok_goal;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Start\n");
+ if (strstr (argv[0], "test_mesh_small_unicast") != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: UNICAST\n");
+ test = UNICAST;
+ ok_goal = 5;
+ }
+ else if (strstr (argv[0], "test_mesh_small_multicast") != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: MULTICAST\n");
+ test = MULTICAST;
+ ok_goal = 5;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: UNKNOWN\n");
+ test = SETUP;
+ ok_goal = 0;
+ }
+
+ GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+ "test_mesh_small",
+ gettext_noop ("Test mesh in a small network."),
+ options, &run, NULL);
#if REMOVE_DIR
GNUNET_DISK_directory_remove ("/tmp/test_mesh_small");
#endif
- return ok;
+ if (ok_goal != ok)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "test: %s FAILED! (%d/%d)\n",
+ argv[0], ok, ok_goal);
+ return 1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test: %s success\n",
+ argv[0]);
+ return 0;
}
/* end of test_mesh_small.c */
diff --git a/src/mesh/test_mesh_small_multicast.c b/src/mesh/test_mesh_small_multicast.c
deleted file mode 100644
index f9b69506e..000000000
--- a/src/mesh/test_mesh_small_multicast.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-/**
- * @file mesh/test_mesh_small_multicast.c
- *
- * @brief Test for the mesh service: retransmission of multicast traffic.
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
-
-#define VERBOSE GNUNET_YES
-#define REMOVE_DIR GNUNET_YES
-
-struct MeshPeer
-{
- struct MeshPeer *prev;
-
- struct MeshPeer *next;
-
- struct GNUNET_TESTING_Daemon *daemon;
-
- struct GNUNET_MESH_Handle *mesh_handle;
-};
-
-
-struct StatsContext
-{
- unsigned long long total_mesh_bytes;
-};
-
-
-/**
- * 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, 5)
-
-#define OK_GOAL 4
-
-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 connections in the whole network.
- */
-static unsigned int total_connections;
-
-/**
- * The currently running peer group.
- */
-static struct GNUNET_TESTING_PeerGroup *pg;
-
-/**
- * File to report results to.
- */
-static struct GNUNET_DISK_FileHandle *output_file;
-
-/**
- * File to log connection info, statistics to.
- */
-static struct GNUNET_DISK_FileHandle *data_file;
-
-/**
- * How many data points to capture before triggering next round?
- */
-static struct GNUNET_TIME_Relative wait_time;
-
-/**
- * Task called to disconnect peers.
- */
-static GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
-
-/**
- * Task To perform tests
- */
-static GNUNET_SCHEDULER_TaskIdentifier test_task;
-
-/**
- * Task called to shutdown test.
- */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
-
-static char *topology_file;
-
-static char *data_filename;
-
-static struct GNUNET_TESTING_Daemon *d1;
-
-static GNUNET_PEER_Id pid1;
-
-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;
-
-static uint16_t *mesh_peers;
-
-/**
- * Check whether peers successfully shut down.
- */
-static void
-shutdown_callback (void *cls, const char *emsg)
-{
- if (emsg != NULL)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Shutdown of peers failed!\n");
-#endif
- ok--;
- }
- else
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: All peers successfully shut down!\n");
-#endif
- }
-}
-
-
-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
-
- if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (data_file != NULL)
- GNUNET_DISK_file_close (data_file);
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_CONFIGURATION_destroy (testing_cfg);
-}
-
-
-static void
-disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: disconnecting mesh service of peers\n");
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_MESH_disconnect(h1);
- GNUNET_MESH_disconnect(h2);
- GNUNET_SCHEDULER_cancel (shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
-}
-
-
-/**
- * Transmit ready callback
- */
-size_t
-tmt_rdy (void *cls, size_t size, void *buf)
-{
- struct GNUNET_MessageHeader *msg = buf;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: tmt_rdy called\n");
- if (size < sizeof(struct GNUNET_MessageHeader) || NULL == buf)
- return 0;
- msg->size = htons (sizeof(struct GNUNET_MessageHeader));
- msg->type = htons ((long) cls);
- return sizeof(struct GNUNET_MessageHeader);
-}
-
-
-/**
- * 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)
-{
- long client = (long) cls;
-
- switch (client)
- {
- case 1L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Origin client got a response!\n");
- ok++;
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_now(&disconnect_mesh_peers,
- NULL);
- break;
- case 2L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Destination client got a message \n");
- ok++;
- GNUNET_MESH_notify_transmit_ready(incoming_t,
- GNUNET_NO,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sender,
- sizeof(struct GNUNET_MessageHeader),
- &tmt_rdy,
- (void *) 1L);
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- break;
- default:
- break;
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Handlers, for diverse services
- */
-static struct GNUNET_MESH_MessageHandler handlers[] = {
- {&data_callback, 1, sizeof(struct GNUNET_MessageHeader)},
- {NULL, 0, 0}
-};
-
-
-/**
- * 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_DEBUG,
- "test: Incoming tunnel from %s\n",
- GNUNET_i2s(initiator));
- ok++;
- incoming_t = tunnel;
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- return NULL;
-}
-
-/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
- * any associated state.
- *
- * @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- * with the tunnel is stored
- */
-static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
-{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: tunnel disconnected\n");
-#endif
-
- 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,
- "test: peer %s disconnected\n",
- GNUNET_i2s(peer));
- return;
-}
-
-
-/**
- * Method called whenever a tunnel is established.
- *
- * @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)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: peer %s connected\n",
- GNUNET_i2s(peer));
- if (0 == memcmp(&d2->id, peer, sizeof(d2->id)) && (long) cls == 1L)
- ok++;
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Sending data multicast...\n");
- GNUNET_MESH_notify_transmit_ready(t,
- GNUNET_NO,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL,
- sizeof(struct GNUNET_MessageHeader),
- &tmt_rdy,
- (void *) 1L);
- }
- return;
-}
-
-
-static void
-do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\n");
- GNUNET_MESH_peer_request_connect_add(t, &d2->id);
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30),
- &disconnect_mesh_peers, NULL);
-}
-
-
-/**
- * Prototype of a callback function indicating that two peers
- * are currently connected.
- *
- * @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 emsg error message (NULL on success)
- */
-void
-topo_cb (void *cls,
- const struct GNUNET_PeerIdentity* first,
- const struct GNUNET_PeerIdentity* second,
- const char *emsg)
-{
- GNUNET_PEER_Id p1;
- GNUNET_PEER_Id p2;
- struct GNUNET_PeerIdentity id;
-
- GNUNET_PEER_resolve(1, &id);
- p1 = GNUNET_PEER_search(first);
- if (p1 == pid1)
- {
- p2 = GNUNET_PEER_search(second);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
- mesh_peers[p2]++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %s IS a neighbor\n",
- GNUNET_i2s(second));
- return;
- }
- p1 = GNUNET_PEER_search(second);
- if (p1 == pid1)
- {
- p2 = GNUNET_PEER_search(first);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
- mesh_peers[p2]++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %s IS a neighbor\n",
- GNUNET_i2s(first));
- return;
- }
-}
-
-/**
- * connect_mesh_service: connect to the mesh service of one of the peers
- *
- */
-static void
-connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_MESH_ApplicationType app;
- unsigned int i;
- struct GNUNET_PeerIdentity id;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
-
- for (i = 1; i <= num_peers; i++)
- {
- GNUNET_PEER_resolve(i, &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: peer %s has %u conns to d1\n",
- GNUNET_i2s (&id),
- mesh_peers[i]);
- if (mesh_peers[i] == 0)
- break;
- }
- GNUNET_assert (i < num_peers);
- d2 = GNUNET_TESTING_daemon_get_by_id (pg, &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer searched: %s\n",
- GNUNET_i2s (&d2->id));
- app = (GNUNET_MESH_ApplicationType) 0;
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d1->id),
- mesh_peers[0]);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d2->id),
- i);
-#endif
- h1 = GNUNET_MESH_connect (d1->cfg,
- 10,
- (void *) 1L,
- NULL,
- &tunnel_cleaner,
- handlers,
- &app);
- h2 = GNUNET_MESH_connect (d2->cfg,
- 10,
- (void *) 2L,
- &incoming_tunnel,
- &tunnel_cleaner,
- handlers,
- &app);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connected to mesh service of peer %s\n",
- GNUNET_i2s (&d1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connected to mesh service of peer %s\n",
- GNUNET_i2s (&d2->id));
-#endif
- t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
- test_task =
- GNUNET_SCHEDULER_add_delayed(
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 6),
- &do_test, NULL);
-}
-
-
-
-/**
- * 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)
-{
- char *buf;
- int buf_len;
- unsigned int i;
-
- 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_DEBUG,
- "************************************************************\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer Group started successfully!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Have %u connections\n",
- total_connections);
-#endif
-
- if (data_file != NULL)
- {
- buf = NULL;
- buf_len = GNUNET_asprintf (&buf, "CONNECTIONS_0: %u\n", total_connections);
- if (buf_len > 0)
- GNUNET_DISK_file_write (data_file, buf, buf_len);
- GNUNET_free (buf);
- }
- peers_running = GNUNET_TESTING_daemons_running (pg);
- for (i = 0; i < num_peers; i++)
- {
- d1 = GNUNET_TESTING_daemon_get (pg, i);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %u: %s\n",
- GNUNET_PEER_intern(&d1->id),
- GNUNET_i2s (&d1->id));
- }
- d1 = GNUNET_TESTING_daemon_get (pg, 0);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer looking: %s\n",
- GNUNET_i2s (&d1->id));
- pid1 = GNUNET_PEER_intern(&d1->id);
- mesh_peers[pid1] = 100;
- GNUNET_TESTING_get_topology(pg, &topo_cb, NULL);
-
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- 4),
- &connect_mesh_service,
- NULL);
- disconnect_task =
- GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
-
-}
-
-
-/**
- * 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
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Problem with new connection (%s)\n",
- emsg);
- }
-
-}
-
-
-/**
- * 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)
-{
- char *temp_str;
- unsigned long long temp_wait;
- struct GNUNET_TESTING_Host *hosts;
-
- ok = 0;
- testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
-
- GNUNET_log_setup ("test_mesh_small_multicast",
-#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",
- "use_progressbars", "YES");
-#endif
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
- "num_peers", &num_peers))
- {
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_load (testing_cfg,
- "test_mesh_small.conf"));
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
- "num_peers", &num_peers))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option TESTING:NUM_PEERS is required!\n");
- return;
- }
- }
-
- mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
- "wait_time", &temp_wait))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:wait_time is required!\n");
- return;
- }
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
- "topology_output_file",
- &topology_file))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:topology_output_file is required!\n");
- return;
- }
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
- "data_output_file",
- &data_filename))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:data_output_file is required!\n");
- return;
- }
-
- data_file =
- GNUNET_DISK_file_open (data_filename,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- if (data_file == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
- data_filename);
- GNUNET_free (data_filename);
- }
-
- wait_time =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
- "output_file", &temp_str))
- {
- output_file =
- GNUNET_DISK_file_open (temp_str,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- if (output_file == NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
- temp_str);
- }
- GNUNET_free_non_null (temp_str);
-
- 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_relative_get_forever (),
- &shutdown_task, NULL);
-}
-
-
-
-/**
- * test_mesh_small 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[])
-{
- GNUNET_PROGRAM_run (argc, argv, "test_mesh_small_multicast",
- gettext_noop ("Test mesh multicast in a small network."),
- options, &run, NULL);
-#if REMOVE_DIR
- GNUNET_DISK_directory_remove ("/tmp/test_mesh_small_multicast");
-#endif
- if (OK_GOAL != ok)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "test: FAILED! (%d/%d)\n",
- ok, OK_GOAL);
- return 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: success\n");
- return 0;
-}
-
-/* end of test_mesh_small_multicast.c */
diff --git a/src/mesh/test_mesh_small_unicast.c b/src/mesh/test_mesh_small_unicast.c
deleted file mode 100644
index ad5a0fd22..000000000
--- a/src/mesh/test_mesh_small_unicast.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-/**
- * @file mesh/test_mesh_small_unicast.c
- *
- * @brief Test for the mesh service: retransmission of unicast traffic.
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
-
-#define VERBOSE GNUNET_YES
-#define REMOVE_DIR GNUNET_YES
-
-struct MeshPeer
-{
- struct MeshPeer *prev;
-
- struct MeshPeer *next;
-
- struct GNUNET_TESTING_Daemon *daemon;
-
- struct GNUNET_MESH_Handle *mesh_handle;
-};
-
-
-struct StatsContext
-{
- unsigned long long total_mesh_bytes;
-};
-
-
-/**
- * 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, 5)
-
-#define OK_GOAL 5
-
-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 connections in the whole network.
- */
-static unsigned int total_connections;
-
-/**
- * The currently running peer group.
- */
-static struct GNUNET_TESTING_PeerGroup *pg;
-
-/**
- * File to report results to.
- */
-static struct GNUNET_DISK_FileHandle *output_file;
-
-/**
- * File to log connection info, statistics to.
- */
-static struct GNUNET_DISK_FileHandle *data_file;
-
-/**
- * How many data points to capture before triggering next round?
- */
-static struct GNUNET_TIME_Relative wait_time;
-
-/**
- * Task called to disconnect peers.
- */
-static GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
-
-/**
- * Task To perform tests
- */
-static GNUNET_SCHEDULER_TaskIdentifier test_task;
-
-/**
- * Task called to shutdown test.
- */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
-
-static char *topology_file;
-
-static char *data_filename;
-
-static struct GNUNET_TESTING_Daemon *d1;
-
-static GNUNET_PEER_Id pid1;
-
-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;
-
-static uint16_t *mesh_peers;
-
-/**
- * Check whether peers successfully shut down.
- */
-static void
-shutdown_callback (void *cls, const char *emsg)
-{
- if (emsg != NULL)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Shutdown of peers failed!\n");
-#endif
- ok--;
- }
- else
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: All peers successfully shut down!\n");
-#endif
- }
-}
-
-
-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
-
- if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (data_file != NULL)
- GNUNET_DISK_file_close (data_file);
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_CONFIGURATION_destroy (testing_cfg);
-}
-
-
-static void
-disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: disconnecting mesh service of peers\n");
- disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_MESH_disconnect(h1);
- GNUNET_MESH_disconnect(h2);
- GNUNET_SCHEDULER_cancel (shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
-}
-
-
-/**
- * Transmit ready callback
- */
-size_t
-tmt_rdy (void *cls, size_t size, void *buf)
-{
- struct GNUNET_MessageHeader *msg = buf;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: tmt_rdy called\n");
- if (size < sizeof(struct GNUNET_MessageHeader) || NULL == buf)
- return 0;
- msg->size = htons (sizeof(struct GNUNET_MessageHeader));
- msg->type = htons ((long) cls);
- return sizeof(struct GNUNET_MessageHeader);
-}
-
-
-/**
- * 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)
-{
- long client = (long) cls;
-
- switch (client)
- {
- case 1L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Origin client got a response!\n");
- ok++;
- GNUNET_MESH_tunnel_destroy (tunnel);
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- break;
- case 2L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Destination client got a message \n");
- ok++;
- GNUNET_MESH_notify_transmit_ready(incoming_t,
- GNUNET_NO,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sender,
- sizeof(struct GNUNET_MessageHeader),
- &tmt_rdy,
- (void *) 1L);
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- break;
- default:
- break;
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Handlers, for diverse services
- */
-static struct GNUNET_MESH_MessageHandler handlers[] = {
- {&data_callback, 1, sizeof(struct GNUNET_MessageHeader)},
- {NULL, 0, 0}
-};
-
-
-/**
- * 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_DEBUG,
- "test: Incoming tunnel from %s\n",
- GNUNET_i2s(initiator));
- ok++;
- incoming_t = tunnel;
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- return NULL;
-}
-
-/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
- * any associated state.
- *
- * @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- * with the tunnel is stored
- */
-static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
-{
- long i = (long) cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Incoming tunnel disconnected at peer %d\n",
- i);
- if (2L == i)
- ok++;
-
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers, NULL);
-
- 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,
- "test: 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)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: peer %s connected\n",
- GNUNET_i2s(peer));
- if (0 == memcmp(&d2->id, peer, sizeof(d2->id)) && (long) cls == 1L)
- ok++;
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
- &disconnect_mesh_peers,
- NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Sending data unicast...\n");
- GNUNET_MESH_notify_transmit_ready(t,
- GNUNET_NO,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &d2->id,
- sizeof(struct GNUNET_MessageHeader),
- &tmt_rdy,
- (void *) 1L);
- }
- return;
-}
-
-
-static void
-do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\n");
- GNUNET_MESH_peer_request_connect_add(t, &d2->id);
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed(
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30),
- &disconnect_mesh_peers, NULL);
-}
-
-
-/**
- * Prototype of a callback function indicating that two peers
- * are currently connected.
- *
- * @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 emsg error message (NULL on success)
- */
-void
-topo_cb (void *cls,
- const struct GNUNET_PeerIdentity* first,
- const struct GNUNET_PeerIdentity* second,
- const char *emsg)
-{
- GNUNET_PEER_Id p1;
- GNUNET_PEER_Id p2;
- struct GNUNET_PeerIdentity id;
-
- GNUNET_PEER_resolve(1, &id);
- p1 = GNUNET_PEER_search(first);
- if (p1 == pid1)
- {
- p2 = GNUNET_PEER_search(second);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
- mesh_peers[p2]++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %s IS a neighbor\n",
- GNUNET_i2s(second));
- return;
- }
- p1 = GNUNET_PEER_search(second);
- if (p1 == pid1)
- {
- p2 = GNUNET_PEER_search(first);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
- mesh_peers[p2]++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %s IS a neighbor\n",
- GNUNET_i2s(first));
- return;
- }
-}
-
-/**
- * connect_mesh_service: connect to the mesh service of one of the peers
- *
- */
-static void
-connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_MESH_ApplicationType app;
- unsigned int i;
- struct GNUNET_PeerIdentity id;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
-
- for (i = 1; i <= num_peers; i++)
- {
- GNUNET_PEER_resolve(i, &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: peer %s has %u conns to d1\n",
- GNUNET_i2s (&id),
- mesh_peers[i]);
- if (mesh_peers[i] == 0)
- break;
- }
- GNUNET_assert (i < num_peers);
- d2 = GNUNET_TESTING_daemon_get_by_id (pg, &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer searched: %s\n",
- GNUNET_i2s (&d2->id));
- app = (GNUNET_MESH_ApplicationType) 0;
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d1->id),
- mesh_peers[0]);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d2->id),
- i);
-#endif
- h1 = GNUNET_MESH_connect (d1->cfg,
- 10,
- (void *) 1L,
- NULL,
- &tunnel_cleaner,
- handlers,
- &app);
- h2 = GNUNET_MESH_connect (d2->cfg,
- 10,
- (void *) 2L,
- &incoming_tunnel,
- &tunnel_cleaner,
- handlers,
- &app);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connected to mesh service of peer %s\n",
- GNUNET_i2s (&d1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: connected to mesh service of peer %s\n",
- GNUNET_i2s (&d2->id));
-#endif
- t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
- test_task =
- GNUNET_SCHEDULER_add_delayed(
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 6),
- &do_test, NULL);
-}
-
-
-
-/**
- * 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)
-{
- char *buf;
- int buf_len;
- unsigned int i;
-
- 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_DEBUG,
- "************************************************************\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer Group started successfully!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Have %u connections\n",
- total_connections);
-#endif
-
- if (data_file != NULL)
- {
- buf = NULL;
- buf_len = GNUNET_asprintf (&buf, "CONNECTIONS_0: %u\n", total_connections);
- if (buf_len > 0)
- GNUNET_DISK_file_write (data_file, buf, buf_len);
- GNUNET_free (buf);
- }
- peers_running = GNUNET_TESTING_daemons_running (pg);
- for (i = 0; i < num_peers; i++)
- {
- d1 = GNUNET_TESTING_daemon_get (pg, i);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: %u: %s\n",
- GNUNET_PEER_intern(&d1->id),
- GNUNET_i2s (&d1->id));
- }
- d1 = GNUNET_TESTING_daemon_get (pg, 0);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer looking: %s\n",
- GNUNET_i2s (&d1->id));
- pid1 = GNUNET_PEER_intern(&d1->id);
- mesh_peers[pid1] = 100;
- GNUNET_TESTING_get_topology(pg, &topo_cb, NULL);
-
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- 4),
- &connect_mesh_service,
- NULL);
- disconnect_task =
- GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
-
-}
-
-
-/**
- * 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
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Problem with new connection (%s)\n",
- emsg);
- }
-
-}
-
-
-/**
- * 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)
-{
- char *temp_str;
- unsigned long long temp_wait;
- struct GNUNET_TESTING_Host *hosts;
-
- ok = 0;
- testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
-
- GNUNET_log_setup ("test_mesh_small_unicast",
-#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",
- "use_progressbars", "YES");
-#endif
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
- "num_peers", &num_peers))
- {
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_load (testing_cfg,
- "test_mesh_small.conf"));
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
- "num_peers", &num_peers))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option TESTING:NUM_PEERS is required!\n");
- return;
- }
- }
-
- mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
- "wait_time", &temp_wait))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:wait_time is required!\n");
- return;
- }
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
- "topology_output_file",
- &topology_file))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:topology_output_file is required!\n");
- return;
- }
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
- "data_output_file",
- &data_filename))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:data_output_file is required!\n");
- return;
- }
-
- data_file =
- GNUNET_DISK_file_open (data_filename,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- if (data_file == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
- data_filename);
- GNUNET_free (data_filename);
- }
-
- wait_time =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
- "output_file", &temp_str))
- {
- output_file =
- GNUNET_DISK_file_open (temp_str,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- if (output_file == NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
- temp_str);
- }
- GNUNET_free_non_null (temp_str);
-
- 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_relative_get_forever (),
- &shutdown_task, NULL);
-}
-
-
-
-/**
- * test_mesh_small 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[])
-{
- GNUNET_PROGRAM_run (argc, argv, "test_mesh_small_unicast",
- gettext_noop ("Test mesh unicast in a small network."),
- options, &run, NULL);
-#if REMOVE_DIR
- GNUNET_DISK_directory_remove ("/tmp/test_mesh_small_unicast");
-#endif
- if (OK_GOAL != ok)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "test: FAILED! (%d/%d)\n",
- ok, OK_GOAL);
- return 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: success\n");
- return 0;
-}
-
-/* end of test_mesh_small_unicast.c */