[gnunet] branch master updated: transport: trying to fix UDP communicator and rekey tests.

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 6c0550cb0 transport: trying to fix UDP communicator and rekey tests.
6c0550cb0 is described below

commit 6c0550cb0064fa2d3e13a7fbbce69a9c541ab496
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Mar 10 15:18:09 2024 +0100

    transport: trying to fix UDP communicator and rekey tests.
---
 src/service/transport/gnunet-communicator-tcp.c              | 1 +
 src/service/transport/gnunet-communicator-udp.c              | 6 +++---
 src/service/transport/test_communicator_basic.c              | 4 ++--
 src/service/transport/test_communicator_udp_rekey_peer1.conf | 2 +-
 src/service/transport/test_communicator_udp_rekey_peer2.conf | 2 +-
 src/service/transport/transport-testing-communicator.c       | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/service/transport/gnunet-communicator-tcp.c 
b/src/service/transport/gnunet-communicator-tcp.c
index 5e7cd4b01..ccc32d65c 100644
--- a/src/service/transport/gnunet-communicator-tcp.c
+++ b/src/service/transport/gnunet-communicator-tcp.c
@@ -2737,6 +2737,7 @@ start_initial_kx_out (struct Queue *queue)
   struct GNUNET_CRYPTO_EcdhePublicKey epub;
   struct GNUNET_HashCode k;
 
+  // TODO: We could use the Elligator KEM here! 
https://bugs.gnunet.org/view.php?id=8065
   GNUNET_CRYPTO_eddsa_kem_encaps (&queue->target.public_key, &epub, &k);
   setup_out_cipher (queue, &k);
   transmit_kx (queue, &epub);
diff --git a/src/service/transport/gnunet-communicator-udp.c 
b/src/service/transport/gnunet-communicator-udp.c
index 842c42107..1fc641aed 100644
--- a/src/service/transport/gnunet-communicator-udp.c
+++ b/src/service/transport/gnunet-communicator-udp.c
@@ -2559,8 +2559,8 @@ mq_send_d (struct GNUNET_MQ_Handle *mq,
     size_t payload_len = sizeof(struct UDPBox) + receiver->d_mtu;
     if (ss->sequence_used >= ss->sequence_allowed)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Skipping ss because no acks to use.\n");
+      //  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      //              "Skipping ss because no acks to use.\n");
       continue;
     }
     if (ss->bytes_sent >= rekey_max_bytes)
@@ -2980,7 +2980,7 @@ do_shutdown (void *cls)
   }
   if (NULL != stats)
   {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
     stats = NULL;
   }
   if (NULL != my_private_key)
diff --git a/src/service/transport/test_communicator_basic.c 
b/src/service/transport/test_communicator_basic.c
index 4c08439a8..36784e726 100644
--- a/src/service/transport/test_communicator_basic.c
+++ b/src/service/transport/test_communicator_basic.c
@@ -100,7 +100,7 @@ static struct GNUNET_STATISTICS_GetHandle 
*rekey_stats[NUM_PEERS];
 
 static unsigned int iterations_left[NUM_PEERS];
 
-#define TIMEOUT_MULTIPLIER 1
+#define TIMEOUT_MULTIPLIER 5
 
 #define DEFAULT_DELAY \
         GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,200)
@@ -1037,8 +1037,8 @@ do_shutdown (void *cls)
       GNUNET_SCHEDULER_cancel (to_task[i]);
       to_task[i] = NULL;
     }
+    GNUNET_STATISTICS_destroy (stats[i], GNUNET_YES);
     GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (tc_hs[i]);
-    GNUNET_STATISTICS_destroy (stats[i], GNUNET_NO);
   }
 }
 
diff --git a/src/service/transport/test_communicator_udp_rekey_peer1.conf 
b/src/service/transport/test_communicator_udp_rekey_peer1.conf
index dd19fbe94..6294ea1e5 100644
--- a/src/service/transport/test_communicator_udp_rekey_peer1.conf
+++ b/src/service/transport/test_communicator_udp_rekey_peer1.conf
@@ -46,7 +46,7 @@ BINDTO = 60002
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000
 REKEY_INTERVAL = 100ms
-REKEY_MAX_BYTES=5KiB
+REKEY_MAX_BYTES=500KiB
 
 [communicator-test]
 BACKCHANNEL_ENABLED = YES
diff --git a/src/service/transport/test_communicator_udp_rekey_peer2.conf 
b/src/service/transport/test_communicator_udp_rekey_peer2.conf
index c21d0adaa..9bce572aa 100644
--- a/src/service/transport/test_communicator_udp_rekey_peer2.conf
+++ b/src/service/transport/test_communicator_udp_rekey_peer2.conf
@@ -46,7 +46,7 @@ BINDTO = 60003
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000
 REKEY_INTERVAL = 100ms
-REKEY_MAX_BYTES=5KiB
+REKEY_MAX_BYTES=500KiB
 
 [communicator-test]
 BACKCHANNEL_ENABLED = YES
diff --git a/src/service/transport/transport-testing-communicator.c 
b/src/service/transport/transport-testing-communicator.c
index c4bb75083..7d8abbe1e 100644
--- a/src/service/transport/transport-testing-communicator.c
+++ b/src/service/transport/transport-testing-communicator.c
@@ -773,7 +773,7 @@ shutdown_process (struct GNUNET_OS_Process *proc)
            "Error shutting down process with SIGERM and SIGKILL\n");
     }
   }
-  //GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc));
+  GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc));
   GNUNET_OS_process_destroy (proc);
 }
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.