*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define TEST_MESSAGE_SIZE 2600
-
-
static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
static int messages_recv;
static struct GNUNET_TIME_Relative dur_delayed;
-static size_t
-get_size (unsigned int cnt_down)
+static void
+do_free (void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
+
+ GNUNET_free (sc);
+}
+
+
+static void
+delayed_transmit (void *cls)
{
- return TEST_MESSAGE_SIZE;
+ struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
+
+ start_delayed = GNUNET_TIME_absolute_get ();
+ GNUNET_TRANSPORT_TESTING_large_send (sc);
}
static void
sendtask (void *cls)
{
+ struct GNUNET_TRANSPORT_TESTING_SendClosure *sc;
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Properties prop;
- struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
- .num_messages = 1,
- .get_size_cb = &get_size,
- .ccc = ccc
- };
+ sc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_SendClosure);
+ sc->num_messages = 1;
+ sc->ccc = ccc;
+ sc->cont = &do_free;
+ sc->cont_cls = sc;
if (0 == messages_recv)
{
start_normal = GNUNET_TIME_absolute_get ();
}
if (1 == messages_recv)
{
- memset (&prop, 0, sizeof (prop));
+ memset (&prop,
+ 0,
+ sizeof (prop));
delay = GNUNET_TIME_UNIT_SECONDS;
- GNUNET_TRANSPORT_set_traffic_metric (ccc->p[1]->th,
- &ccc->p[0]->id,
- &prop,
- GNUNET_TIME_UNIT_ZERO,
- delay);
- prop.distance = 10;
- GNUNET_TRANSPORT_set_traffic_metric (ccc->p[0]->th,
- &ccc->p[1]->id,
- &prop,
- delay,
- delay);
- start_delayed = GNUNET_TIME_absolute_get();
+ GNUNET_TRANSPORT_manipulation_set (ccc->p[0]->tmh,
+ &ccc->p[1]->id,
+ &prop,
+ GNUNET_TIME_UNIT_ZERO,
+ delay);
+ /* wait 1s to allow manipulation to go into effect */
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &delayed_transmit,
+ sc);
+ return;
}
- GNUNET_TRANSPORT_TESTING_simple_send (&sc);
+ GNUNET_TRANSPORT_TESTING_large_send (sc);
}
notify_receive (void *cls,
struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
{
{
char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
"Peer %u (`%s') received message of type %d and size %u size from peer %s)!\n",
receiver->no,
ps,
- ntohs (message->type),
- ntohs (message->size),
+ ntohs (message->header.type),
+ ntohs (message->header.size),
GNUNET_i2s (sender));
GNUNET_free (ps);
}
- if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->type)) &&
- (TEST_MESSAGE_SIZE == ntohs (message->size)) )
- {
- if (GNUNET_NO == ccc->global_ret)
- ccc->global_ret = GNUNET_OK;
- }
- else
+ if ( (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->header.type)) ||
+ (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (message->header.size)) )
{
GNUNET_break (0);
ccc->global_ret = GNUNET_SYSERR;
if (0 == messages_recv)
{
/* Received non-delayed message */
- dur_normal = GNUNET_TIME_absolute_get_duration(start_normal);
+ dur_normal = GNUNET_TIME_absolute_get_duration (start_normal);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received non-delayed message %u after %s\n",
messages_recv,
GNUNET_YES));
GNUNET_SCHEDULER_add_now (&sendtask,
NULL);
+ messages_recv++;
+ return;
}
- if (1 == messages_recv)
+ /* Received manipulated message */
+ dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received delayed message %u after %s\n",
+ messages_recv,
+ GNUNET_STRINGS_relative_time_to_string (dur_delayed,
+ GNUNET_YES));
+ if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us)
{
- /* Received manipulated message */
- dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received delayed message %u after %s\n",
- messages_recv,
- GNUNET_STRINGS_relative_time_to_string (dur_delayed,
- GNUNET_YES));
- if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us)
- {
- GNUNET_break (0);
- ccc->global_ret = GNUNET_SYSERR;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Delayed message was not delayed correctly: took only %s\n",
- GNUNET_STRINGS_relative_time_to_string (dur_delayed,
- GNUNET_YES));
- }
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_break (0);
+ ccc->global_ret = GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Delayed message was not delayed correctly: took only %s\n",
+ GNUNET_STRINGS_relative_time_to_string (dur_delayed,
+ GNUNET_YES));
+ }
+ else
+ {
+ ccc->global_ret = GNUNET_OK;
}
- messages_recv++;
+ GNUNET_SCHEDULER_shutdown ();
}