-rename to deconfuse Martin about which block type is actually used these days, hopefully

4 files changed, 24 insertions, 22 deletions

diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index 82ba326b4..576753a38 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -203,7 +203,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_DHT_HELLO,       /* Block type */
+                  GNUNET_BLOCK_TYPE_LEGACY_HELLO,       /* Block type */
                   size,  /* Size of the data */
                   (const char *) hello, /* Data itself */
                   expiration,  /* Data expiration */
@@ -300,7 +300,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_DHT_HELLO, /* type */
+                                    GNUNET_BLOCK_TYPE_LEGACY_HELLO, /* type */
                                     &phash,     /* key to search */
                                     dht_replication_level, /* replication level */
                                     GNUNET_DHT_RO_RECORD_ROUTE
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 25d69ac65..b55a28929 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -662,7 +662,7 @@ send_find_peer_message (void *cls)
     struct GNUNET_CONTAINER_BloomFilter *peer_bf;
 
     bg = GNUNET_BLOCK_group_create (GDS_block_context,
-                                    GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+                                    GNUNET_BLOCK_TYPE_DHT_HELLO,
                                     NULL,
                                     0,
                                     "filter-size",
@@ -676,7 +676,7 @@ send_find_peer_message (void *cls)
                                            DHT_BLOOM_SIZE,
                                            GNUNET_CONSTANTS_BLOOMFILTER_K);
     if (GNUNET_OK !=
-        GDS_NEIGHBOURS_handle_get (GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+        GDS_NEIGHBOURS_handle_get (GNUNET_BLOCK_TYPE_DHT_HELLO,
                                    GNUNET_DHT_RO_FIND_APPROXIMATE
                                    | GNUNET_DHT_RO_RECORD_ROUTE,
                                    FIND_PEER_REPLICATION_LEVEL,
@@ -1303,7 +1303,7 @@ hello_check (const struct GNUNET_DATACACHE_Block *bd)
   struct GNUNET_PeerIdentity pid;
   struct GNUNET_HELLO_Builder *b;
 
-  if (GNUNET_BLOCK_TYPE_DHT_URL_HELLO != bd->type)
+  if (GNUNET_BLOCK_TYPE_DHT_HELLO != bd->type)
     return;
 
   b = GNUNET_HELLO_builder_from_block (bd->data,
@@ -2168,7 +2168,7 @@ handle_find_my_hello (struct PeerInfo *pi,
     }
     else if (GNUNET_BLOCK_REPLY_OK_MORE ==
              GNUNET_BLOCK_check_reply (GDS_block_context,
-                                       GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+                                       GNUNET_BLOCK_TYPE_DHT_HELLO,
                                        bg,
                                        &GDS_my_identity_hash,
                                        NULL, 0,
@@ -2176,7 +2176,7 @@ handle_find_my_hello (struct PeerInfo *pi,
                                        block_size))
     {
       struct GNUNET_DATACACHE_Block bd = {
-        .type = GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+        .type = GNUNET_BLOCK_TYPE_DHT_HELLO,
         .expiration_time
           = GNUNET_TIME_relative_to_absolute (
               GNUNET_HELLO_ADDRESS_EXPIRATION),
@@ -2225,7 +2225,7 @@ handle_find_local_hello (struct PeerInfo *pi,
        (GNUNET_BLOCK_REPLY_OK_MORE ==
         GNUNET_BLOCK_check_reply (
           GDS_block_context,
-          GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+          GNUNET_BLOCK_TYPE_DHT_HELLO,
           bg,
           &peer->phash,
           NULL, 0,        /* xquery */
@@ -2233,7 +2233,7 @@ handle_find_local_hello (struct PeerInfo *pi,
           peer->hello_size)) )
   {
     struct GNUNET_DATACACHE_Block bd = {
-      .type = GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
+      .type = GNUNET_BLOCK_TYPE_DHT_HELLO,
       .expiration_time = peer->hello_expiration,
       .key = peer->phash,
       .data = peer->hello,
@@ -2362,7 +2362,7 @@ handle_dht_p2p_get (void *cls,
          (GDS_am_closest_peer (&get->key,
                                peer_bf)) )
     {
-      if ( (GNUNET_BLOCK_TYPE_DHT_URL_HELLO == type) ||
+      if ( (GNUNET_BLOCK_TYPE_DHT_HELLO == type) ||
            (GNUNET_BLOCK_TYPE_ANY == type) )
       {
         GNUNET_STATISTICS_update (GDS_stats,
@@ -2377,7 +2377,7 @@ handle_dht_p2p_get (void *cls,
                                    &get->key,
                                    bg);
       }
-      if (GNUNET_BLOCK_TYPE_DHT_URL_HELLO != type)
+      if (GNUNET_BLOCK_TYPE_DHT_HELLO != type)
       {
         if (0 != (options & GNUNET_DHT_RO_FIND_APPROXIMATE))
           eval = GDS_DATACACHE_get_closest (&get->key,
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index bee16736c..6375fa272 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -105,14 +105,14 @@ block_plugin_dht_check_query (void *cls,
 {
   switch (type)
   {
-  case GNUNET_BLOCK_TYPE_DHT_HELLO:
+  case GNUNET_BLOCK_TYPE_LEGACY_HELLO:
     if (0 != xquery_size)
     {
       GNUNET_break_op (0);
       return GNUNET_NO;
     }
     return GNUNET_OK;
-  case GNUNET_BLOCK_TYPE_DHT_URL_HELLO:
+  case GNUNET_BLOCK_TYPE_DHT_HELLO:
     if (0 != xquery_size)
     {
       GNUNET_break_op (0);
@@ -143,7 +143,7 @@ block_plugin_dht_check_block (void *cls,
 {
   switch (type)
   {
-  case GNUNET_BLOCK_TYPE_DHT_HELLO:
+  case GNUNET_BLOCK_TYPE_LEGACY_HELLO:
     {
       const struct GNUNET_HELLO_Message *hello;
       struct GNUNET_PeerIdentity pid;
@@ -170,7 +170,7 @@ block_plugin_dht_check_block (void *cls,
       }
       return GNUNET_OK;
     }
-  case GNUNET_BLOCK_TYPE_DHT_URL_HELLO:
+  case GNUNET_BLOCK_TYPE_DHT_HELLO:
     {
       struct GNUNET_HELLO_Builder *b;
       struct GNUNET_PeerIdentity pid;
@@ -228,8 +228,9 @@ block_plugin_dht_check_reply (
 {
   switch (type)
   {
-  case GNUNET_BLOCK_TYPE_DHT_HELLO:
+  case GNUNET_BLOCK_TYPE_LEGACY_HELLO:
     {
+      /* LEGACY */
       const struct GNUNET_MessageHeader *msg = reply_block;
       const struct GNUNET_HELLO_Message *hello = reply_block;
       struct GNUNET_PeerIdentity pid;
@@ -249,7 +250,7 @@ block_plugin_dht_check_reply (
         return GNUNET_BLOCK_REPLY_OK_DUPLICATE;
       return GNUNET_BLOCK_REPLY_OK_MORE;
     }
-  case GNUNET_BLOCK_TYPE_DHT_URL_HELLO:
+  case GNUNET_BLOCK_TYPE_DHT_HELLO:
     {
       struct GNUNET_HELLO_Builder *b;
       struct GNUNET_PeerIdentity pid;
@@ -297,8 +298,9 @@ block_plugin_dht_get_key (void *cls,
 {
   switch (type)
   {
-  case GNUNET_BLOCK_TYPE_DHT_HELLO:
+  case GNUNET_BLOCK_TYPE_LEGACY_HELLO:
     {
+      /* LEGACY */
       const struct GNUNET_MessageHeader *msg;
       const struct GNUNET_HELLO_Message *hello;
       struct GNUNET_PeerIdentity *pid;
@@ -337,7 +339,7 @@ block_plugin_dht_get_key (void *cls,
       }
       return GNUNET_OK;
     }
-  case GNUNET_BLOCK_TYPE_DHT_URL_HELLO:
+  case GNUNET_BLOCK_TYPE_DHT_HELLO:
     {
       struct GNUNET_HELLO_Builder *b;
       struct GNUNET_PeerIdentity pid;
@@ -375,8 +377,8 @@ void *
 libgnunet_plugin_block_dht_init (void *cls)
 {
   static enum GNUNET_BLOCK_Type types[] = {
+    GNUNET_BLOCK_TYPE_LEGACY_HELLO,
     GNUNET_BLOCK_TYPE_DHT_HELLO,
-    GNUNET_BLOCK_TYPE_DHT_URL_HELLO,
     GNUNET_BLOCK_TYPE_ANY       /* end of list */
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
diff --git a/src/include/gnunet_dht_block_types.h b/src/include/gnunet_dht_block_types.h
index 1829897ca..40f2900f9 100644
--- a/src/include/gnunet_dht_block_types.h
+++ b/src/include/gnunet_dht_block_types.h
@@ -70,7 +70,7 @@ enum GNUNET_BLOCK_Type
   /**
    * Type of a block that contains a HELLO for a peer.
    */
-  GNUNET_BLOCK_TYPE_DHT_HELLO = 7,
+  GNUNET_BLOCK_TYPE_LEGACY_HELLO = 7,
 
 
   /**
@@ -106,7 +106,7 @@ enum GNUNET_BLOCK_Type
   /**
    * Type of a block that contains a DHT-NG HELLO for a peer.
    */
-  GNUNET_BLOCK_TYPE_DHT_URL_HELLO = 13,
+  GNUNET_BLOCK_TYPE_DHT_HELLO = 13,
 
 
   /**