[gnunet] branch master updated: DHT: Move block type definitions to GANA

[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 c42fd9b03 DHT: Move block type definitions to GANA
c42fd9b03 is described below

commit c42fd9b034d7b343f7fd8e480d693509b414b460
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Mon May 9 10:49:46 2022 +0200

    DHT: Move block type definitions to GANA
---
 bootstrap                      |   6 ++
 contrib/gana                   |   2 +-
 src/include/Makefile.am        |   1 +
 src/include/gnunet_block_lib.h | 122 +----------------------------------------
 4 files changed, 10 insertions(+), 121 deletions(-)

diff --git a/bootstrap b/bootstrap
index 9d31d7ad7..70c2559aa 100755
--- a/bootstrap
+++ b/bootstrap
@@ -123,6 +123,12 @@ gana_update()
          make && \
          cp gnunet_signatures.h ../../../src/include && \
          make clean || exit 1
+      # DHT Block Types
+      cd ../gnunet-dht-block-types && \
+         make && \
+         cp gnunet_dht_block_types.h ../../../src/include && \
+         make clean || exit 1
+
       cd $cwd
     else
       echo "ERROR: No recutils found! Unable to generate recent GANA headers 
and configs."
diff --git a/contrib/gana b/contrib/gana
index f2babbbdd..1ed41552f 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit f2babbbdd477eeafb17292e16f335226ea02cb6a
+Subproject commit 1ed41552f6013e5f48c68389d60e3d5d61892a05
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 8808f6802..67c29208c 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -21,6 +21,7 @@ gnunetinclude_HEADERS = \
   gnunet_ats_plugin.h \
   gnunet_bandwidth_lib.h \
   gnunet_bio_lib.h \
+       gnunet_dht_block_types.h \
   gnunet_block_lib.h \
   gnunet_block_group_lib.h \
   gnunet_block_plugin.h \
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 515b8256c..fb417412f 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -32,6 +32,8 @@
 #define GNUNET_BLOCK_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_dht_block_types.h"
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -41,126 +43,6 @@ extern "C"
 #endif
 
 
-/**
- * Blocks in the datastore and the datacache must have a unique type.
- *
- * TODO: move to GANA!
- */
-enum GNUNET_BLOCK_Type
-{
-  /**
-   * Any type of block, used as a wildcard when searching.  Should
-   * never be attached to a specific block.
-   */
-  GNUNET_BLOCK_TYPE_ANY = 0,
-
-  /**
-   * Data block (leaf) in the CHK tree.
-   */
-  GNUNET_BLOCK_TYPE_FS_DBLOCK = 1,
-
-  /**
-   * Inner block in the CHK tree.
-   */
-  GNUNET_BLOCK_TYPE_FS_IBLOCK = 2,
-
-  /**
-   * Legacy type, no longer in use.
-   */
-  GNUNET_BLOCK_TYPE_FS_KBLOCK = 3,
-
-  /**
-   * Legacy type, no longer in use.
-   */
-  GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,
-
-  /**
-   * Legacy type, no longer in use.
-   */
-  GNUNET_BLOCK_TYPE_FS_NBLOCK = 5,
-
-  /**
-   * Type of a block representing a block to be encoded on demand from disk.
-   * Should never appear on the network directly.
-   */
-  GNUNET_BLOCK_TYPE_FS_ONDEMAND = 6,
-
-  /**
-   * Type of a block that contains a HELLO for a peer (for
-   * DHT and CADET find-peer operations).
-   */
-  GNUNET_BLOCK_TYPE_DHT_HELLO = 7,
-
-  /**
-   * Block for testing.
-   */
-  GNUNET_BLOCK_TYPE_TEST = 8,
-
-  /**
-   * Type of a block representing any type of search result
-   * (universal).  Implemented in the context of #2564, replaces
-   * SBLOCKS, KBLOCKS and NBLOCKS.
-   */
-  GNUNET_BLOCK_TYPE_FS_UBLOCK = 9,
-
-  /**
-   * Block for storing DNS exit service advertisements.
-   */
-  GNUNET_BLOCK_TYPE_DNS = 10,
-
-  /**
-   * Block for storing record data
-   */
-  GNUNET_BLOCK_TYPE_GNS_NAMERECORD = 11,
-
-  /**
-   * Block type for a revocation message by which a key is revoked.
-   */
-  GNUNET_BLOCK_TYPE_REVOCATION = 12,
-
-  /**
-   * Type of a block that contains a DHT-NG HELLO for a peer (for
-   * DHT and CADET find-peer operations).
-   */
-  GNUNET_BLOCK_TYPE_DHT_URL_HELLO = 13,
-
-  /**
-   * Block to store a cadet regex state
-   */
-  GNUNET_BLOCK_TYPE_REGEX = 22,
-
-  /**
-   * Block to store a cadet regex accepting state
-   */
-  GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23,
-
-  /**
-   * Block for testing set/consensus.  If first byte of the block
-   * is non-zero, the block is considered invalid.
-   */
-  GNUNET_BLOCK_TYPE_SET_TEST = 24,
-
-  /**
-   * Block type for consensus elements.
-   * Contains either special marker elements or a nested block.
-   */
-  GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT = 25,
-
-  /**
-   * Block for testing set intersection.  If first byte of the block
-   * is non-zero, the block is considered invalid.
-   */
-  GNUNET_BLOCK_TYPE_SETI_TEST = 24,
-
-  /**
-   * Block for testing set union.  If first byte of the block
-   * is non-zero, the block is considered invalid.
-   */
-  GNUNET_BLOCK_TYPE_SETU_TEST = 24,
-
-};
-
-
 /**
  * Possible ways for how a block may relate to a query.
  */

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