try to fix test failure in src/transport

[oweals/gnunet.git] / src / transport / test_transport_api_manipulation_recv_tcp.c

diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c
index e902aed62d4ab9d5c93461398ac616826b69b906..33f86e8a6c91fc91eba4a47aeb54bb8e6ee6a7e1 100644 (file)
--- a/src/transport/test_transport_api_manipulation_recv_tcp.c
+++ b/src/transport/test_transport_api_manipulation_recv_tcp.c
@@ -59,6 +59,16 @@ do_free (void *cls)
 }
 
 
+static void
+delayed_transmit (void *cls)
+{
+  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
+  
+  start_delayed = GNUNET_TIME_absolute_get ();
+  GNUNET_TRANSPORT_TESTING_large_send (sc);
+}
+
+
 static void
 sendtask (void *cls)
 {
@@ -77,14 +87,23 @@ sendtask (void *cls)
   }
   if (0 < 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,
-                                         delay,
-                                         GNUNET_TIME_UNIT_ZERO);
-    start_delayed = GNUNET_TIME_absolute_get();
+    GNUNET_TRANSPORT_manipulation_set (ccc->p[1]->tmh,
+                                      &ccc->p[0]->id,
+                                      &prop,
+                                      delay,
+                                      GNUNET_TIME_UNIT_ZERO);
+    /* wait 1s to allow manipulation to go into effect */
+    if (1 == messages_recv)
+    {
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                   &delayed_transmit,
+                                   sc);
+      return;
+    }
   }
   GNUNET_TRANSPORT_TESTING_large_send (sc);
 }
@@ -94,7 +113,7 @@ static void
 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));
@@ -103,13 +122,13 @@ notify_receive (void *cls,
                 "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)) ||
-       (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (message->size)) )
+  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;
@@ -117,7 +136,7 @@ notify_receive (void *cls,
     return;
   }
 
-  if (messages_recv <= 1)
+  if (messages_recv <= 2)
   {
     /* Received non-delayed message */
     dur_normal = GNUNET_TIME_absolute_get_duration (start_normal);