* achieve reliable message delivery.
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
#include "gnunet_transport_service.h"
#include "gauger.h"
-#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
-
-#define START_ARM GNUNET_YES
-
/**
* Testcase timeout
*/
uint32_t max_bps_p1;
uint32_t max_bps_p2;
-struct GNUNET_TRANSPORT_TESTING_handle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
/*
* Testcase specific declarations
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static char *test_name;
static int msg_recv;
static int test_connected;
-static int test_failed;
+static int test_sending;
+static int test_send_timeout;
static unsigned long long total_bytes;
*/
#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
#else
#define OKPP do { ok++; } while (0)
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
- fprintf (stderr, "\nThroughput was %llu kb/s\n",
+ FPRINTF (stderr, "\nThroughput was %llu kb/s\n",
total_bytes * 1000 / 1024 / delta);
GNUNET_asprintf (&value_name, "unreliable_%s", test_plugin);
GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta),
th = NULL;
if (cc != NULL)
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
cc = NULL;
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (test_connected == GNUNET_NO)
+ if (test_connected == GNUNET_YES)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
- if (test_failed == GNUNET_NO)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timeout\n");
+ if (test_sending == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Testcase did not send any messages before timeout\n");
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n",
msg_sent, msg_scheduled, msg_recv, msg_recv_expected);
+ if (test_send_timeout == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Test had timeout while waiting to send data\n");
+
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
if (cc != NULL)
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
cc = NULL;
if (p1 != NULL)
unsigned int ret;
ret = (iter * iter * iter);
+
+#ifndef LINUX
+ /* FreeBSD/OSX etc. Unix DGRAMs do not work
+ * with large messages */
+ if (0 == strcmp ("unix", test_plugin))
+ return sizeof (struct TestMessage) + (ret % 1024);
+#endif
return sizeof (struct TestMessage) + (ret % 60000);
}
static void
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
{
static int n;
ntohl (hdr->num), s, ntohs (message->size), ntohl (hdr->num));
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
+ test_sending = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
ntohl (hdr->num), (unsigned char) n);
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
+ test_sending = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
#endif
n++;
set_bit (ntohl (hdr->num));
+ test_sending = GNUNET_YES;
if (0 == (n % (TOTAL_MSGS / 100)))
{
- fprintf (stderr, ".");
+ FPRINTF (stderr, "%s", ".");
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
}
if (n == TOTAL_MSGS)
if (buf == NULL)
{
+ test_send_timeout = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready for msg %u of %u\n",
msg_scheduled, TOTAL_MSGS);
}
else
{
- fprintf (stderr, "\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All messages scheduled to be sent\n");
+ FPRINTF (stderr, "%s", "\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages scheduled to be sent\n");
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
static void
notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n",
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
- char *p1_c = strdup (GNUNET_i2s (&p1->id));
+ char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c,
GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
GNUNET_SCHEDULER_add_now (&sendtask, NULL);
}
-void start_cb (struct PeerContext * p,
- void *cls)
+void
+start_cb (struct PeerContext *p, void *cls)
{
static int started;
+
started++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n",
- p->no,
- GNUNET_i2s (&p->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+ GNUNET_i2s (&p->id));
if (started != 2)
return;
test_connected = GNUNET_NO;
- cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, NULL);
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+ NULL);
}
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+ test_send_timeout = GNUNET_NO;
+
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
- ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect,
- &start_cb,
+ ¬ify_receive, ¬ify_connect,
+ ¬ify_disconnect, &start_cb,
NULL);
p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
- ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect,
- &start_cb,
+ ¬ify_receive, ¬ify_connect,
+ ¬ify_disconnect, &start_cb,
NULL);
static char *const argv[] = { "test-transport-api-unreliability",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
static struct GNUNET_GETOPT_CommandLineOption options[] = {
main (int argc, char *argv[])
{
int ret;
- int nat_res;
-
- tth = GNUNET_TRANSPORT_TESTING_init ();
- GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
- GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
- &test_plugin);
GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
GNUNET_log_setup (test_name,
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
- if ((strcmp (test_plugin, "tcp_nat") == 0) ||
- (strcmp (test_plugin, "udp_nat") == 0))
- {
- nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
- if (GNUNET_NO == nat_res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
- "gnunet-nat-server", "SUID not set");
- return 0;
- }
- if (GNUNET_SYSERR == nat_res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
- "gnunet-nat-server", "file not found");
- return 0;
- }
- }
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+
+ tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
projects / oweals / gnunet.git / blobdiff