*/
#include "platform.h"
#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
+#include "gnunet_mesh_service.h"
#define VERBOSE GNUNET_YES
#define REMOVE_DIR GNUNET_YES
/**
* Time to wait for stuff that should be rather fast
*/
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* DIFFERENT TESTS TO RUN
static char *topology_file;
-static char *data_filename;
-
static struct GNUNET_TESTING_Daemon *d1;
static GNUNET_PEER_Id pid1;
do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: test_task\n");
- GNUNET_MESH_peer_request_connect_add(t, &d2->id);
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 30s\n");
if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
{
GNUNET_SCHEDULER_cancel (disconnect_task);
if (p1 == pid1)
{
p2 = GNUNET_PEER_search(second);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
+ 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",
if (p1 == pid1)
{
p2 = GNUNET_PEER_search(first);
- GNUNET_assert(p2 < num_peers);
- GNUNET_assert(p2 > 0);
+ 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",
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,
"***************** test: %u: %s\n",
- GNUNET_PEER_intern(&d1->id),
+ peer_id,
GNUNET_i2s (&d1->id));
}
d1 = GNUNET_TESTING_daemon_get (pg, 0);
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));
}
}
char *temp_str;
unsigned long long temp_wait;
struct GNUNET_TESTING_Host *hosts;
+ char *data_filename;
ok = 0;
testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
return;
}
- mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
+ mesh_peers = GNUNET_malloc (sizeof(uint16_t) * (num_peers + 1));
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
return;
}
- if (GNUNET_OK !=
+ if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
"data_output_file",
&data_filename))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_mesh_small:data_output_file is required!\n");
- return;
- }
-
- data_file =
+ 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 (data_file == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
+ data_filename);
+ GNUNET_free (data_filename);
+ }
}
wait_time =
#endif
NULL
};
+
+ /* 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");