at least compiling fix

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

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 5bd3f0237b3906609942ffa7507f34252b745a83..3ea5706d1a8abb8c2ad500812b17c0ef38ff5bc3 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -68,12 +68,12 @@ report ()
 
   delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
   datarate = (total_bytes_recv * 1000 * 1000) / delta;
-  
+
   FPRINTF (stderr,
            "Throughput was %llu b/s\n",
            datarate);
   ccc->global_ret = GNUNET_OK;
-  if (datarate > 1.1 * quota_in[1])
+  if (datarate > 1.5 * quota_in[1])
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Datarate of %llu b/s significantly higher than allowed inbound quota of %llu b/s\n",
@@ -81,7 +81,7 @@ report ()
                 quota_in[1]);
     ccc->global_ret = GNUNET_SYSERR;
   }
-  if (datarate > 1.1 * quota_out[0])
+  if (datarate > 1.5 * quota_out[0])
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Datarate of %llu b/s significantly higher than allowed outbound quota of %llu b/s\n",
@@ -127,14 +127,12 @@ 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 *hdr)
 {
-  const struct GNUNET_TRANSPORT_TESTING_TestMessage *hdr;
 
-  hdr = (const struct GNUNET_TRANSPORT_TESTING_TestMessage *) message;
-  if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->type))
+  if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (hdr->header.type))
     return;
-  total_bytes_recv += ntohs (message->size);
+  total_bytes_recv += ntohs (hdr->header.size);
 
   {
     char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
@@ -144,7 +142,7 @@ notify_receive (void *cls,
                 receiver->no,
                 ps,
                 ntohl (hdr->num),
-                ntohs (message->size),
+                ntohs (hdr->header.size),
                 GNUNET_i2s (sender));
     GNUNET_free (ps);
   }
@@ -307,11 +305,11 @@ main (int argc,
   }
   for (unsigned int i=0;i<2;i++)
   {
-    if ( (NULL != gen_cfgs[0]) &&
-         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[0])) )
+    if ( (NULL != gen_cfgs[i]) &&
+         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[i])) )
     {
-      GNUNET_DISK_directory_remove (gen_cfgs[0]);
-      GNUNET_free (gen_cfgs[0]);
+      GNUNET_DISK_directory_remove (gen_cfgs[i]);
+      GNUNET_free (gen_cfgs[i]);
     }
   }
   return 0;