[gnunet] branch master updated: TNG: UDP communicator with sensible shared secret per sender limit.

[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 48c3a1965 TNG: UDP communicator with sensible shared secret per sender 
limit.
48c3a1965 is described below

commit 48c3a19659db6c34699592da33df0f9af2e9e61a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Jul 30 17:50:52 2023 +0200

    TNG: UDP communicator with sensible shared secret per sender limit.
---
 src/transport/gnunet-communicator-udp.c            | 30 ++++++++++++----------
 .../test_communicator_udp_basic_peer1.conf         |  2 +-
 .../test_communicator_udp_basic_peer2.conf         |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/transport/gnunet-communicator-udp.c 
b/src/transport/gnunet-communicator-udp.c
index eef6634b7..50e66e13a 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -135,7 +135,7 @@
  * sense. Might make sense to adapt to RTT if we had
  * a good measurement...
  */
-#define MAX_SECRETS 128000
+#define MAX_SECRETS 256
 
 /**
  * Default value for how often we do rekey based on number of bytes 
transmitted?
@@ -1011,17 +1011,23 @@ secret_destroy (struct SharedSecret *ss)
   {
     GNUNET_CONTAINER_DLL_remove (sender->ss_head, sender->ss_tail, ss);
     sender->num_secrets--;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "%u sender->num_secrets\n",
+                receiver->num_secrets);
+    if (NULL != ss->sender->kce_task)
+    {
+      GNUNET_SCHEDULER_cancel (ss->sender->kce_task);
+      ss->sender->kce_task = NULL;
+    }
   }
   if (NULL != (receiver = ss->receiver))
   {
     GNUNET_CONTAINER_DLL_remove (receiver->ss_head, receiver->ss_tail, ss);
     receiver->num_secrets--;
-    // Uncomment this for alternativ 1 of backchannel functionality
     receiver->acks_available -= (ss->sequence_allowed - ss->sequence_used);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%u receiver->acks_available 3\n",
-                receiver->acks_available);
-    // Until here for alternativ 1
+                "%u receiver->num_secrets\n",
+                receiver->num_secrets);
   }
   while (NULL != (kce = ss->kce_head))
     kce_destroy (kce);
@@ -1030,11 +1036,6 @@ secret_destroy (struct SharedSecret *ss)
                          "# KIDs active",
                          GNUNET_CONTAINER_multishortmap_size (key_cache),
                          GNUNET_NO);
-  if (NULL != ss->sender->kce_task)
-  {
-    GNUNET_SCHEDULER_cancel (ss->sender->kce_task);
-    ss->sender->kce_task = NULL;
-  }
   GNUNET_free (ss);
   return GNUNET_YES;
 }
@@ -1380,22 +1381,23 @@ purge_secrets (struct SharedSecret *ss_list_tail)
   struct SharedSecret *ss_to_purge;
   int deleted = 0;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Purging secrets.\n");
   pos = ss_list_tail;
   while (NULL != pos)
   {
     ss_to_purge = pos;
     pos = pos->prev;
 
-    if ((NULL == ss_to_purge->kce_head) ||
-        (rekey_max_bytes <= ss_to_purge->bytes_sent))
+    // FIXME we may also want to purge old unacked.
+    if (rekey_max_bytes <= ss_to_purge->bytes_sent)
     {
       secret_destroy (ss_to_purge);
       deleted++;
     }
   }
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Finished purging all.\n");
+              "Finished purging all, deleted %u.\n", deleted);
 }
 
 
diff --git a/src/transport/test_communicator_udp_basic_peer1.conf 
b/src/transport/test_communicator_udp_basic_peer1.conf
index ec8c19f62..6968b3aef 100644
--- a/src/transport/test_communicator_udp_basic_peer1.conf
+++ b/src/transport/test_communicator_udp_basic_peer1.conf
@@ -32,7 +32,7 @@ PORT = 62089
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
 
 [communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
+# PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=/tmp/vg_com1
 BINDTO = 60002
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_basic_peer2.conf 
b/src/transport/test_communicator_udp_basic_peer2.conf
index b353b03e9..781bfa7da 100644
--- a/src/transport/test_communicator_udp_basic_peer2.conf
+++ b/src/transport/test_communicator_udp_basic_peer2.conf
@@ -33,7 +33,7 @@ PORT = 62090
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
 
 [communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
+# PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=/tmp/vg_com2
 BINDTO = 60003
 DISABLE_V6 = YES
 MAX_QUEUE_LENGTH=5000

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