#include <gauger.h>
-#define VERBOSE GNUNET_YES
#define REMOVE_DIR GNUNET_YES
struct MeshPeer
/**
* Time to wait for stuff that should be rather fast
*/
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
/**
* DIFFERENT TESTS TO RUN
*/
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
*/
{
if (emsg != NULL)
{
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Shutdown of peers failed!\n");
-#endif
ok--;
}
else
{
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"All peers successfully shut down!\n");
-#endif
}
GNUNET_CONFIGURATION_destroy (testing_cfg);
}
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Ending test.\n");
-#endif
-
if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (disconnect_task);
/**
* Transmit ready callback.
*
- * @param cls Closure (peer #).
+ * @param cls Closure (message type).
* @param size Size of the tranmist buffer.
* @param buf Pointer to the beginning of the buffer.
*
if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
return;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data task\n");
if (GNUNET_YES == test_backwards)
{
tunnel = incoming_t;
th = GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
destination,
- sizeof (struct GNUNET_MessageHeader),
+ size_payload,
&tmt_rdy, (void *) 1L);
if (NULL == th)
{
/**
* 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,
" tmt_rdy called\n");
- if (size < sizeof (struct GNUNET_MessageHeader) || NULL == buf)
+ 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 < TOTAL_PACKETS && ok > 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " Sent packet %d\n", data_sent);
+ if (data_sent < TOTAL_PACKETS)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " 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;
}
{
long client = (long) cls;
long expected_target_client;
-// struct GNUNET_MESH_Tunnel *tunnel_to_use;
-// struct GNUNET_PeerIdentity *dest_to_use;
+ uint32_t *data;
ok++;
+
+ if ((ok % 20) == 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);
+ }
+ }
+
switch (client)
{
case 1L:
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
peers_responded++;
- data_ack++;
if (test == MULTICAST && peers_responded < 2)
return GNUNET_OK;
break;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Leaf client %li got a message.\n",
client);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
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;
-// dest_to_use = &d1->id;
-// tunnel_to_use = incoming_t;
}
else
{
expected_target_client = 2L;
-// dest_to_use = &d2->id;
-// tunnel_to_use = t;
+ }
+
+ if (GNUNET_NO == initialized)
+ {
+ initialized = GNUNET_YES;
+ start_time = GNUNET_TIME_absolute_get ();
+ if (SPEED == test)
+ {
+ 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_INFO,
- " received data %u\n", data_received);
if (data_received < TOTAL_PACKETS)
return GNUNET_OK;
}
{
if (test == SPEED_ACK || test == SPEED)
{
+ 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,
- sizeof (struct GNUNET_MessageHeader),
+ size_payload,
&tmt_rdy, (void *) 1L);
- if (data_ack < TOTAL_PACKETS && test != SPEED)
+ if (data_ack < TOTAL_PACKETS && SPEED != test)
+ return GNUNET_OK;
+ if (ok == 2 && SPEED == test)
return GNUNET_OK;
show_end_data();
}
{
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)
{
disconnect_task =
GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, NULL);
}
+
return NULL;
}
const struct GNUNET_ATS_Information *atsi)
{
struct GNUNET_PeerIdentity *dest;
- struct GNUNET_MESH_Tunnel *tunnel;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"peer %s connected\n", GNUNET_i2s (peer));
case SPEED_ACK:
// incoming_t is NULL unless we send a relevant data packet
dest = &d2->id;
- tunnel = t;
break;
case MULTICAST:
peers_in_tunnel++;
if (peers_in_tunnel < 2)
return;
dest = NULL;
- tunnel = t;
break;
default:
- tunnel = t;
+ GNUNET_assert (0);
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,
- "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 (tunnel, GNUNET_NO,
+ 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
}
+/**
+ * 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_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,
"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 SHORT_TIME\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);
}
}
/**
* 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;
+ if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+ return;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"connect_mesh_service\n");
- d2 = GNUNET_TESTING_daemon_get (pg, 4);
+ d2 = GNUNET_TESTING_daemon_get (pg, num_peers - 1);
if (test == MULTICAST)
{
- d3 = GNUNET_TESTING_daemon_get (pg, 3);
+ d3 = GNUNET_TESTING_daemon_get (pg, num_peers - 2);
}
app = (GNUNET_MESH_ApplicationType) 0;
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"connecting to mesh service of peer %s\n",
GNUNET_i2s (&d1->id));
"connecting to mesh service of peer %s\n",
GNUNET_i2s (&d3->id));
}
-#endif
h1 = GNUNET_MESH_connect (d1->cfg, (void *) 1L, NULL, &tunnel_cleaner,
handlers, &app);
h2 = GNUNET_MESH_connect (d2->cfg, (void *) 2L, &incoming_tunnel,
/**
* peergroup_ready: start test when all peers are connected
+ *
* @param cls closure
* @param emsg error message
*/
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,
- "Peer Group started successfully!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %u connections\n",
+ "Peer Group started successfully with %u connections\n",
total_connections);
-#endif
-
if (data_file != NULL)
{
buf = NULL;
/**
* 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,
"Starting daemons.\n");
- GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing_old",
- "use_progressbars", "YES");
-#endif
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing_old",
"num_peers", &num_peers))
argv[0],
"-c",
"test_mesh_small.conf",
-#if VERBOSE
- "-L",
- "DEBUG",
-#endif
NULL
};
int argc2 = (sizeof (argv2) / sizeof (char *)) - 1;
+ initialized = GNUNET_NO;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
if (strstr (argv[0], "test_mesh_small_unicast") != NULL)
{
test_name = "speed ack";
ok_goal = TOTAL_PACKETS * 2 + 3;
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)
+ * 1 initial packet (@dest)
* TOTAL_PACKETS received data packet (@dest)
* 1 received data packet (@orig)
* 1 received tunnel destroy (@dest)
* _________________________________
*/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
- ok_goal = TOTAL_PACKETS + 4;
+ ok_goal = TOTAL_PACKETS + 5;
if (strstr (argv[0], "_min") != NULL)
{
test = SPEED_MIN;
projects / oweals / gnunet.git / blobdiff