TNG: Actually use faster queue in UDP tests. Tests fail now.

4 files changed, 11 insertions, 2 deletions

diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index 14d1a4792..2e81855d6 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -405,7 +405,8 @@ process_statistics (void *cls,
   {
     ret = 2;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Not enough BOX messages!\n");
+                "Not enough BOX messages! (want: %u, have %llu)\n",
+                6000, value);
     GNUNET_SCHEDULER_shutdown ();
   }
   return GNUNET_OK;
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf b/src/transport/test_communicator_udp_rekey_peer1.conf
index 6bfeafe33..a881a5034 100644
--- a/src/transport/test_communicator_udp_rekey_peer1.conf
+++ b/src/transport/test_communicator_udp_rekey_peer1.conf
@@ -45,6 +45,7 @@ REKEY_INTERVAL = 100ms
 BINDTO = 60002
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000
+# REKEY_INTERVAL = 100ms
 REKEY_MAX_BYTES=9MiB
 
 [communicator-test]
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf b/src/transport/test_communicator_udp_rekey_peer2.conf
index 474ca0c15..b5e128009 100644
--- a/src/transport/test_communicator_udp_rekey_peer2.conf
+++ b/src/transport/test_communicator_udp_rekey_peer2.conf
@@ -45,6 +45,7 @@ REKEY_INTERVAL = 100ms
 BINDTO = 60003
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000
+#REKEY_INTERVAL = 100ms
 REKEY_MAX_BYTES=9MiB
 
 [communicator-test]
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index 1bf88bb3d..e1090eaeb 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -772,6 +772,7 @@ shutdown_process (struct GNUNET_OS_Process *proc)
   GNUNET_OS_process_destroy (proc);
 }
 
+
 /**
  * @brief Task run at shutdown to kill the statistics process
  *
@@ -784,6 +785,7 @@ shutdown_statistics (void *cls)
   shutdown_process (proc);
 }
 
+
 /**
  * @brief Task run at shutdown to kill the peerstore process
  *
@@ -796,6 +798,7 @@ shutdown_peerstore (void *cls)
   shutdown_process (proc);
 }
 
+
 /**
  * @brief Task run at shutdown to kill a communicator process
  *
@@ -913,6 +916,7 @@ resolver_start (struct
 
 }
 
+
 /**
  * @brief Start Statistics
  *
@@ -942,6 +946,7 @@ statistics_start (
   GNUNET_free (binary);
 }
 
+
 /**
  * @brief Start Peerstore
  *
@@ -971,6 +976,7 @@ peerstore_start (
   GNUNET_free (binary);
 }
 
+
 /**
  * @brief Start NAT
  *
@@ -1200,7 +1206,7 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send
                              inbox_size,
                              GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG);
   GNUNET_assert (NULL != env);
-  msg->qid = htonl (tc_queue->qid);
+  msg->qid = tc_queue->qid;
   msg->mid = tc_queue->mid++;
   msg->receiver = tc_queue->peer_id;
   mh = (struct GNUNET_MessageHeader *) &msg[1];