Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 24ad4b81e8f5f00f079a5516f2bf9600f75a57ee..375a935c8c0c3852d1c93a26b9430df7e835dceb 100644 (file)
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -50,6 +50,11 @@
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 450 * FACTOR)
 
+/**
+ * If we are in an "xhdr" test, the factor by which we divide
+ * #TOTAL_MSGS for a more sane test duration.
+ */
+static unsigned int xhdr = 1;
 
 static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
 
@@ -86,7 +91,7 @@ get_size (unsigned int iter)
 #ifndef LINUX
   /* FreeBSD/OSX etc. Unix DGRAMs do not work
    * with large messages */
-  if (0 == strcmp ("unix", test_plugin))
+  if (0 == strcmp ("unix", ccc->test_plugin))
     ret = sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 1024);
 #endif
   ret = sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 60000);
@@ -105,7 +110,7 @@ get_size (unsigned int iter)
 static size_t
 get_size_cnt (unsigned int cnt_down)
 {
-  size_t ret = get_size (TOTAL_MSGS - 1 - cnt_down);
+  size_t ret = get_size (TOTAL_MSGS / xhdr - 1 - cnt_down);
 
   total_bytes += ret;
   return ret;
@@ -189,7 +194,7 @@ custom_shutdown (void *cls)
   }
 
   ok = 0;
-  for (unsigned int i = 0; i < TOTAL_MSGS; i++)
+  for (unsigned int i = 0; i < TOTAL_MSGS / xhdr; i++)
   {
     if (get_bit (bitmap, i) == 0)
     {
@@ -208,28 +213,25 @@ 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)
 {
   static int n;
   unsigned int s;
   char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  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;
   msg_recv = ntohl (hdr->num);
   s = get_size (ntohl (hdr->num));
 
-  if (ntohs (message->size) != s)
+  if (ntohs (hdr->header.size) != s)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Expected message %u of size %u, got %u bytes of message %u\n",
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 s,
-                ntohs (message->size),
-                ntohl (hdr->num));
+                ntohs (hdr->header.size),
+                (uint32_t) ntohl (hdr->num));
     ccc->global_ret = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -245,7 +247,7 @@ notify_receive (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Expected message %u with bits %u, but body did not match\n",
-                ntohl (hdr->num),
+                (uint32_t) ntohl (hdr->num),
                 (unsigned char) ntohl (hdr->num));
     ccc->global_ret = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
@@ -256,8 +258,8 @@ notify_receive (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Got message %u of size %u\n",
-                ntohl (hdr->num),
-                ntohs (message->size));
+                (uint32_t) ntohl (hdr->num),
+                ntohs (hdr->header.size));
   }
 #endif
   n++;
@@ -265,14 +267,14 @@ notify_receive (void *cls,
   {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Message id %u is bigger than maxmimum number of messages %u expected\n",
-                  ntohl (hdr->num),
-                  TOTAL_MSGS);
+                  (uint32_t) ntohl (hdr->num),
+                  TOTAL_MSGS / xhdr);
   }
-  if (0 == (n % (TOTAL_MSGS / 100)))
+  if (0 == (n % (TOTAL_MSGS / xhdr / 100)))
   {
     FPRINTF (stderr, "%s",  ".");
   }
-  if (n == TOTAL_MSGS)
+  if (n == TOTAL_MSGS / xhdr)
   {
     /* end testcase with success */
     ccc->global_ret = GNUNET_OK;
@@ -284,8 +286,10 @@ notify_receive (void *cls,
 int
 main (int argc, char *argv[])
 {
+  if (0 == strstr (argv[0], "xhdr"))
+    xhdr = 30;
   struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = TOTAL_MSGS,
+    .num_messages = TOTAL_MSGS / xhdr,
     .get_size_cb = &get_size_cnt
   };
   struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {