*
* @brief Test for the mesh service: retransmission of traffic.
*/
+#include <stdio.h>
#include "platform.h"
#include "gnunet_testing_lib.h"
#include "gnunet_mesh_service.h"
+#include <gauger.h>
+
-#define VERBOSE GNUNET_YES
#define REMOVE_DIR GNUNET_YES
struct MeshPeer
struct GNUNET_MESH_Handle *mesh_handle;
};
-
-struct StatsContext
-{
- unsigned long long total_mesh_bytes;
-};
-
+/**
+ * How namy messages to send
+ */
+#define TOTAL_PACKETS 1000
/**
* How long until we give up on connecting the peers?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
/**
* Time to wait for stuff that should be rather fast
*/
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
/**
* DIFFERENT TESTS TO RUN
#define MULTICAST 2
#define SPEED 3
#define SPEED_ACK 4
+#define SPEED_MIN 5
+#define SPEED_NOBUF 6
/**
* Which test are we running?
*/
static int test;
+/**
+ * String with test name
+ */
+char *test_name;
+
+/**
+ * Flag to send traffic leaf->root in speed tests to test BCK_ACK logic.
+ */
+static int test_backwards = GNUNET_NO;
+
/**
* How many events have happened
*/
static int ok;
+ /**
+ * 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;
+
+
+/**
+ * Size of each test packet
+ */
+size_t size_payload = sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t);
+
+/**
+ * Is the setup initialized?
+ */
+static int initialized;
+
+/**
+ * Peers that have been connected
+ */
static int peers_in_tunnel;
+/**
+ * Peers that have responded
+ */
static int peers_responded;
+/**
+ * Number of payload packes sent
+ */
static int data_sent;
+/**
+ * Number of payload packets received
+ */
static int data_received;
+/**
+ * Number of payload packed explicitly (app level) acknowledged
+ */
static int data_ack;
/**
static struct GNUNET_DISK_FileHandle *data_file;
/**
- * How many data points to capture before triggering next round?
+ * Wait time
*/
static struct GNUNET_TIME_Relative wait_time;
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
+/**
+ * Filename of the file containing the topology.
+ */
static char *topology_file;
+/**
+ * Testbed handle for the root peer
+ */
static struct GNUNET_TESTING_Daemon *d1;
-static GNUNET_PEER_Id pid1;
-
+/**
+ * Testbed handle for the first leaf peer
+ */
static struct GNUNET_TESTING_Daemon *d2;
+/**
+ * Testbed handle for the second leaf peer
+ */
static struct GNUNET_TESTING_Daemon *d3;
+/**
+ * Mesh handle for the root peer
+ */
static struct GNUNET_MESH_Handle *h1;
+/**
+ * Mesh handle for the first leaf peer
+ */
static struct GNUNET_MESH_Handle *h2;
+/**
+ * Mesh handle for the second leaf peer
+ */
static struct GNUNET_MESH_Handle *h3;
+/**
+ * Tunnel handle for the root peer
+ */
static struct GNUNET_MESH_Tunnel *t;
+/**
+ * Tunnel handle for the first leaf peer
+ */
static struct GNUNET_MESH_Tunnel *incoming_t;
+/**
+ * Tunnel handle for the second leaf peer
+ */
static struct GNUNET_MESH_Tunnel *incoming_t2;
+/**
+ * Time we started the data transmission (after tunnel has been established
+ * and initilized).
+ */
static struct GNUNET_TIME_Absolute start_time;
-static struct GNUNET_TIME_Absolute end_time;
+/**
+ * Show the results of the test (banwidth acheived) and log them to GAUGER
+ */
+static void
+show_end_data (void)
+{
+ static struct GNUNET_TIME_Absolute end_time;
+ static struct GNUNET_TIME_Relative total_time;
+
+ end_time = GNUNET_TIME_absolute_get();
+ total_time = GNUNET_TIME_absolute_get_difference(start_time, end_time);
+ FPRINTF (stderr, "\nResults of test \"%s\"\n", test_name);
+ FPRINTF (stderr, "Test time %llu ms\n",
+ (unsigned long long) total_time.rel_value);
+ FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
+ 4 * TOTAL_PACKETS * 1.0 / total_time.rel_value); // 4bytes * ms
+ FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
+ TOTAL_PACKETS * 1000.0 / total_time.rel_value); // packets * ms
+ GAUGER ("MESH", test_name,
+ TOTAL_PACKETS * 1000.0 / total_time.rel_value,
+ "packets/s");
+}
-static uint16_t *mesh_peers;
/**
* Check whether peers successfully shut down.
+ *
+ * @param cls Closure (unused).
+ * @param emsg Error message.
*/
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
+ "Shutdown of peers failed!\n");
ok--;
}
else
{
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: All peers successfully shut down!\n");
-#endif
+ "All peers successfully shut down!\n");
}
+ GNUNET_CONFIGURATION_destroy (testing_cfg);
}
/**
* Shut down peergroup, clean up.
+ *
+ * @param cls Closure (unused).
+ * @param tc Task Context.
*/
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
-
+ "Ending test.\n");
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.
+ *
+ * @param cls Closure (unused).
+ * @param tc Task Context.
*/
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");
+ "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);
}
}
-size_t
+
+/**
+ * Transmit ready callback.
+ *
+ * @param cls Closure (message type).
+ * @param size Size of the tranmist buffer.
+ * @param buf Pointer to the beginning of the buffer.
+ *
+ * @return Number of bytes written to buf.
+ */
+static size_t
tmt_rdy (void *cls, size_t size, void *buf);
+
+/**
+ * Task to schedule a new data transmission.
+ *
+ * @param cls Closure (peer #).
+ * @param tc Task Context.
+ */
static void
data_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_MESH_TransmitHandle *th;
+ struct GNUNET_MESH_Tunnel *tunnel;
+ struct GNUNET_PeerIdentity *destination;
+
if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
return;
- th = GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, &d2->id,
- sizeof (struct GNUNET_MessageHeader),
- &tmt_rdy, (void *) 1L);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data task\n");
+ if (GNUNET_YES == test_backwards)
+ {
+ tunnel = incoming_t;
+ destination = &d1->id;
+ }
+ else
+ {
+ tunnel = t;
+ destination = &d2->id;
+ }
+ th = GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ destination,
+ size_payload,
+ &tmt_rdy, (void *) 1L);
if (NULL == th)
{
unsigned long i = (unsigned long) cls;
}
}
+
/**
* Transmit ready callback
*
- * @param cls Closure.
+ * @param cls Closure (message type).
* @param size Size of the buffer we have.
* @param buf Buffer to copy data to.
*/
tmt_rdy (void *cls, size_t size, void *buf)
{
struct GNUNET_MessageHeader *msg = buf;
+ uint32_t *data;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: tmt_rdy called\n");
- if (size < sizeof (struct GNUNET_MessageHeader) || NULL == buf)
+ " tmt_rdy called\n");
+ if (size < size_payload || NULL == buf)
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "size %u, buf %p, data_sent %u, data_received %u\n",
+ size,
+ buf,
+ data_sent,
+ data_received);
return 0;
- msg->size = htons (sizeof (struct GNUNET_MessageHeader));
+ }
+ msg->size = htons (size);
msg->type = htons ((long) cls);
- if (test == SPEED)
+ data = (uint32_t *) &msg[1];
+ *data = htonl (data_sent);
+ if (SPEED == test && GNUNET_YES == initialized)
{
data_sent++;
- if (data_sent < 1000)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " Sent packet %d\n", data_sent);
+ if (data_sent < TOTAL_PACKETS)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Scheduling %d packet\n", data_sent);
+ " Scheduling packet %d\n", data_sent + 1);
GNUNET_SCHEDULER_add_now(&data_task, NULL);
}
}
- return sizeof (struct GNUNET_MessageHeader);
+ return size_payload;
}
const struct GNUNET_ATS_Information *atsi)
{
long client = (long) cls;
+ long expected_target_client;
+ uint32_t *data;
- switch (client)
+ ok++;
+
+ if ((ok % 20) == 0)
{
- case 1L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Origin client got a response!\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);
+ GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
+ NULL);
}
+ }
+
+ switch (client)
+ {
+ case 1L:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n");
+ peers_responded++;
if (test == MULTICAST && peers_responded < 2)
return GNUNET_OK;
- if (test == SPEED_ACK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: received ack %u\n", data_ack);
- GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, sender,
- sizeof (struct GNUNET_MessageHeader),
- &tmt_rdy, (void *) 1L);
- if (data_ack < 1000)
- return GNUNET_OK;
- end_time = GNUNET_TIME_absolute_get();
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test time %u ms\n",
- GNUNET_TIME_absolute_get_difference(start_time, end_time).rel_value);
- }
- GNUNET_MESH_tunnel_destroy (tunnel);
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
- {
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task =
- GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
- NULL);
- }
break;
case 2L:
case 3L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Destination client %u got a message.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Leaf client %li got a message.\n",
client);
- ok++;
- if (SPEED != test)
+ client = 2L;
+ break;
+ default:
+ GNUNET_assert (0);
+ break;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: (%d/%d)\n", ok, ok_goal);
+ data = (uint32_t *) &message[1];
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " payload: (%u)\n", ntohl (*data));
+ if (SPEED == test && GNUNET_YES == test_backwards)
+ {
+ expected_target_client = 1L;
+ }
+ else
+ {
+ expected_target_client = 2L;
+ }
+
+ if (GNUNET_NO == initialized)
+ {
+ initialized = GNUNET_YES;
+ start_time = GNUNET_TIME_absolute_get ();
+ if (SPEED == test)
{
- GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO, 0,
+ GNUNET_assert (2L == client);
+ GNUNET_SCHEDULER_add_now (&data_task, NULL);
+ return GNUNET_OK;
+ }
+ }
+
+ if (client == expected_target_client) // Normally 2 or 3
+ {
+ data_received++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ " received data %u\n", data_received);
+ if (SPEED != test || (ok_goal - 2) == ok)
+ {
+ GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL, sender,
- sizeof (struct GNUNET_MessageHeader),
+ size_payload,
&tmt_rdy, (void *) 1L);
+ return GNUNET_OK;
}
else
{
- data_received++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: received data %u\n", data_received);
- if (data_received < 1000)
+ if (data_received < TOTAL_PACKETS)
return GNUNET_OK;
}
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ }
+ else // Normally 1
+ {
+ if (test == SPEED_ACK || test == SPEED)
{
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task =
- GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
- NULL);
+ data_ack++;
+ 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,
+ size_payload,
+ &tmt_rdy, (void *) 1L);
+ if (data_ack < TOTAL_PACKETS && SPEED != test)
+ return GNUNET_OK;
+ if (ok == 2 && SPEED == test)
+ return GNUNET_OK;
+ show_end_data();
}
- break;
- default:
- break;
+ GNUNET_MESH_tunnel_destroy (t);
+ t = NULL;
}
+
+ 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 GNUNET_OK;
}
const struct GNUNET_PeerIdentity *initiator,
const struct GNUNET_ATS_Information *atsi)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Incoming tunnel from %s to peer %d\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Incoming tunnel from %s to peer %d\n",
GNUNET_i2s (initiator), (long) cls);
ok++;
- if ((long) cls == 1L)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ if ((long) cls == 2L)
incoming_t = tunnel;
- else
+ else if ((long) cls == 3L)
incoming_t2 = tunnel;
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Incoming tunnel for unknown client %lu\n", (long) cls);
+ GNUNET_break(0);
+ }
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;
}
{
long i = (long) cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Incoming tunnel disconnected at peer %d\n",
+ 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_DEBUG,
- "***************** test: Unknown peer! %d\n", i);
+ 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;
dh (void *cls, const struct GNUNET_PeerIdentity *peer)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: peer %s disconnected\n",
+ "peer %s disconnected\n",
GNUNET_i2s (peer));
return;
}
{
struct GNUNET_PeerIdentity *dest;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: peer %s connected\n", GNUNET_i2s (peer));
+ 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)
+ case UNICAST:
+ case SPEED:
+ case SPEED_ACK:
+ // incoming_t is NULL unless we send a relevant data packet
+ dest = &d2->id;
+ break;
+ case MULTICAST:
+ peers_in_tunnel++;
+ if (peers_in_tunnel < 2)
+ return;
+ dest = NULL;
+ break;
+ default:
+ GNUNET_assert (0);
return;
- dest = NULL;
- break;
- default:
- return;
}
if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
{
disconnect_task =
GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Sending data...\n");
+ "Sending data initializer...\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, 0,
+ GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL, dest,
- sizeof (struct GNUNET_MessageHeader),
+ size_payload,
&tmt_rdy, (void *) 1L);
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Disconnect already run?\n");
+ "Disconnect already run?\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Aborting...\n");
+ "Aborting...\n");
}
return;
}
+/**
+ * START THE TESTCASE ITSELF, AS WE ARE CONNECTED TO THE MESH SERVICES.
+ *
+ * Testcase continues when the root receives confirmation of connected peers,
+ * on callback funtion ch.
+ *
+ * @param cls Closure (unsued).
+ * @param tc Task Context.
+ */
static void
do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: test_task\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
+ GNUNET_MESH_peer_request_connect_add (t, &d2->id);
+
if (test == MULTICAST)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: add peer 3\n");
+ "add peer 3\n");
GNUNET_MESH_peer_request_connect_add (t, &d3->id);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: add peer 2\n");
- GNUNET_MESH_peer_request_connect_add (t, &d2->id);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: schedule timeout in 90s\n");
+ "schedule timeout in TIMEOUT\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);
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &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);
- if (p2 == 0 || p2 > num_peers)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "***************** test: %s is UNKNOWN!? (%u)\n",
- GNUNET_i2s (second), p2);
- return;
- }
- 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);
- if (p2 == 0 || p2 > num_peers)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "***************** test: %s is UNKNOWN!? (%u)\n",
- GNUNET_i2s (first), p2);
- return;
- }
- 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
*
+ * @param cls Closure (unsued).
+ * @param tc Task Context.
*/
static void
connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_MESH_ApplicationType app;
- unsigned int i;
- struct GNUNET_PeerIdentity id;
+
+ if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+ return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: connect_mesh_service\n");
+ "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);
+ d2 = GNUNET_TESTING_daemon_get (pg, num_peers - 1);
if (test == MULTICAST)
{
- for (i++; 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);
- d3 = GNUNET_TESTING_daemon_get_by_id (pg, &id);
+ d3 = GNUNET_TESTING_daemon_get (pg, num_peers - 2);
}
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]);
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d1->id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d2->id), i);
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d2->id));
if (test == MULTICAST)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d3->id), i);
+ "connecting to mesh service of peer %s\n",
+ GNUNET_i2s (&d3->id));
}
-#endif
- h1 = GNUNET_MESH_connect (d1->cfg, 5, (void *) 1L, NULL, &tunnel_cleaner,
+ h1 = GNUNET_MESH_connect (d1->cfg, (void *) 1L, NULL, &tunnel_cleaner,
handlers, &app);
- h2 = GNUNET_MESH_connect (d2->cfg, 5, (void *) 2L, &incoming_tunnel,
+ h2 = GNUNET_MESH_connect (d2->cfg, (void *) 2L, &incoming_tunnel,
&tunnel_cleaner, handlers, &app);
if (test == MULTICAST)
{
- h3 = GNUNET_MESH_connect (d3->cfg, 10, (void *) 3L, &incoming_tunnel,
+ 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);
+ if (SPEED_MIN == test)
+ {
+ GNUNET_MESH_tunnel_speed_min(t);
+ test = SPEED;
+ }
+ if (SPEED_NOBUF == test)
+ {
+ GNUNET_MESH_tunnel_buffer(t, GNUNET_NO);
+ test = SPEED;
+ }
peers_in_tunnel = 0;
test_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 6), &do_test,
+ (GNUNET_TIME_UNIT_SECONDS, 1), &do_test,
NULL);
}
/**
* peergroup_ready: start test when all peers are connected
+ *
* @param cls closure
* @param emsg error message
*/
if (emsg != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Peergroup callback called with error, aborting test!\n");
+ "Peergroup callback called with error, aborting test!\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Error from testing: `%s'\n", emsg);
+ "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",
+ "Peer Group started successfully with %u connections\n",
total_connections);
-#endif
-
if (data_file != NULL)
{
buf = NULL;
d1 = GNUNET_TESTING_daemon_get (pg, i);
peer_id = GNUNET_PEER_intern (&d1->id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: %u: %s\n",
+ 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,
- "***************** test: Peer looking: %s\n",
+ "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);
+ GNUNET_SCHEDULER_add_now (&connect_mesh_service, NULL);
disconnect_task =
GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Problem with new connection (%s)\n",
+ "Problem with new connection (%s)\n",
emsg);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: (%s)\n",
- GNUNET_i2s (first));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: (%s)\n",
- GNUNET_i2s (second));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " (%s)\n", GNUNET_i2s (first));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " (%s)\n", GNUNET_i2s (second));
}
}
/**
* 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)
testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_log_setup ("test_mesh_small",
-#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
-
+ "Starting daemons.\n");
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_log (GNUNET_ERROR_TYPE_ERROR,
return;
}
- mesh_peers = GNUNET_malloc (sizeof (uint16_t) * (num_peers + 1));
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
"WAIT_TIME", &wait_time))
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing_old",
"topology_output_file",
&topology_file))
{
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);
}
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, "***************** test: Start\n");
+ initialized = GNUNET_NO;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
if (strstr (argv[0], "test_mesh_small_unicast") != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: UNICAST\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "UNICAST\n");
test = UNICAST;
+ test_name = "unicast";
ok_goal = 5;
}
else if (strstr (argv[0], "test_mesh_small_multicast") != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: MULTICAST\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MULTICAST\n");
test = MULTICAST;
+ test_name = "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)
+ * TOTAL_PACKETS received data packet (@dest)
+ * TOTAL_PACKETS received data packet (@orig)
* 1 received tunnel destroy (@dest)
* _________________________________
* 5 x ok expected per peer
*/
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: SPEED_ACK\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n");
test = SPEED_ACK;
- ok_goal = 2003;
+ test_name = "speed ack";
+ ok_goal = TOTAL_PACKETS * 2 + 3;
argv2 [3] = NULL; // remove -L DEBUG
- argc2 -= 2;
}
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)
+ * 1 initial packet (@dest)
+ * TOTAL_PACKETS received data packet (@dest)
+ * 1 received data packet (@orig)
* 1 received tunnel destroy (@dest)
* _________________________________
- * 5 x ok expected per peer
*/
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: SPEED\n");
- test = SPEED;
- ok_goal = 1003;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
+ ok_goal = TOTAL_PACKETS + 5;
+ if (strstr (argv[0], "_min") != NULL)
+ {
+ test = SPEED_MIN;
+ test_name = "speed min";
+ }
+ else if (strstr (argv[0], "_nobuf") != NULL)
+ {
+ test = SPEED_NOBUF;
+ test_name = "speed nobuf";
+ }
+ else
+ {
+ test = SPEED;
+ test_name = "speed";
+ }
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: UNKNOWN\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "UNKNOWN\n");
test = SETUP;
ok_goal = 0;
}
+ if (strstr (argv[0], "backwards") != NULL)
+ {
+ char *aux;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "BACKWARDS (LEAF TO ROOT)\n");
+ test_backwards = GNUNET_YES;
+ aux = malloc (32); // "leaked"
+ sprintf (aux, "backwards %s", test_name);
+ test_name = aux;
+ }
+
GNUNET_PROGRAM_run (argc2, argv2,
"test_mesh_small",
gettext_noop ("Test mesh in a small network."), options,
#endif
if (ok_goal > ok)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "***************** test: FAILED! (%d/%d)\n", ok, ok_goal);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "FAILED! (%d/%d)\n", ok, ok_goal);
return 1;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: success\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "success\n");
return 0;
}
projects / oweals / gnunet.git / blobdiff