X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgnunet_block_lib.h;h=c85d3702bbc9bbea84c0aeba4e7514ddc8e2d942;hb=a5a54c51011a9498e72b2a9341b35333c6beef1a;hp=0f0fee499779f014c6b597e5ac9b0ac1dbe0bc73;hpb=a3882b58f1c5976677aa65b0af8a48e8e946b06e;p=oweals%2Fgnunet.git diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 0f0fee499..c85d3702b 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h @@ -2,20 +2,20 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: AGPL3.0-or-later */ /** @@ -111,6 +111,11 @@ enum GNUNET_BLOCK_Type */ GNUNET_BLOCK_TYPE_GNS_NAMERECORD = 11, + /** + * Block type for a revocation message by which a key is revoked. + */ + GNUNET_BLOCK_TYPE_REVOCATION = 12, + /** * Block to store a cadet regex state */ @@ -119,7 +124,19 @@ enum GNUNET_BLOCK_Type /** * Block to store a cadet regex accepting state */ - GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23 + 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, }; @@ -245,6 +262,7 @@ struct GNUNET_BLOCK_Group; * @param nonce random value used to seed the group creation * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh + * @param ... type-specific additional data, can be empty * @return block group handle, NULL if block groups are not supported * by this @a type of block (this is not an error) */ @@ -253,13 +271,15 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx, enum GNUNET_BLOCK_Type type, uint32_t nonce, const void *raw_data, - size_t raw_data_size); + size_t raw_data_size, + ...); /** * Serialize state of a block group. * * @param bg group to serialize + * @param[out] nonce set to the nonce of the @a bg * @param[out] raw_data set to the serialized state * @param[out] raw_data_size set to the number of bytes in @a raw_data * @return #GNUNET_OK on success, #GNUNET_NO if serialization is not @@ -267,6 +287,7 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx, */ int GNUNET_BLOCK_group_serialize (struct GNUNET_BLOCK_Group *bg, + uint32_t *nonce, void **raw_data, size_t *raw_data_size); @@ -289,10 +310,9 @@ GNUNET_BLOCK_group_destroy (struct GNUNET_BLOCK_Group *bg); * * @param ctx block contxt * @param type block type + * @param group block group to use for evaluation * @param eo evaluation options to control evaluation * @param query original query (hash) - * @param bf pointer to bloom filter associated with query; possibly updated (!) - * @param bf_mutator mutation value for @a bf * @param xquery extrended query data (can be NULL, depending on type) * @param xquery_size number of bytes in @a xquery * @param reply_block response to validate @@ -302,10 +322,9 @@ GNUNET_BLOCK_group_destroy (struct GNUNET_BLOCK_Group *bg); enum GNUNET_BLOCK_EvaluationResult GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, enum GNUNET_BLOCK_Type type, + struct GNUNET_BLOCK_Group *group, enum GNUNET_BLOCK_EvaluationOptions eo, const struct GNUNET_HashCode *query, - struct GNUNET_CONTAINER_BloomFilter **bf, - int32_t bf_mutator, const void *xquery, size_t xquery_size, const void *reply_block, @@ -330,24 +349,41 @@ GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, enum GNUNET_BLOCK_Type type, const void *block, size_t block_size, - struct GNUNET_HashCode * key); - + struct GNUNET_HashCode *key); /** - * Construct a bloom filter that would filter out the given - * results. + * Update block group to filter out the given results. Note that the + * use of a hash for seen results implies that the caller magically + * knows how the specific block engine hashes for filtering + * duplicates, so this API may not always apply. * * @param bf_mutator mutation value to use * @param seen_results results already seen * @param seen_results_count number of entries in @a seen_results - * @return NULL if seen_results_count is 0, otherwise a BF - * that would match the given results. + * @return #GNUNET_SYSERR if not supported, #GNUNET_OK on success + */ +int +GNUNET_BLOCK_group_set_seen (struct GNUNET_BLOCK_Group *bg, + const struct GNUNET_HashCode *seen_results, + unsigned int seen_results_count); + + +/** + * Try merging two block groups. Afterwards, @a bg1 should remain + * valid and contain the rules from both @a bg1 and @bg2, and + * @a bg2 should be destroyed (as part of this call). The latter + * should happen even if merging is not supported. + * + * @param[in,out] bg1 first group to merge, is updated + * @param bg2 second group to merge, is destroyed + * @return #GNUNET_OK on success, + * #GNUNET_NO if merge failed due to different nonce + * #GNUNET_SYSERR if merging is not supported */ -struct GNUNET_CONTAINER_BloomFilter * -GNUNET_BLOCK_construct_bloomfilter (int32_t bf_mutator, - const struct GNUNET_HashCode *seen_results, - unsigned int seen_results_count); +int +GNUNET_BLOCK_group_merge (struct GNUNET_BLOCK_Group *bg1, + struct GNUNET_BLOCK_Group *bg2); #if 0 /* keep Emacsens' auto-indent happy */