-doxygen

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

diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c
index cdef9921b09989331e841730c3e495823bdb4c16..2b7fdc250548e0e7488bb7e564067e2644fed74f 100644 (file)
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ b/src/transport/test_transport_api_manipulation_send_tcp.c
@@ -18,13 +18,14 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/test_transport_api.c
- * @brief base test case for transport implementations
+ * @file transport/test_transport_api_manipulation_send_tcp.c
+ * @brief base test case for transport traffic manipulation implementation
  *
- * This test case serves as a base for tcp, udp, and udp-nat
- * transport test cases.  Based on the executable being run
- * the correct test case will be performed.  Conservation of
- * C code apparently.
+ * This test case will setup 2 peers and connect them, the first message
+ * will be sent without manipulation, then a send delay of 1 second will
+ * be configured and 1 more message will be sent. Time will be measured.
+ *
+ * In addition the distance on receiver side will be manipulated to be 10
  */
 #include "platform.h"
 #include "gnunet_transport_service.h"
@@ -161,12 +162,10 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 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_MessageHeader *message)
 {
   struct PeerContext *p = cls;
   struct PeerContext *t = NULL;
-  int c;
 
   if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
     t = p1;
@@ -176,7 +175,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
 
   char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
               p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
               GNUNET_i2s (&t->id));
@@ -201,40 +200,31 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
        /* Received non-delayed message */
        dur_normal = GNUNET_TIME_absolute_get_duration(start_normal);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received non-delayed message %u after %llu\n",
+                "Received non-delayed message %u after %s\n",
                 messages_recv,
-                (long long unsigned int) dur_normal.rel_value);
+                GNUNET_STRINGS_relative_time_to_string (dur_normal,
+                                                       GNUNET_YES));
     send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL);
   }
   if (1 == messages_recv)
   {
        /* Received manipulated message */
        dur_delayed = GNUNET_TIME_absolute_get_duration(start_delayed);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Received delayed message %u after %llu\n",
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Received delayed message %u after %s\n",
                   messages_recv,
-                  (long long unsigned int) dur_delayed.rel_value);
-      if (dur_delayed.rel_value < 1000)
+                  GNUNET_STRINGS_relative_time_to_string (dur_delayed,
+                                                         GNUNET_YES));
+      if (dur_delayed.rel_value_us < 1000 * 1000LL)
       {
-                               GNUNET_break (0);
-                               ok += 1;
+       GNUNET_break (0);
+       ok += 1;
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Delayed message was not delayed correctly: took only %llu\n",
-                    (long long unsigned int) dur_delayed.rel_value);
-      }
-      for (c = 0; c < ats_count; c++)
-      {
-       if (ntohl (ats[c].type) == GNUNET_ATS_QUALITY_NET_DISTANCE)
-        {
-                       if (ntohl (ats[c].value) == 10)
-                               ok += 0;
-                       else
-                       {
-                                       GNUNET_break (0);
-                                       ok += 1;
-                       }
-        }
+                    "Delayed message was not delayed correctly: took only %s\n",
+                    GNUNET_STRINGS_relative_time_to_string (dur_delayed,
+                                                           GNUNET_YES));
       }
+
       /* shutdown */
       end ();
   }
@@ -284,7 +274,7 @@ notify_ready (void *cls, size_t size, void *buf)
 static void
 sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_ATS_Information ats[2];
+  struct GNUNET_ATS_Information ats[1];
   send_task = GNUNET_SCHEDULER_NO_TASK;
 
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
@@ -304,11 +294,11 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (1 == messages_recv)
   {
                ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
-               ats[0].value = htonl (1000);
-               ats[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-               ats[1].value = htonl (10);
-
-         GNUNET_TRANSPORT_set_traffic_metric (p2->th, &p1->id, TM_SEND, ats, 2);
+               ats[0].value = htonl (1000LL * 1000LL);
+               GNUNET_TRANSPORT_set_traffic_metric (p2->th, &p1->id, GNUNET_NO, GNUNET_YES, ats, 1);
+               ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+               ats[0].value = htonl (10);
+               GNUNET_TRANSPORT_set_traffic_metric (p1->th, &p2->id, GNUNET_YES, GNUNET_YES, ats, 1);
 
                start_delayed = GNUNET_TIME_absolute_get();
   }
@@ -321,8 +311,7 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   static int c;