/**
* @file mesh/test_mesh_small.c
*
- * @brief Test for the mesh service.
+ * @brief Test for the mesh service: retransmission of traffic.
*/
+#include <stdio.h>
#include "platform.h"
#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
+#include "gnunet_mesh_service.h"
+#include <gauger.h>
+
#define VERBOSE GNUNET_YES
#define REMOVE_DIR GNUNET_YES
};
-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, 300)
-// static struct MeshPeer *peer_head;
-//
-// static struct MeshPeer *peer_tail;
+/**
+ * DIFFERENT TESTS TO RUN
+ */
+#define SETUP 0
+#define UNICAST 1
+#define MULTICAST 2
+#define SPEED 3
+#define SPEED_ACK 4
/**
- * How long until we give up on connecting the peers?
+ * Which test are we running?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+static int test;
+/**
+ * How many events have happened
+ */
static int ok;
+static int peers_in_tunnel;
+
+static int peers_responded;
+
+static int data_sent;
+
+static int data_received;
+
+static int data_ack;
+
/**
* Be verbose
*/
*/
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 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_TESTING_Daemon *d3;
+
+static struct GNUNET_MESH_Handle *h1;
+
+static struct GNUNET_MESH_Handle *h2;
+
+static struct GNUNET_MESH_Handle *h3;
+
+static struct GNUNET_MESH_Tunnel *t;
+
+static struct GNUNET_MESH_Tunnel *incoming_t;
+
+static struct GNUNET_MESH_Tunnel *incoming_t2;
+
+static struct GNUNET_TIME_Absolute start_time;
+
+static struct GNUNET_TIME_Absolute end_time;
+
+static struct GNUNET_TIME_Relative total_time;
-static struct GNUNET_TIME_Relative time_out;
/**
* Check whether peers successfully shut down.
if (emsg != NULL)
{
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "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,
+ "All peers successfully shut down!\n");
#endif
- ok = 0;
}
+ GNUNET_CONFIGURATION_destroy (testing_cfg);
}
+/**
+ * Shut down peergroup, clean up.
+ */
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,
+ "Ending test.\n");
#endif
if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
+
+ if (NULL != h1)
+ {
+ GNUNET_MESH_disconnect (h1);
+ h1 = NULL;
+ }
+ if (NULL != h2)
+ {
+ GNUNET_MESH_disconnect (h2);
+ h2 = NULL;
+ }
+ if (test == MULTICAST && NULL != h3)
+ {
+ GNUNET_MESH_disconnect (h3);
+ h3 = NULL;
+ }
+
if (data_file != NULL)
GNUNET_DISK_file_close (data_file);
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_CONFIGURATION_destroy (testing_cfg);
+}
+
+
+/**
+ * Disconnect from mesh services af all peers, call shutdown.
+ */
+static void
+disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "disconnecting mesh service of peers\n");
+ disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ if (NULL != t)
+ {
+ GNUNET_MESH_tunnel_destroy(t);
+ t = NULL;
+ }
+ if (NULL != incoming_t)
+ {
+ GNUNET_MESH_tunnel_destroy(incoming_t);
+ incoming_t = NULL;
+ }
+ if (NULL != incoming_t2)
+ {
+ GNUNET_MESH_tunnel_destroy(incoming_t2);
+ incoming_t2 = NULL;
+ }
+ GNUNET_MESH_disconnect (h1);
+ GNUNET_MESH_disconnect (h2);
+ h1 = h2 = NULL;
+ if (test == MULTICAST)
+ {
+ GNUNET_MESH_disconnect (h3);
+ h3 = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)
+ {
+ GNUNET_SCHEDULER_cancel (shutdown_handle);
+ shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ }
+}
+
+static size_t
+tmt_rdy (void *cls, size_t size, void *buf);
+
+static void
+data_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_MESH_TransmitHandle *th;
+ if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+ return;
+ th = GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL, &d2->id,
+ sizeof (struct GNUNET_MessageHeader),
+ &tmt_rdy, (void *) 1L);
+ if (NULL == th)
+ {
+ unsigned long i = (unsigned long) cls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Retransmission\n");
+ if (0 == i)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " in 1 ms\n");
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+ &data_task, (void *)1UL);
+ }
+ else
+ {
+ i++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "in %u ms\n", i);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_MILLISECONDS,
+ i),
+ &data_task, (void *)i);
+ }
+ }
+}
+
+/**
+ * Transmit ready callback
+ *
+ * @param cls Closure.
+ * @param size Size of the buffer we have.
+ * @param buf Buffer to copy data to.
+ */
+size_t
+tmt_rdy (void *cls, size_t size, void *buf)
+{
+ struct GNUNET_MessageHeader *msg = buf;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " 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);
+ if (test == SPEED)
+ {
+ data_sent++;
+ if (data_sent < 1000)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " Scheduling %d packet\n", data_sent);
+ GNUNET_SCHEDULER_add_now(&data_task, NULL);
+ }
+ }
+ 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_INFO, "Origin client got a response!\n");
+ ok++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ peers_responded++;
+ data_ack++;
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
+ NULL);
+ }
+ if (test == MULTICAST && peers_responded < 2)
+ return GNUNET_OK;
+ if (test == SPEED_ACK || test == SPEED)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ " received ack %u\n", data_ack);
+ GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL, sender,
+ sizeof (struct GNUNET_MessageHeader),
+ &tmt_rdy, (void *) 1L);
+ if (data_ack < 1000 && test != SPEED)
+ return GNUNET_OK;
+ end_time = GNUNET_TIME_absolute_get();
+ total_time = GNUNET_TIME_absolute_get_difference(start_time, end_time);
+ FPRINTF (stderr, "\nTest time %llu ms\n",
+ (unsigned long long) total_time.rel_value);
+ FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
+ 4 * 1000.0 / total_time.rel_value); // 4bytes * ms
+ FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
+ 1000.0 * 1000.0 / total_time.rel_value); // 1000 packets * ms
+ GAUGER ("MESH", "Tunnel 5 peers", 1000.0 * 1000.0 / total_time.rel_value,
+ "packets/s");
+ }
+ GNUNET_assert (tunnel == t);
+ GNUNET_MESH_tunnel_destroy (t);
+ t = NULL;
+ break;
+ case 2L:
+ case 3L:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Destination client %u got a message.\n",
+ client);
+ ok++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ if (SPEED != test || 1002 == ok)
+ {
+ GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL, sender,
+ sizeof (struct GNUNET_MessageHeader),
+ &tmt_rdy, (void *) 1L);
+ }
+ else
+ {
+ data_received++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ " received data %u\n", data_received);
+ if (data_received < 1000)
+ return GNUNET_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);
+ }
+ 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);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Incoming tunnel from %s to peer %d\n",
+ GNUNET_i2s (initiator), (long) cls);
+ ok++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ if ((long) cls == 2L)
+ incoming_t = tunnel;
+ else if ((long) cls == 3L)
+ incoming_t2 = tunnel;
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Incoming tunnel for unknown client %lu\n", (long) cls);
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, NULL);
+ }
+ return NULL;
}
-
/**
* Function called whenever an inbound tunnel is destroyed. Should clean up
* any associated state.
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_INFO,
+ "Incoming tunnel disconnected at peer %d\n",
+ i);
+ if (2L == i)
+ {
+ ok++;
+ incoming_t = NULL;
+ }
+ else if (3L == i)
+ {
+ ok++;
+ incoming_t2 = NULL;
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Unknown peer! %d\n", i);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ peers_in_tunnel--;
+ if (peers_in_tunnel > 0)
+ return;
+
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers, NULL);
+ }
+
return;
}
+
/**
* Method called whenever a tunnel falls apart.
*
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,
+ "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
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;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "peer %s connected\n", GNUNET_i2s (peer));
+
+ if (0 == memcmp (&d2->id, peer, sizeof (d2->id)) && (long) cls == 1L)
+ {
+ ok++;
+ }
+ if (test == MULTICAST && 0 == memcmp (&d3->id, peer, sizeof (d3->id)) &&
+ (long) cls == 1L)
+ {
+ ok++;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ switch (test)
+ {
+ case UNICAST:
+ case SPEED:
+ case SPEED_ACK:
+ dest = &d2->id;
+ break;
+ case MULTICAST:
+ peers_in_tunnel++;
+ if (peers_in_tunnel < 2)
+ return;
+ dest = NULL;
+ break;
+ default:
+ return;
+ }
+ 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,
+ "Sending data...\n");
+ peers_responded = 0;
+ data_ack = 0;
+ data_received = 0;
+ data_sent = 0;
+ start_time = GNUNET_TIME_absolute_get();
+ GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL, dest,
+ sizeof (struct GNUNET_MessageHeader),
+ &tmt_rdy, (void *) 1L);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnect already run?\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Aborting...\n");
+ }
return;
}
+static void
+do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
+ if (test == MULTICAST)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "add peer 3\n");
+ GNUNET_MESH_peer_request_connect_add (t, &d3->id);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
+ GNUNET_MESH_peer_request_connect_add (t, &d2->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "schedule timeout in 90s\n");
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, NULL);
+ }
+}
+
+
/**
* 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;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connect_mesh_service\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "connect_mesh_service\n");
- d = GNUNET_TESTING_daemon_get (pg, 1);
+ d2 = GNUNET_TESTING_daemon_get (pg, 4);
+ if (test == MULTICAST)
+ {
+ d3 = GNUNET_TESTING_daemon_get (pg, 3);
+ }
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));
-#endif
- h = GNUNET_MESH_connect (d->cfg, 10, NULL, NULL, &tunnel_cleaner, handlers,
- &app);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected to mesh service of peer %s\n",
- GNUNET_i2s (&d->id));
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d1->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d2->id));
+ if (test == MULTICAST)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d3->id));
+ }
#endif
- t = GNUNET_MESH_tunnel_create (h, NULL, &ch, &dh, NULL);
- GNUNET_MESH_tunnel_destroy (t);
- GNUNET_MESH_disconnect (h);
+ h1 = GNUNET_MESH_connect (d1->cfg, (void *) 1L, NULL, &tunnel_cleaner,
+ handlers, &app);
+ h2 = GNUNET_MESH_connect (d2->cfg, (void *) 2L, &incoming_tunnel,
+ &tunnel_cleaner, handlers, &app);
+ if (test == MULTICAST)
+ {
+ h3 = GNUNET_MESH_connect (d3->cfg, (void *) 3L, &incoming_tunnel,
+ &tunnel_cleaner, handlers, &app);
+ }
+ t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
+ peers_in_tunnel = 0;
+ test_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1), &do_test,
+ NULL);
}
+
/**
* peergroup_ready: start test when all peers are connected
* @param cls closure
{
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;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "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,
+ "Peer Group started successfully!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "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;
GNUNET_free (buf);
}
peers_running = GNUNET_TESTING_daemons_running (pg);
+ for (i = 0; i < num_peers; i++)
+ {
+ GNUNET_PEER_Id peer_id;
+
+ d1 = GNUNET_TESTING_daemon_get (pg, i);
+ peer_id = GNUNET_PEER_intern (&d1->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %u: %s\n",
+ peer_id, GNUNET_i2s (&d1->id));
+ }
+ d1 = GNUNET_TESTING_daemon_get (pg, 0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer looking: %s\n",
+ GNUNET_i2s (&d1->id));
+ pid1 = GNUNET_PEER_intern (&d1->id);
- GNUNET_SCHEDULER_add_now (&connect_mesh, NULL);
+ GNUNET_SCHEDULER_add_now (&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);
}
struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg)
{
if (emsg == NULL)
+ {
total_connections++;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Problem with new connection (%s)\n",
+ emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " (%s)\n", GNUNET_i2s (first));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " (%s)\n", GNUNET_i2s (second));
+ }
+
}
{
char *temp_str;
struct GNUNET_TESTING_Host *hosts;
+ char *data_filename;
- ok = 1;
+ ok = 0;
testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_log_setup ("test_mesh_small",
NULL);
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
- GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting daemons.\n");
+ GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing_old",
"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",
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing_old",
"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;
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
- "topology_output_file",
- &topology_file))
+ GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
+ "WAIT_TIME", &wait_time))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:topology_output_file is required!\n");
+ "Option test_mesh_small:wait_time is required!\n");
return;
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
- "data_output_file",
- &data_filename))
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing_old",
+ "topology_output_file",
+ &topology_file))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:data_output_file is required!\n");
+ "Option test_mesh_small:topology_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)
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
+ "data_output_file",
+ &data_filename))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
- data_filename);
- GNUNET_free (data_filename);
+ 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);
+ }
}
if (GNUNET_YES ==
hosts);
GNUNET_assert (pg != NULL);
shutdown_handle =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_get_forever (),
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task, NULL);
}
int
main (int argc, char *argv[])
{
- GNUNET_PROGRAM_run (argc, argv, "test_mesh_small",
+ char * argv2[] = {
+ argv[0],
+ "-c",
+ "test_mesh_small.conf",
+#if VERBOSE
+ "-L",
+ "DEBUG",
+#endif
+ NULL
+ };
+ int argc2 = (sizeof (argv2) / sizeof (char *)) - 1;
+
+ /* Each peer is supposed to generate the following callbacks:
+ * 1 incoming tunnel (@dest)
+ * 1 connected peer (@orig)
+ * 1 received data packet (@dest)
+ * 1 received data packet (@orig)
+ * 1 received tunnel destroy (@dest)
+ * _________________________________
+ * 5 x ok expected per peer
+ */
+ int ok_goal;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
+ if (strstr (argv[0], "test_mesh_small_unicast") != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "UNICAST\n");
+ test = UNICAST;
+ ok_goal = 5;
+ }
+ else if (strstr (argv[0], "test_mesh_small_multicast") != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MULTICAST\n");
+ test = MULTICAST;
+ ok_goal = 10;
+ }
+ else if (strstr (argv[0], "test_mesh_small_speed_ack") != NULL)
+ {
+ /* Each peer is supposed to generate the following callbacks:
+ * 1 incoming tunnel (@dest)
+ * 1 connected peer (@orig)
+ * 1000 received data packet (@dest)
+ * 1000 received data packet (@orig)
+ * 1 received tunnel destroy (@dest)
+ * _________________________________
+ * 5 x ok expected per peer
+ */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n");
+ test = SPEED_ACK;
+ ok_goal = 2003;
+ argv2 [3] = NULL; // remove -L DEBUG
+#if VERBOSE
+ argc2 -= 2;
+#endif
+ }
+ else if (strstr (argv[0], "test_mesh_small_speed") != NULL)
+ {
+ /* Each peer is supposed to generate the following callbacks:
+ * 1 incoming tunnel (@dest)
+ * 1 connected peer (@orig)
+ * 1000 received data packet (@dest)
+ * 1received data packet (@orig)
+ * 1 received tunnel destroy (@dest)
+ * _________________________________
+ */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
+ test = SPEED;
+ ok_goal = 1004;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "UNKNOWN\n");
+ test = SETUP;
+ ok_goal = 0;
+ }
+
+ GNUNET_PROGRAM_run (argc2, 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,
+ "FAILED! (%d/%d)\n", ok, ok_goal);
+ return 1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "success\n");
+ return 0;
}
/* end of test_mesh_small.c */
projects / oweals / gnunet.git / blobdiff