GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @file transport/test_transport_api_reliability.c
* @brief base test case for transport implementations
*
- * This test case serves as a base for tcp and http
- * transport test cases to check that the transports
- * achieve reliable message delivery.
+ * This test case serves ensures that messages are reliably sent between peers
+ *
+ * This test sends TOTAL_MSGS with message type MTYPE from peer 1 to peer 2
+ * and ensures that all message were received.
*/
#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_transport_service.h"
-#include "transport.h"
-
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
+#include "gauger.h"
+#include "transport-testing.h"
/**
+ * Total number of messages to send
+ *
* Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
+ * 'MAX_PENDING' in 'gnunet-service-transport_clients.c', otherwise
* messages may be dropped even for a reliable transport.
*/
-#define TOTAL_MSGS (60000 * 20)
+#define TOTAL_MSGS (1024 * 3)
+
+/**
+ * Message type of test messages
+ */
+#define MTYPE 12345
+
+/**
+ * Testcase timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-#define MTYPE 12345
-struct PeerContext
+/**
+ * Struct for the test message
+ */
+GNUNET_NETWORK_STRUCT_BEGIN
+
+struct TestMessage
{
- struct GNUNET_CONFIGURATION_Handle *cfg;
- struct GNUNET_TRANSPORT_Handle *th;
- struct GNUNET_PeerIdentity id;
-#if START_ARM
- pid_t arm_pid;
-#endif
+ struct GNUNET_MessageHeader header;
+ uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
-static struct PeerContext p1;
-static struct PeerContext p2;
+/**
+ * Name of the plugin to test
+ */
+static char *test_plugin;
-static struct GNUNET_SCHEDULER_Handle *sched;
+/**
+ * Name of the test
+ */
+static char *test_name;
+/**
+ * Return value of the test
+ */
static int ok;
-static int is_tcp;
+/**
+ * Context of peer 1
+ */
+struct PeerContext *p1;
+
+/**
+ * Configuration file of peer 1
+ */
+char *cfg_file_p1;
+
+/**
+ * Context of peer 2
+ */
+struct PeerContext *p2;
+
+/**
+ * Configuration file of peer 1
+ */
+char *cfg_file_p2;
-static int is_tcp_nat;
+/**
+ * Timeout task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static int is_http;
+/**
+ * Transport transmit handle used
+ */
+struct GNUNET_TRANSPORT_TransmitHandle *th;
-static int connected;
+/**
+ * Transport testing handle
+ */
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+/*
+ * Total amount of bytes sent
+ */
static unsigned long long total_bytes;
+/**
+ * Time of start
+ */
static struct GNUNET_TIME_Absolute start_time;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+/**
+ * No. of message currently scheduled to be send
+ */
+static int msg_scheduled;
+
+/**
+ * No. of last message sent
+ */
+static int msg_sent;
+
+/**
+ * No. of last message received
+ */
+static int msg_recv;
+
+static int test_connected;
+static int test_sending;
+static int test_send_timeout;
+
+
+/**
+ * Bitmap storing which messages were received
+ */
+
+static char bitmap[TOTAL_MSGS / 8];
+
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
+/*
+ * END Testcase specific declarations
+ */
#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
+static int
+get_bit (const char *map, unsigned int bit);
static void
end ()
{
unsigned long long delta;
+ unsigned long long rate;
+ char *value_name;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
+
+ /* Calculcate statistics */
+ delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
+ rate = (1000LL* 1000ll * total_bytes) / (1024 * delta);
+ FPRINTF (stderr, "\nThroughput was %llu KiBytes/s\n",
+ rate);
+
+ GNUNET_asprintf (&value_name, "unreliable_%s", test_plugin);
+ GAUGER ("TRANSPORT", value_name, (int) rate,
+ "kb/s");
+ GNUNET_free (value_name);
+
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ cc = NULL;
+
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+ GNUNET_TRANSPORT_TESTING_done (tth);
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
-#endif
- GNUNET_TRANSPORT_disconnect (p1.th);
- GNUNET_TRANSPORT_disconnect (p2.th);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transports disconnected, returning success!\n");
-#endif
- delta = GNUNET_TIME_absolute_get_duration (start_time).value;
- fprintf (stderr,
- "\nThroughput was %llu kb/s\n",
- total_bytes * 1000 / 1024 / delta);
ok = 0;
-}
+ int i;
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
- if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- GNUNET_OS_process_wait (p->arm_pid);
-#endif
- GNUNET_CONFIGURATION_destroy (p->cfg);
+ for (i = 0; i < TOTAL_MSGS; i++)
+ {
+ if (get_bit (bitmap, i) == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not receive message %d\n", i);
+ ok = -1;
+ }
+ }
}
-
static void
-end_badly (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly ()
{
- GNUNET_break (0);
- GNUNET_TRANSPORT_disconnect (p1.th);
- GNUNET_TRANSPORT_disconnect (p2.th);
- ok = 1;
-}
-
+ int i;
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
-struct TestMessage
-{
- struct GNUNET_MessageHeader header;
- uint32_t num;
-};
+ 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_sending == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Testcase did not send any messages before timeout\n");
+ if (test_send_timeout == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Test had timeout while waiting to send data\n");
+ for (i = 0; i < TOTAL_MSGS; i++)
+ {
+ if (get_bit (bitmap, i) == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not receive message %d\n", i);
+ ok = -1;
+ }
+ }
+
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
+
+ if (cc != NULL)
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ cc = NULL;
+
+ if (p1 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ if (p2 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ GNUNET_TRANSPORT_TESTING_done (tth);
+ ok = GNUNET_SYSERR;
+}
static unsigned int
{
unsigned int ret;
- if (iter < 60000)
- return iter + sizeof (struct TestMessage);
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);
}
+/**
+ * Sets a bit active in the bitmap.
+ *
+ * @param bitIdx which bit to set
+ * @return GNUNET_SYSERR on error, GNUNET_OK on success
+ */
+static int
+set_bit (unsigned int bitIdx)
+{
+ size_t arraySlot;
+ unsigned int targetBit;
+
+ if (bitIdx >= sizeof (bitmap) * 8)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "tried to set bit %d of %d(!?!?)\n",
+ bitIdx, sizeof (bitmap) * 8);
+ return GNUNET_SYSERR;
+ }
+ arraySlot = bitIdx / 8;
+ targetBit = (1L << (bitIdx % 8));
+ bitmap[arraySlot] |= targetBit;
+ return GNUNET_OK;
+}
+
+/**
+ * Obtain a bit from bitmap.
+ * @param map the bitmap
+ * @param bit index from bitmap
+ *
+ * @return Bit \a bit from hashcode \a code
+ */
+static int
+get_bit (const char *map, unsigned int bit)
+{
+ if (bit > TOTAL_MSGS)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "get bit %d of %d(!?!?)\n", bit,
+ sizeof (bitmap) * 8);
+ return 0;
+ }
+ return ((map)[bit >> 3] & (1 << (bit & 7))) > 0;
+}
+
+
static void
-notify_receive (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
static int n;
+
unsigned int s;
char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct TestMessage *hdr;
- hdr = (const struct TestMessage*) message;
- s = get_size (n);
+ hdr = (const struct TestMessage *) message;
+
if (MTYPE != ntohs (message->type))
return;
+ msg_recv = ntohl (hdr->num);
+ s = get_size (ntohl (hdr->num));
+
if (ntohs (message->size) != s)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
- if (ntohl (hdr->num) != n)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
- memset (cbuf, n, s - sizeof (struct TestMessage));
- if (0 != memcmp (cbuf,
- &hdr[1],
- s - sizeof (struct TestMessage)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u with bits %u, but body did not match\n",
- n, (unsigned char) n);
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Expected message %u of size %u, got %u bytes of message %u\n",
+ ntohl (hdr->num), s, ntohs (message->size), ntohl (hdr->num));
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ test_sending = GNUNET_YES;
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+
+ memset (cbuf, ntohl (hdr->num), s - sizeof (struct TestMessage));
+ if (0 != memcmp (cbuf, &hdr[1], s - sizeof (struct TestMessage)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Expected message %u with bits %u, but body did not match\n",
+ ntohl (hdr->num), (unsigned char) n);
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ test_sending = GNUNET_YES;
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
#if VERBOSE
- if (ntohl(hdr->num) % 5000 == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got message %u of size %u\n",
- ntohl (hdr->num),
- ntohs (message->size));
- }
+ if (ntohl (hdr->num) % 5 == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
+ ntohl (hdr->num), ntohs (message->size));
+ }
#endif
n++;
- if (0 == (n % (TOTAL_MSGS/100)))
- {
- fprintf (stderr, ".");
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly,
- NULL);
- }
+ if (GNUNET_SYSERR == set_bit (ntohl (hdr->num)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Message id %u is bigger than maxmimum number of messages %u expected\n"),
+ ntohl (hdr->num), TOTAL_MSGS);
+ }
+ test_sending = GNUNET_YES;
+ if (0 == (n % (TOTAL_MSGS / 100)))
+ {
+ FPRINTF (stderr, "%s", ".");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+ }
if (n == TOTAL_MSGS)
+ {
end ();
+ }
}
unsigned int s;
unsigned int ret;
+ th = NULL;
+
if (buf == NULL)
- {
- GNUNET_break (0);
- ok = 42;
- return 0;
- }
+ {
+ 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);
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ ok = 42;
+ return 0;
+ }
ret = 0;
s = get_size (n);
GNUNET_assert (size >= s);
GNUNET_assert (buf != NULL);
+ GNUNET_assert (n < TOTAL_MSGS);
cbuf = buf;
do
- {
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (n);
- memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
- ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], n, s - sizeof (struct TestMessage));
- ret += s - sizeof (struct TestMessage);
+ {
+ GNUNET_assert (n < TOTAL_MSGS);
+ hdr.header.size = htons (s);
+ hdr.header.type = htons (MTYPE);
+ hdr.num = htonl (n);
+ msg_sent = n;
+ memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
+ ret += sizeof (struct TestMessage);
+ memset (&cbuf[ret], n, s - sizeof (struct TestMessage));
+ ret += s - sizeof (struct TestMessage);
+
#if VERBOSE
- if (n % 5000 == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u\n",
- n,
- s);
- }
-#endif
- n++;
- s = get_size (n);
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
+ if (n % 5000 == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message %u of size %u\n", n,
+ s);
}
- while (size - ret >= s);
+#endif
+ n++;
+ s = get_size (n);
+ if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
+ break; /* sometimes pack buffer full, sometimes not */
+ }
+ while ((size - ret >= s) && (n < TOTAL_MSGS));
if (n < TOTAL_MSGS)
- GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
- &p2.id,
- s, 0, TIMEOUT,
- ¬ify_ready,
- NULL);
+ {
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s,
+ TIMEOUT_TRANSMIT,
+ ¬ify_ready, NULL);
+ msg_scheduled = n;
+ }
+ else
+ {
+ 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);
+ }
if (n % 5000 == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Returning total message block of size %u\n",
- ret);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning total message block of size %u\n", ret);
+ }
total_bytes += ret;
return ret;
}
static void
-notify_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- if (cls == &p1)
- {
- GNUNET_TRANSPORT_set_quota (p1.th,
- &p2.id,
- GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
- GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL, NULL);
- start_time = GNUNET_TIME_absolute_get ();
- connected++;
- }
- else
- {
- GNUNET_TRANSPORT_set_quota (p2.th,
- &p1.id,
- GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
- GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL, NULL);
- connected++;
- }
-
- if (connected == 2)
- {
- GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
- &p2.id,
- get_size (0), 0, TIMEOUT,
- ¬ify_ready,
- NULL);
- }
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n",
+ GNUNET_i2s (peer), cls);
}
static void
notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%4s' disconnected (%p)!\n",
- GNUNET_i2s (peer), cls);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' disconnected (%p)!\n",
+ GNUNET_i2s (peer), cls);
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
}
-
static void
-setup_peer (struct PeerContext *p, const char *cfgname)
+sendtask ()
{
- p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
- p->arm_pid = GNUNET_OS_start_process (NULL, NULL,
- "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE_ARM
- "-L", "DEBUG",
-#endif
- "-c", cfgname, NULL);
-#endif
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- p->th = GNUNET_TRANSPORT_connect (sched, p->cfg,
- p,
- ¬ify_receive,
- ¬ify_connect,
- ¬ify_disconnect);
- GNUNET_assert (p->th != NULL);
+ start_time = GNUNET_TIME_absolute_get ();
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to send %u messages\n",
+ TOTAL_MSGS);
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
+ TIMEOUT_TRANSMIT, ¬ify_ready,
+ NULL);
}
-
static void
-exchange_hello_last (void *cls,
- const struct GNUNET_MessageHeader *message)
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
- struct PeerContext *me = cls;
+ char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Exchanging HELLO with peer (%p)!\n", cls);
-#endif
- GNUNET_assert (ok >= 3);
- OKPP;
- GNUNET_assert (message != NULL);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &me->id));
- /* both HELLOs exchanged, get ready to test transmission! */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finished exchanging HELLOs, now waiting for transmission!\n");
-}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c,
+ GNUNET_i2s (&p2->id));
+ GNUNET_free (p1_c);
+
+ test_connected = GNUNET_YES;
+ cc = NULL;
+ GNUNET_SCHEDULER_add_now (&sendtask, NULL);
+}
static void
-exchange_hello (void *cls,
- const struct GNUNET_MessageHeader *message)
+start_cb (struct PeerContext *p, void *cls)
{
- struct PeerContext *me = cls;
+ static int started;
+ started++;
- GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Exchanging HELLO with peer (%p)!\n", cls);
-#endif
- GNUNET_assert (ok >= 2);
- OKPP;
- GNUNET_assert (message != NULL);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &me->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+ GNUNET_i2s (&p->id));
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received HELLO size %d\n",
- GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message));
-#endif
- GNUNET_TRANSPORT_offer_hello (p2.th, message);
- GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
-}
+ if (started != 2)
+ return;
+ test_connected = GNUNET_NO;
+ cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+ NULL);
+
+}
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- GNUNET_assert (ok == 1);
- OKPP;
- sched = s;
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly,
- NULL);
- if (is_tcp)
- {
- setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
- setup_peer (&p2, "test_transport_api_tcp_peer2.conf");
- }
- else if (is_http)
- {
- setup_peer (&p1, "test_transport_api_http_peer1.conf");
- setup_peer (&p2, "test_transport_api_http_peer2.conf");
- }
- else if (is_tcp_nat)
- {
- setup_peer (&p1, "test_transport_api_tcp_nat_peer1.conf");
- setup_peer (&p2, "test_transport_api_tcp_nat_peer2.conf");
- }
- else
- GNUNET_assert (0);
- GNUNET_assert(p1.th != NULL);
- GNUNET_assert(p2.th != NULL);
- GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
+ 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,
+ NULL);
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+ ¬ify_receive, ¬ify_connect,
+ ¬ify_disconnect, &start_cb,
+ NULL);
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ //die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
}
-static int
-check ()
+int
+main (int argc, char *argv[])
{
- char *const argv[] = { "test-transport-api-reliability",
+ char *test_source;
+ int ret;
+
+ static char *const argv_new[] = { "test-transport-api-reliability",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
- struct GNUNET_GETOPT_CommandLineOption options[] = {
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+ GNUNET_log_setup (test_name,
+ "WARNING",
+ NULL);
+
+ 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);
+
+
+
#if WRITECONFIG
- setTransportOptions("test_transport_api_data.conf");
+ setTransportOptions ("test_transport_api_data.conf");
#endif
- ok = 1;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-transport-api-reliability", "nohelp",
- options, &run, &ok);
- stop_arm (&p1);
- stop_arm (&p2);
- return ok;
-}
+ ok = GNUNET_SYSERR;
+ ret = GNUNET_PROGRAM_run ((sizeof (argv_new) / sizeof (char *)) - 1, argv_new, test_name,
+ "nohelp", options, &run, &ok);
+ if (GNUNET_SYSERR == ret)
+ ok = -1;
-int
-main (int argc, char *argv[])
-{
- int ret;
-#ifdef MINGW
- return GNUNET_SYSERR;
-#endif
- if (strstr(argv[0], "tcp_nat") != NULL)
- {
- is_tcp_nat = GNUNET_YES;
- }
- else if (strstr(argv[0], "tcp") != NULL)
- {
- is_tcp = GNUNET_YES;
- }
- else if (strstr(argv[0], "http") != NULL)
- {
- is_http = GNUNET_YES;
- }
- GNUNET_log_setup ("test-transport-api-reliability",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
- return ret;
+ GNUNET_free (cfg_file_p1);
+ GNUNET_free (cfg_file_p2);
+
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
+
+ return ok;
}
/* end of test_transport_api_reliability.c */