*/
#include <stdio.h>
#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service.h"
+#include "mesh_test_lib.h"
+#include "gnunet_mesh_service_enc.h"
+#include <gauger.h>
-#define VERBOSE GNUNET_NO
-#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 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, 60)
/**
* DIFFERENT TESTS TO RUN
*/
#define SETUP 0
-#define UNICAST 1
-#define MULTICAST 2
+#define FORWARD 1
#define SPEED 3
#define SPEED_ACK 4
+#define SPEED_NOBUF 6
+#define SPEED_REL 8
+#define P2P_SIGNAL 10
/**
* Which test are we running?
static int test;
/**
- * How many events have happened
+ * String with test name
*/
-static int ok;
+char *test_name;
-static int peers_in_tunnel;
+/**
+ * Flag to send traffic leaf->root in speed tests to test BCK_ACK logic.
+ */
+static int test_backwards = GNUNET_NO;
-static int peers_responded;
+/**
+ * How many events have happened
+ */
+static int ok;
-static int data_sent;
+ /**
+ * Each peer is supposed to generate the following callbacks:
+ * 1 incoming channel (@dest)
+ * 1 connected peer (@orig)
+ * 1 received data packet (@dest)
+ * 1 received data packet (@orig)
+ * 1 received channel destroy (@dest)
+ * _________________________________
+ * 5 x ok expected per peer
+ */
+int ok_goal;
-static int data_received;
-static int data_ack;
+/**
+ * Size of each test packet
+ */
+size_t size_payload = sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t);
/**
- * Be verbose
+ * Operation to get peer ids.
*/
-static int verbose;
+struct GNUNET_TESTBED_Operation *t_op[2];
/**
- * Total number of peers in the test.
+ * Peer ids.
*/
-static unsigned long long num_peers;
+struct GNUNET_PeerIdentity *p_id[2];
/**
- * Global configuration file
+ * Peer ids counter.
*/
-static struct GNUNET_CONFIGURATION_Handle *testing_cfg;
+unsigned int p_ids;
/**
- * Total number of currently running peers.
+ * Is the setup initialized?
*/
-static unsigned long long peers_running;
+static int initialized;
/**
- * Total number of connections in the whole network.
+ * Number of payload packes sent
*/
-static unsigned int total_connections;
+static int data_sent;
/**
- * The currently running peer group.
+ * Number of payload packets received
*/
-static struct GNUNET_TESTING_PeerGroup *pg;
+static int data_received;
/**
- * File to report results to.
+ * Number of payload packed explicitly (app level) acknowledged
*/
-static struct GNUNET_DISK_FileHandle *output_file;
+static int data_ack;
/**
- * File to log connection info, statistics to.
+ * Total number of currently running peers.
*/
-static struct GNUNET_DISK_FileHandle *data_file;
+static unsigned long long peers_running;
/**
- * How many data points to capture before triggering next round?
+ * Test context (to shut down).
*/
-static struct GNUNET_TIME_Relative wait_time;
+struct GNUNET_MESH_TEST_Context *test_ctx;
/**
* Task called to disconnect peers.
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
-static char *topology_file;
-
-static struct GNUNET_TESTING_Daemon *d1;
-
-static GNUNET_PEER_Id pid1;
-
-static struct GNUNET_TESTING_Daemon *d2;
-
-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;
-static struct GNUNET_MESH_Handle *h3;
-
-static struct GNUNET_MESH_Tunnel *t;
-
-static struct GNUNET_MESH_Tunnel *incoming_t;
+/**
+ * Channel handle for the root peer
+ */
+static struct GNUNET_MESH_Channel *ch;
-static struct GNUNET_MESH_Tunnel *incoming_t2;
+/**
+ * Channel handle for the dest peer
+ */
+static struct GNUNET_MESH_Channel *incoming_ch;
+/**
+ * Time we started the data transmission (after channel has been established
+ * and initilized).
+ */
static struct GNUNET_TIME_Absolute start_time;
-static struct GNUNET_TIME_Absolute end_time;
-
-static struct GNUNET_TIME_Relative total_time;
-
-
-static uint16_t *mesh_peers;
/**
- * Check whether peers successfully shut down.
+ * Show the results of the test (banwidth acheived) and log them to GAUGER
*/
static void
-shutdown_callback (void *cls, const char *emsg)
+show_end_data (void)
{
- 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 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 %s\n",
+ GNUNET_STRINGS_relative_time_to_string (total_time,
+ GNUNET_YES));
+ FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
+ 4 * TOTAL_PACKETS * 1.0 / (total_time.rel_value_us / 1000)); // 4bytes * ms
+ FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
+ TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000)); // packets * ms
+ GAUGER ("MESH", test_name,
+ TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000),
+ "packets/s");
}
/**
* 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
-
- 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);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
+ shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
}
/**
* 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)
{
+ long line = (long) cls;
+ unsigned int i;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: disconnecting mesh service of peers\n");
+ "disconnecting mesh service of peers, called from line %ld\n",
+ line);
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_MESH_disconnect (h1);
- GNUNET_MESH_disconnect (h2);
- if (test == MULTICAST)
- GNUNET_MESH_disconnect (h3);
+ for (i = 0; i < 2; i++)
+ {
+ GNUNET_TESTBED_operation_done (t_op[i]);
+ }
+ if (NULL != ch)
+ {
+ GNUNET_MESH_channel_destroy (ch);
+ ch = NULL;
+ }
+ if (NULL != incoming_ch)
+ {
+ GNUNET_MESH_channel_destroy (incoming_ch);
+ incoming_ch = NULL;
+ }
+ GNUNET_MESH_TEST_cleanup (test_ctx);
if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)
{
GNUNET_SCHEDULER_cancel (shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
+ shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
-size_t
+
+/**
+ * Abort test: schedule disconnect and shutdown immediately
+ *
+ * @param line Line in the code the abort is requested from (__LINE__).
+ */
+static void
+abort_test (long line)
+{
+ if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+ (void *) line);
+ }
+}
+
+/**
+ * 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_Channel *channel;
+
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)
+ {
+ channel = incoming_ch;
+ }
+ else
+ {
+ channel = ch;
+ }
+ th = GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ 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, filling buffer\n");
+ if (size < size_payload || NULL == buf)
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "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 (GNUNET_NO == initialized)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending initializer\n");
+ }
+ else if (SPEED == test)
{
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);
- GNUNET_SCHEDULER_add_now(&data_task, NULL);
+ " Scheduling packet %d\n", data_sent + 1);
+ GNUNET_SCHEDULER_add_now (&data_task, NULL);
}
}
- return sizeof (struct GNUNET_MessageHeader);
+
+ return size_payload;
}
* 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 channel connection to the other end
+ * @param channel_ctx place to store local state associated with the channel
* @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)
+data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
+ void **channel_ctx,
+ const struct GNUNET_MessageHeader *message)
{
long client = (long) cls;
+ long expected_target_client;
+ uint32_t *data;
- switch (client)
+ ok++;
+
+ GNUNET_MESH_receive_done (channel);
+
+ 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);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
}
- if (test == MULTICAST && peers_responded < 2)
- return GNUNET_OK;
- if (test == SPEED_ACK)
+ }
+
+ switch (client)
+ {
+ case 0L:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n");
+ break;
+ case 4L:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Leaf client %li got a message.\n",
+ client);
+ 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 = 0L;
+ }
+ else
+ {
+ expected_target_client = 4L;
+ }
+
+ if (GNUNET_NO == initialized)
+ {
+ initialized = GNUNET_YES;
+ start_time = GNUNET_TIME_absolute_get ();
+ if (SPEED == test)
{
- 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();
- total_time = GNUNET_TIME_absolute_get_difference(start_time, end_time);
- FPRINTF (stderr, "\nTest time %lu ms\n", total_time.rel_value);
- FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
- 4000.0 / total_time.rel_value);
- FPRINTF (stderr, "Test throughput: %f packets/s\n",
- 1000000.0 / total_time.rel_value);
+ GNUNET_assert (4L == client);
+ GNUNET_SCHEDULER_add_now (&data_task, NULL);
+ return GNUNET_OK;
}
- GNUNET_MESH_tunnel_destroy (tunnel);
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ }
+
+ if (client == expected_target_client) // Normally 4
+ {
+ data_received++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ " received data %u\n", data_received);
+ if (SPEED != test || (ok_goal - 2) == ok)
{
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task =
- GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
- NULL);
+ GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ size_payload, &tmt_rdy, (void *) 1L);
+ return GNUNET_OK;
}
- break;
- case 2L:
- case 3L:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Destination client %u got a message.\n",
- client);
- ok++;
- if (SPEED != test)
+ else
{
- 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_received < TOTAL_PACKETS)
+ return GNUNET_OK;
}
- else
+ }
+ else // Normally 0
+ {
+ if (test == SPEED_ACK || test == SPEED)
{
- data_received++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: received data %u\n", data_received);
- if (data_received < 1000)
+ data_ack++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ " received ack %u\n", data_ack);
+ GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ 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();
}
- if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ if (test == P2P_SIGNAL)
{
- GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task =
- GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers,
- NULL);
+ GNUNET_MESH_channel_destroy (incoming_ch);
+ incoming_ch = NULL;
}
- break;
- default:
- break;
+ else
+ {
+ GNUNET_MESH_channel_destroy (ch);
+ ch = NULL;
+ }
+ }
+
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
}
+
return GNUNET_OK;
}
/**
- * Method called whenever another peer has added us to a tunnel
+ * Method called whenever another peer has added us to a channel
* 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)
+ * @param cls Closure.
+ * @param channel New handle to the channel.
+ * @param initiator Peer that started the channel.
+ * @param port Port this channel is connected to.
+ * @return Initial channel context for the channel
+ * (can be NULL -- that's not an error).
*/
static void *
-incoming_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
+incoming_channel (void *cls, struct GNUNET_MESH_Channel *channel,
const struct GNUNET_PeerIdentity *initiator,
- const struct GNUNET_ATS_Information *atsi)
+ uint32_t port)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Incoming tunnel from %s to peer %d\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Incoming channel from %s to peer %d\n",
GNUNET_i2s (initiator), (long) cls);
ok++;
- if ((long) cls == 1L)
- incoming_t = tunnel;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+ if ((long) cls == 4L)
+ incoming_ch = channel;
else
- incoming_t2 = tunnel;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Incoming channel 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);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
}
+
return NULL;
}
/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
+ * Function called whenever an inbound channel 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
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ * with the channel is stored
*/
static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
+channel_cleaner (void *cls, const struct GNUNET_MESH_Channel *channel,
+ void *channel_ctx)
{
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 channel disconnected at peer %d\n",
i);
- if (2L == i)
- ok++;
- else if (3L == i)
+ if (4L == i)
+ {
ok++;
+ incoming_ch = NULL;
+ }
+ else if (0L == i && P2P_SIGNAL == test)
+ {
+ ok ++;
+ ch = NULL;
+ }
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: Unknown peer! %d\n", i);
- peers_in_tunnel--;
- if (peers_in_tunnel > 0)
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Unknown peer! %d\n", i);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
{
GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers, NULL);
+ disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+ (void *) __LINE__);
}
return;
/**
- * Method called whenever a tunnel falls apart.
+ * START THE TESTCASE ITSELF, AS WE ARE CONNECTED TO THE MESH SERVICES.
*
- * @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.
+ * Testcase continues when the root receives confirmation of connected peers,
+ * on callback funtion ch.
*
- * @param cls closure
- * @param peer peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
+ * @param cls Closure (unsued).
+ * @param tc Task Context.
*/
static void
-ch (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi)
+do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_PeerIdentity *dest;
+ int nobuf;
+ int rel;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: peer %s connected\n", GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
- 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++;
- 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,
- "***************** test: 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, 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");
- if (test == MULTICAST)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: 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);
}
-}
-
-
-/**
- * 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)
+ if (SPEED_NOBUF == test)
{
- 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;
+ test = SPEED;
+ nobuf = GNUNET_YES;
}
-}
-
-/**
- * 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");
+ else
+ nobuf = GNUNET_NO;
- 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);
- if (test == MULTICAST)
+ if (SPEED_REL == test)
{
- 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);
+ test = SPEED;
+ rel = GNUNET_YES;
}
- app = (GNUNET_MESH_ApplicationType) 0;
+ else
+ rel = GNUNET_NO;
+ ch = GNUNET_MESH_channel_create (h1, NULL, p_id[1], 1, nobuf, rel);
-#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]);
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d2->id), i);
- if (test == MULTICAST)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "***************** test: connecting to mesh service of peer %s (%u)\n",
- GNUNET_i2s (&d3->id), i);
- }
-#endif
- h1 = GNUNET_MESH_connect (d1->cfg, 5, (void *) 1L, NULL, &tunnel_cleaner,
- handlers, &app);
- h2 = GNUNET_MESH_connect (d2->cfg, 5, (void *) 2L, &incoming_tunnel,
- &tunnel_cleaner, handlers, &app);
- if (test == MULTICAST)
- {
- h3 = GNUNET_MESH_connect (d3->cfg, 10, (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, 6), &do_test,
- NULL);
+ "Sending data initializer...\n");
+ data_ack = 0;
+ data_received = 0;
+ data_sent = 0;
+ GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ size_payload, &tmt_rdy, (void *) 1L);
}
-
-
/**
- * peergroup_ready: start test when all peers are connected
- * @param cls closure
- * @param emsg error message
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cls the closure from GNUNET_TESTBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed;
+ * NULL if the operation is successfull
*/
static void
-peergroup_ready (void *cls, const char *emsg)
+pi_cb (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ const struct GNUNET_TESTBED_PeerInformation *pinfo,
+ const char *emsg)
{
- char *buf;
- int buf_len;
- unsigned int i;
+ long i = (long) cls;
- 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
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "id callback for %ld\n", i);
- 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++)
+ if (NULL == pinfo || NULL != emsg)
{
- 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, "***************** test: %u: %s\n",
- peer_id, GNUNET_i2s (&d1->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "pi_cb: %s\n", emsg);
+ abort_test (__LINE__);
+ return;
}
- 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);
-
+ p_id[i] = pinfo->result.id;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " id: %s\n", GNUNET_i2s (p_id[i]));
+ p_ids++;
+ if (p_ids < 2)
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got all IDs, starting test\n");
+ test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &do_test, NULL);
}
-
/**
- * Function that will be called whenever two daemons are connected by
- * the testing library.
+ * test main: start test when all peers are 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 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);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: (%s)\n",
- GNUNET_i2s (first));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: (%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)
- * @param cfg configuration handle
+ * @param cls Closure.
+ * @param ctx Argument to give to GNUNET_MESH_TEST_cleanup on test end.
+ * @param num_peers Number of peers that are running.
+ * @param peers Array of peers.
+ * @param meshes Handle to each of the MESHs of the peers.
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+tmain (void *cls,
+ struct GNUNET_MESH_TEST_Context *ctx,
+ unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers,
+ struct GNUNET_MESH_Handle **meshes)
{
- char *temp_str;
- struct GNUNET_TESTING_Host *hosts;
- char *data_filename;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test main\n");
ok = 0;
- 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
-
- 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 (uint16_t) * (num_peers + 1));
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
- "WAIT_TIME", &wait_time))
- {
- 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))
- {
- 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 ==
- 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_ctx = ctx;
+ peers_running = num_peers;
+ h1 = meshes[0];
+ h2 = meshes[num_peers - 1];
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
+ shutdown_handle = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task, NULL);
+ t_op[0] = GNUNET_TESTBED_peer_get_information (peers[0],
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &pi_cb, (void *) 0L);
+ t_op[1] = GNUNET_TESTBED_peer_get_information (peers[num_peers - 1],
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &pi_cb, (void *) 1L);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "requested peer ids\n");
}
-
-/**
- * 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[])
{
- 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, "***************** test: Start\n");
- if (strstr (argv[0], "test_mesh_small_unicast") != NULL)
+ initialized = GNUNET_NO;
+ uint32_t ports[2];
+ const char *config_file;
+
+ GNUNET_log_setup ("test", "DEBUG", NULL);
+ config_file = "test_mesh.conf";
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
+ if (strstr (argv[0], "_small_forward") != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: UNICAST\n");
- test = UNICAST;
- ok_goal = 5;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "FORWARD\n");
+ test = FORWARD;
+ test_name = "unicast";
+ ok_goal = 4;
}
- else if (strstr (argv[0], "test_mesh_small_multicast") != NULL)
+ else if (strstr (argv[0], "_small_signal") != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: MULTICAST\n");
- test = MULTICAST;
- ok_goal = 10;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SIGNAL\n");
+ test = P2P_SIGNAL;
+ test_name = "signal";
+ ok_goal = 4;
}
- else if (strstr (argv[0], "test_mesh_small_speed_ack") != NULL)
+ else if (strstr (argv[0], "_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)
+ * 1 incoming channel (@dest)
+ * TOTAL_PACKETS received data packet (@dest)
+ * TOTAL_PACKETS received data packet (@orig)
+ * 1 received channel 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;
- argv2 [3] = NULL; // remove -L DEBUG
-#if VERBOSE
- argc2 -= 2;
-#endif
+ test_name = "speed ack";
+ ok_goal = TOTAL_PACKETS * 2 + 2;
}
- else if (strstr (argv[0], "test_mesh_small_speed") != NULL)
+ else if (strstr (argv[0], "_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 received tunnel destroy (@dest)
+ * 1 incoming channel (@dest)
+ * 1 initial packet (@dest)
+ * TOTAL_PACKETS received data packet (@dest)
+ * 1 received data packet (@orig)
+ * 1 received channel 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 + 4;
+ if (strstr (argv[0], "_nobuf") != NULL)
+ {
+ test = SPEED_NOBUF;
+ test_name = "speed nobuf";
+ }
+ else if (strstr (argv[0], "_reliable") != NULL)
+ {
+ test = SPEED_REL;
+ test_name = "speed reliable";
+ config_file = "test_mesh_drop.conf";
+ }
+ 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;
}
- 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
+ if (strstr (argv[0], "backwards") != NULL)
+ {
+ char *aux;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "BACKWARDS (LEAF TO ROOT)\n");
+ test_backwards = GNUNET_YES;
+ aux = GNUNET_malloc (32);
+ sprintf (aux, "backwards %s", test_name);
+ test_name = aux;
+ }
+
+ p_ids = 0;
+ ports[0] = 1;
+ ports[1] = 0;
+ GNUNET_MESH_TEST_run ("test_mesh_small",
+ config_file,
+ 5,
+ &tmain,
+ NULL, /* tmain cls */
+ &incoming_channel,
+ &channel_cleaner,
+ handlers,
+ ports);
+
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;
}
/* end of test_mesh_small.c */
+
projects / oweals / gnunet.git / blobdiff