Hello: Fixed usage of GNUNET_HELLO_builder_iterate.

3 files changed, 14 insertions, 7 deletions

diff --git a/src/service/dht/gnunet-service-dht_clients.c b/src/service/dht/gnunet-service-dht_clients.c
index 90bb4d1f7..f2027888c 100644
--- a/src/service/dht/gnunet-service-dht_clients.c
+++ b/src/service/dht/gnunet-service-dht_clients.c
@@ -1203,7 +1203,7 @@ handle_dht_local_hello_offer (void *cls,
   struct ClientHandle *ch = cls;
   const char *url = (const char *) &msg[1];
   struct GNUNET_HELLO_Builder *b;
-  struct GNUNET_PeerIdentity pid;
+  struct GNUNET_PeerIdentity *pid;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local client provided HELLO URL %s\n",
@@ -1216,10 +1216,12 @@ handle_dht_local_hello_offer (void *cls,
     return;
   }
   GNUNET_SERVICE_client_continue (ch->client);
+  pid = GNUNET_new (struct GNUNET_PeerIdentity);
   GNUNET_HELLO_builder_iterate (b,
-                                &pid,
+                                pid,
                                 &GDS_try_connect,
-                                &pid);
+                                pid);
+  GNUNET_free (pid);
   GNUNET_HELLO_builder_free (b);
 }
 
diff --git a/src/service/dht/gnunet-service-dht_neighbours.c b/src/service/dht/gnunet-service-dht_neighbours.c
index a2dc63808..dbbdf13eb 100644
--- a/src/service/dht/gnunet-service-dht_neighbours.c
+++ b/src/service/dht/gnunet-service-dht_neighbours.c
@@ -1300,7 +1300,7 @@ get_target_peers (const struct GNUNET_HashCode *key,
 static void
 hello_check (const struct GNUNET_DATACACHE_Block *bd)
 {
-  struct GNUNET_PeerIdentity pid;
+  struct GNUNET_PeerIdentity *pid;
   struct GNUNET_HELLO_Builder *b;
 
   if (GNUNET_BLOCK_TYPE_DHT_HELLO != bd->type)
@@ -1309,10 +1309,14 @@ hello_check (const struct GNUNET_DATACACHE_Block *bd)
   b = GNUNET_HELLO_builder_from_block (bd->data,
                                        bd->data_size);
   if (GNUNET_YES != disable_try_connect)
+  {
+    pid = GNUNET_new (struct GNUNET_PeerIdentity);
     GNUNET_HELLO_builder_iterate (b,
-                                  &pid,
+                                  pid,
                                   &GDS_try_connect,
-                                  &pid);
+                                  pid);
+    GNUNET_free (pid);
+  }
   GNUNET_HELLO_builder_free (b);
 }
 
diff --git a/src/service/dhtu/plugin_dhtu_gnunet.c b/src/service/dhtu/plugin_dhtu_gnunet.c
index 75f466916..247ab7090 100644
--- a/src/service/dhtu/plugin_dhtu_gnunet.c
+++ b/src/service/dhtu/plugin_dhtu_gnunet.c
@@ -408,6 +408,7 @@ peerinfo_cb (void *cls,
 {
   struct Plugin *plugin = cls;
   struct GNUNET_HELLO_Builder *builder;
+  struct GNUNET_PeerIdentity pid;
 
   if (NULL == hello)
     return;
@@ -419,7 +420,7 @@ peerinfo_cb (void *cls,
     return;
   builder = GNUNET_HELLO_builder_from_msg (hello);
   GNUNET_HELLO_builder_iterate (builder,
-                                (struct GNUNET_PeerIdentity *) peer,
+                                &pid,
                                 add_addr,
                                 plugin);
   GNUNET_HELLO_builder_free (builder);