[gnunet] branch master updated (711d2d431 -> 020c0fb8d)

[gnunet]

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

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

    from 711d2d431 REST: Remove plugins. Hardcode features
     new 78098d301 TOPOLOGY: Some warnings silenced
     new 020c0fb8d BUILD: Make autotools happy again

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                  |  6 ------
 po/POTFILES.in                                | 21 ++++++++++---------
 src/service/topology/gnunet-daemon-topology.c | 30 +++++++++------------------
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/configure.ac b/configure.ac
index 255b4bab4..aa96b55d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1306,12 +1306,6 @@ src/service/vpn/Makefile
 src/service/vpn/vpn.conf
 src/service/zonemaster/Makefile
 src/service/zonemaster/zonemaster.conf
-src/rest-plugin/Makefile
-src/rest-plugin/gns/Makefile
-src/rest-plugin/identity/Makefile
-src/rest-plugin/namestore/Makefile
-src/rest-plugin/reclaim/Makefile
-src/rest-plugin/rest/Makefile
 src/cli/Makefile
 src/cli/arm/Makefile
 src/cli/cadet/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d8c22b629..88eaf10da 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -109,6 +109,7 @@ src/lib/curl/curl_reschedule.c
 src/lib/gnsrecord/gnsrecord.c
 src/lib/gnsrecord/gnsrecord_crypto.c
 src/lib/gnsrecord/gnsrecord_misc.c
+src/lib/gnsrecord/gnsrecord_pow.c
 src/lib/gnsrecord/gnsrecord_serialization.c
 src/lib/gnsrecord/gnunet-gnsrecord-tvg.c
 src/lib/gnsrecord/json_gnsrecord.c
@@ -223,16 +224,6 @@ src/plugin/reclaim/plugin_reclaim_attribute_basic.c
 src/plugin/reclaim/plugin_reclaim_credential_jwt.c
 src/plugin/reclaim/plugin_reclaim_credential_pabc.c
 src/plugin/revocation/plugin_block_revocation.c
-src/rest-plugin/gns/plugin_rest_gns.c
-src/rest-plugin/identity/plugin_rest_identity.c
-src/rest-plugin/namestore/plugin_rest_namestore.c
-src/rest-plugin/reclaim/json_reclaim.c
-src/rest-plugin/reclaim/oidc_helper.c
-src/rest-plugin/reclaim/plugin_rest_openid_connect.c
-src/rest-plugin/reclaim/plugin_rest_pabc.c
-src/rest-plugin/reclaim/plugin_rest_reclaim.c
-src/rest-plugin/rest/plugin_rest_config.c
-src/rest-plugin/rest/plugin_rest_copying.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -427,7 +418,17 @@ src/service/regex/regex_internal_dht.c
 src/service/regex/regex_test_graph.c
 src/service/regex/regex_test_lib.c
 src/service/regex/regex_test_random.c
+src/service/rest/config_plugin.c
+src/service/rest/copying_plugin.c
+src/service/rest/gns_plugin.c
 src/service/rest/gnunet-rest-server.c
+src/service/rest/identity_plugin.c
+src/service/rest/json_reclaim.c
+src/service/rest/namestore_plugin.c
+src/service/rest/oidc_helper.c
+src/service/rest/openid_plugin.c
+src/service/rest/pabc_plugin.c
+src/service/rest/reclaim_plugin.c
 src/service/rest/rest.c
 src/service/revocation/gnunet-service-revocation.c
 src/service/revocation/revocation_api.c
diff --git a/src/service/topology/gnunet-daemon-topology.c 
b/src/service/topology/gnunet-daemon-topology.c
index efabac0fc..71cc5bd19 100644
--- a/src/service/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
@@ -641,35 +641,26 @@ consider_for_advertising (const struct 
GNUNET_MessageHeader *hello)
   int num_addresses_old;
   int num_addresses_new;
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (hello);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
+  struct GNUNET_PeerIdentity pid;
   struct Peer *peer;
   uint16_t size;
 
   GNUNET_HELLO_builder_iterate (builder,
-                                pid,
+                                &pid,
                                 &address_iterator,
                                 &num_addresses_new);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "consider 0 for %s\n",
-              GNUNET_i2s (pid));
+              GNUNET_i2s (&pid));
   if (0 == num_addresses_new)
   {
     GNUNET_HELLO_builder_free (builder);
     return; /* no point in advertising this one... */
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "consider 1\n");
-  if (NULL == pid)
-  {
-    GNUNET_HELLO_builder_free (builder);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "consider 2\n");
-  peer = GNUNET_CONTAINER_multipeermap_get (peers, pid);
+  peer = GNUNET_CONTAINER_multipeermap_get (peers, &pid);
   if (NULL == peer)
   {
-    peer = make_peer (pid, hello);
+    peer = make_peer (&pid, hello);
   }
   else if (NULL != peer->hello)
   {
@@ -679,10 +670,10 @@ consider_for_advertising (const struct 
GNUNET_MessageHeader *hello)
     struct GNUNET_TIME_Absolute old_hello_exp =
       GNUNET_HELLO_builder_get_expiration_time (peer->hello);
     struct GNUNET_HELLO_Builder *builder_old = GNUNET_HELLO_builder_from_msg 
(peer->hello);
-    struct GNUNET_PeerIdentity *pid_old = GNUNET_HELLO_builder_get_id 
(builder_old);
+    struct GNUNET_PeerIdentity pid_old;
 
     GNUNET_HELLO_builder_iterate (builder_old,
-                                  pid_old,
+                                  &pid_old,
                                   &address_iterator,
                                   &num_addresses_old);
     if (GNUNET_TIME_absolute_cmp (new_hello_exp, >, now) &&
@@ -710,7 +701,7 @@ consider_for_advertising (const struct GNUNET_MessageHeader 
*hello)
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found HELLO from peer `%s' for advertising\n",
-              GNUNET_i2s (pid));
+              GNUNET_i2s (&pid));
   if (NULL != peer->filter)
   {
     GNUNET_CONTAINER_bloomfilter_free (peer->filter);
@@ -828,7 +819,7 @@ check_hello (void *cls, const struct GNUNET_MessageHeader 
*message)
 {
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (
     message);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
+  const struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id 
(builder);
 
   if (NULL == pid)
   {
@@ -858,10 +849,8 @@ handle_hello (void *cls, const struct GNUNET_MessageHeader 
*message)
 {
   struct GNUNET_PEERSTORE_StoreHelloContext *shc;
   const struct GNUNET_PeerIdentity *other = cls;
-  struct Peer *peer;
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (
     message);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received encrypted HELLO from peer `%s'",
@@ -871,6 +860,7 @@ handle_hello (void *cls, const struct GNUNET_MessageHeader 
*message)
                             1,
                             GNUNET_NO);
   GNUNET_HELLO_builder_from_msg (message);
+  // FIXME this is not working shc uninitialized
   shc = GNUNET_PEERSTORE_hello_add (ps, message, &shc_cont, shc);
   GNUNET_HELLO_builder_free (builder);
 }

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