[gnunet] branch master updated: Cadet: Fixed issue #7542

[gnunet]

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

t3sserakt pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 9376034c2 Cadet: Fixed issue #7542
     new 692fd292f Merge branch 'master' of ssh://git.gnunet.org/gnunet
9376034c2 is described below

commit 9376034c29f27f7b7baff17c767b0c68e7ced37c
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Fri Oct 20 20:15:00 2023 +0200

    Cadet: Fixed issue #7542
---
 src/service/cadet/gnunet-service-cadet_dht.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/service/cadet/gnunet-service-cadet_dht.c 
b/src/service/cadet/gnunet-service-cadet_dht.c
index 9a8082339..215f6e184 100644
--- a/src/service/cadet/gnunet-service-cadet_dht.c
+++ b/src/service/cadet/gnunet-service-cadet_dht.c
@@ -120,25 +120,25 @@ dht_get_id_handler (void *cls, struct 
GNUNET_TIME_Absolute exp,
                     const void *data)
 {
   const struct GNUNET_MessageHeader *hello = data;
+  const struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg 
(hello);
 
+  GNUNET_assert (NULL != builder);
   (void) trunc_peer;
   GCPP_try_path_from_dht (get_path,
                           get_path_length,
                           put_path,
                           put_path_length);
-  if ((size >= sizeof(struct GNUNET_HELLO_Message)) &&
-      (ntohs (hello->size) == size))
-  {
-    struct CadetPeer *peer;
 
-    peer = GCP_get (&put_path[0].pred,
+  struct CadetPeer *peer;
+
+  peer = GCP_get (&put_path[0].pred,
                     GNUNET_YES);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Got HELLO for %s\n",
-         GCP_2s (peer));
-    GCP_set_hello (peer,
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Got HELLO for %s\n",
+       GCP_2s (peer));
+  GCP_set_hello (peer,
                    hello);
-  }
+  GNUNET_HELLO_builder_free (builder);
 }
 
 
@@ -202,7 +202,7 @@ announce_id (void *cls)
                   dht_replication_level,     /* Replication level */
                   GNUNET_DHT_RO_RECORD_ROUTE
                   | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,    /* DHT options */
-                  GNUNET_BLOCK_TYPE_LEGACY_HELLO,       /* Block type */
+                  GNUNET_BLOCK_TYPE_DHT_HELLO,       /* Block type */
                   size,  /* Size of the data */
                   (const char *) hello, /* Data itself */
                   expiration,  /* Data expiration */
@@ -299,7 +299,7 @@ GCD_search (const struct GNUNET_PeerIdentity *peer_id)
 
   h = GNUNET_new (struct GCD_search_handle);
   h->dhtget = GNUNET_DHT_get_start (dht_handle,     /* handle */
-                                    GNUNET_BLOCK_TYPE_LEGACY_HELLO, /* type */
+                                    GNUNET_BLOCK_TYPE_DHT_HELLO, /* type */
                                     &phash,     /* key to search */
                                     dht_replication_level, /* replication 
level */
                                     GNUNET_DHT_RO_RECORD_ROUTE

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