1 files changed, 54 insertions, 48 deletions
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 002d5c11b..ac9d9d5f8 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -41,15 +41,15 @@ extern "C"
 */
 enum GNUNET_BLOCK_Type
 {
-    /**
+  /**
-     * Any type of block, used as a wildcard when searching.  Should
+   * Any type of block, used as a wildcard when searching.  Should
-     * never be attached to a specific block.
+   * never be attached to a specific block.
-     */
+   */
  GNUNET_BLOCK_TYPE_ANY = 0,
-    /**
+  /**
-     * Data block (leaf) in the CHK tree.
+   * Data block (leaf) in the CHK tree.
-     */
+   */
  GNUNET_BLOCK_TYPE_FS_DBLOCK = 1,
    /**
@@ -57,67 +57,73 @@ enum GNUNET_BLOCK_Type
     */
  GNUNET_BLOCK_TYPE_FS_IBLOCK = 2,
-    /**
+  /**
-     * Type of a block representing a keyword search result.  Note that
+   * Legacy type, no longer in use.
-     * the values for KBLOCK, SBLOCK and NBLOCK must be consecutive.
+   */
-     */
  GNUNET_BLOCK_TYPE_FS_KBLOCK = 3,
-    /**
+  /**
-     * Type of a block that is used to advertise content in a namespace.
+   * Legacy type, no longer in use.
-     */
+   */
  GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,
-    /**
+  /**
-     * Type of a block that is used to advertise a namespace.
+   * 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.
+   * Type of a block representing a block to be encoded on demand from disk.
-     * Should never appear on the network directly.
+   * 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
+   * Type of a block that contains a HELLO for a peer (for
-     * DHT find-peer operations).
+   * DHT find-peer operations).
-     */
+   */
  GNUNET_BLOCK_TYPE_DHT_HELLO = 7,
-    /**
+  /**
-     * Block for testing.
+   * Block for testing.
-     */
+   */
  GNUNET_BLOCK_TYPE_TEST = 8,
+  
-    /**
+  /**
-     * Block for storing .gnunet-domains
+   * 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 .gnunet-domains
+   */
  GNUNET_BLOCK_TYPE_DNS = 10,
-    /**
+  /**
-     * Block for storing record data
+   * Block for storing record data
-     */
+   */
  GNUNET_BLOCK_TYPE_GNS_NAMERECORD = 11,
-    /**
+  /**
-     * Block for storing mesh peers
+   * Block for storing mesh peers
-     */
+   */
  GNUNET_BLOCK_TYPE_MESH_PEER = 20,
+  
-    /**
+  /**
-     * Block for finding peers by type
+   * Block for finding peers by type
-     */
+   */
  GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE = 21,
-    /**
+  /**
-     * Block to store a mesh regex state
+   * Block to store a mesh regex state
-     */
+   */
  GNUNET_BLOCK_TYPE_REGEX = 22,
-    /**
+  /**
-     * Block to store a mesh regex accepting state
+   * Block to store a mesh regex accepting state
-     */
+   */
  GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23
 };

diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 002d5c11b..ac9d9d5f8 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h
@@ -41,15 +41,15 @@ extern "C"
41	*/	41	*/
42	enum GNUNET_BLOCK_Type	42	enum GNUNET_BLOCK_Type
43	{	43	{
44	/**	44	/**
45	* Any type of block, used as a wildcard when searching. Should	45	* Any type of block, used as a wildcard when searching. Should
46	* never be attached to a specific block.	46	* never be attached to a specific block.
47	*/	47	*/
48	GNUNET_BLOCK_TYPE_ANY = 0,	48	GNUNET_BLOCK_TYPE_ANY = 0,
49		49
50	/**	50	/**
51	* Data block (leaf) in the CHK tree.	51	* Data block (leaf) in the CHK tree.
52	*/	52	*/
53	GNUNET_BLOCK_TYPE_FS_DBLOCK = 1,	53	GNUNET_BLOCK_TYPE_FS_DBLOCK = 1,
54		54
55	/**	55	/**
@@ -57,67 +57,73 @@ enum GNUNET_BLOCK_Type
57	*/	57	*/
58	GNUNET_BLOCK_TYPE_FS_IBLOCK = 2,	58	GNUNET_BLOCK_TYPE_FS_IBLOCK = 2,
59		59
60	/**	60	/**
61	* Type of a block representing a keyword search result. Note that	61	* Legacy type, no longer in use.
62	* the values for KBLOCK, SBLOCK and NBLOCK must be consecutive.	62	*/
63	*/
64	GNUNET_BLOCK_TYPE_FS_KBLOCK = 3,	63	GNUNET_BLOCK_TYPE_FS_KBLOCK = 3,
65		64
66	/**	65	/**
67	* Type of a block that is used to advertise content in a namespace.	66	* Legacy type, no longer in use.
68	*/	67	*/
69	GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,	68	GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,
70		69
71	/**	70	/**
72	* Type of a block that is used to advertise a namespace.	71	* Legacy type, no longer in use.
73	*/	72	*/
74	GNUNET_BLOCK_TYPE_FS_NBLOCK = 5,	73	GNUNET_BLOCK_TYPE_FS_NBLOCK = 5,
75		74
76	/**	75	/**
77	* Type of a block representing a block to be encoded on demand from disk.	76	* Type of a block representing a block to be encoded on demand from disk.
78	* Should never appear on the network directly.	77	* Should never appear on the network directly.
79	*/	78	*/
80	GNUNET_BLOCK_TYPE_FS_ONDEMAND = 6,	79	GNUNET_BLOCK_TYPE_FS_ONDEMAND = 6,
81		80
82	/**	81	/**
83	* Type of a block that contains a HELLO for a peer (for	82	* Type of a block that contains a HELLO for a peer (for
84	* DHT find-peer operations).	83	* DHT find-peer operations).
85	*/	84	*/
86	GNUNET_BLOCK_TYPE_DHT_HELLO = 7,	85	GNUNET_BLOCK_TYPE_DHT_HELLO = 7,
87		86
88	/**	87	/**
89	* Block for testing.	88	* Block for testing.
90	*/	89	*/
91	GNUNET_BLOCK_TYPE_TEST = 8,	90	GNUNET_BLOCK_TYPE_TEST = 8,
92		91
93	/**	92	/**
94	* Block for storing .gnunet-domains	93	* Type of a block representing any type of search result
95	*/	94	* (universal). Implemented in the context of #2564, replaces
		95	* SBLOCKS, KBLOCKS and NBLOCKS.
		96	*/
		97	GNUNET_BLOCK_TYPE_FS_UBLOCK = 9,
		98
		99	/**
		100	* Block for storing .gnunet-domains
		101	*/
96	GNUNET_BLOCK_TYPE_DNS = 10,	102	GNUNET_BLOCK_TYPE_DNS = 10,
97		103
98	/**	104	/**
99	* Block for storing record data	105	* Block for storing record data
100	*/	106	*/
101	GNUNET_BLOCK_TYPE_GNS_NAMERECORD = 11,	107	GNUNET_BLOCK_TYPE_GNS_NAMERECORD = 11,
102		108
103	/**	109	/**
104	* Block for storing mesh peers	110	* Block for storing mesh peers
105	*/	111	*/
106	GNUNET_BLOCK_TYPE_MESH_PEER = 20,	112	GNUNET_BLOCK_TYPE_MESH_PEER = 20,
107		113
108	/**	114	/**
109	* Block for finding peers by type	115	* Block for finding peers by type
110	*/	116	*/
111	GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE = 21,	117	GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE = 21,
112		118
113	/**	119	/**
114	* Block to store a mesh regex state	120	* Block to store a mesh regex state
115	*/	121	*/
116	GNUNET_BLOCK_TYPE_REGEX = 22,	122	GNUNET_BLOCK_TYPE_REGEX = 22,
117		123
118	/**	124	/**
119	* Block to store a mesh regex accepting state	125	* Block to store a mesh regex accepting state
120	*/	126	*/
121	GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23	127	GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23
122	};	128	};
123		129