From 1bcb11a931fab488e960ec6980ed4251e5f4231c Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Fri, 24 Feb 2012 17:42:29 +0000 Subject: [PATCH] -first try on blocks --- src/gns/block_gns.h | 93 +++++++++++++++++++++++++++ src/gns/plugin_block_gns.c | 128 +++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 src/gns/block_gns.h create mode 100644 src/gns/plugin_block_gns.c diff --git a/src/gns/block_gns.h b/src/gns/block_gns.h new file mode 100644 index 000000000..d34e33c5d --- /dev/null +++ b/src/gns/block_gns.h @@ -0,0 +1,93 @@ +/* + This file is part of GNUnet. + (C) 2012 Christian Grothoff (and other contributing authors) + + 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 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. + + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +/** + * @file include/block_gns.h + * @brief fs block formats (shared between fs and block) + * @author Martin Schanzenbach + */ +#ifndef BLOCK_GNS_H +#define BLOCK_GNS_H + +#include "gnunet_util_lib.h" + +GNUNET_NETWORK_STRUCT_BEGIN + +/** + * @brief a simgle record inside a record block + */ +struct GNSRecordBlock +{ + /** + * the record type + */ + uint32_t type GNUNET_PACKED; + + /** + * expiration time of the record + */ + struct GNUNET_TIME_AbsoluteNBO expiration; + + /** + * length of the data + */ + uint32_t data_length GNUNET_PACKED; + + /* record flags */ + uint32_t flags GNUNET_PACKED; + + //Class of the record? + + /* followed by the record data */ +} + +/** + * @brief a record block for a given name of a single authority + */ +struct GNSNameRecordBlock +{ + + /** + * GNUNET_RSA_Signature using RSA-key generated from the records. + */ + struct GNUNET_CRYPTO_RsaSignature signature; + + /** + * What is being signed and why? + */ + struct GNUNET_CRYPTO_RsaSignaturePurpose purpose; + + /** + * The public key of the authority + */ + struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key; + + /* 0-terminated name here */ + + /* number of records that follow */ + uint32_t rd_num GNUNET_PACKED; + + /* variable-size GNSRecordBlocks follows here */ + + +}; + +GNUNET_NETWORK_STRUCT_END +#endif diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c new file mode 100644 index 000000000..33699a32c --- /dev/null +++ b/src/gns/plugin_block_gns.c @@ -0,0 +1,128 @@ +/* + This file is part of GNUnet + (C) 2010 Christian Grothoff (and other contributing authors) + + 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 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. + + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +/** + * @file gns/plugin_block_gns.c + * @brief blocks used for GNS records + * @author Martin Schanzenbach + */ + +#include "platform.h" +#include "gnunet_block_plugin.h" +#include "block_gns.h" +#include "gnunet_signatures.h" + +/** + * Number of bits we set per entry in the bloomfilter. + * Do not change! -from fs + */ +#define BLOOMFILTER_K 16 + +/** + * Function called to validate a reply or a request. For + * request evaluation, simply pass "NULL" for the reply_block. + * Note that it is assumed that the reply has already been + * matched to the key (and signatures checked) as it would + * be done with the "get_key" function. + * + * @param cls closure + * @param type block type + * @param query original query (hash) + * @param bf pointer to bloom filter associated with query; possibly updated (!) + * @param bf_mutator mutation value for bf + * @param xquery extrended query data (can be NULL, depending on type) + * @param xquery_size number of bytes in xquery + * @param reply_block response to validate + * @param reply_block_size number of bytes in reply block + * @return characterization of result + */ +static enum GNUNET_BLOCK_EvaluationResult +block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type, + const GNUNET_HashCode * query, + struct GNUNET_CONTAINER_BloomFilter **bf, + int32_t bf_mutator, const void *xquery, + size_t xquery_size, const void *reply_block, + size_t reply_block_size) +{ + if (type != GNUNET_BLOCK_TYPE_GNS_RECORD) + return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED; + + //FIXME check signatures here + return GNUNET_BLOCK_EVALUATION_REQUEST_VALID; +} + + +/** + * Function called to obtain the key for a block. + * + * @param cls closure + * @param type block type + * @param block block to get the key for + * @param block_size number of bytes in block + * @param key set to the key (query) for the given block + * @return GNUNET_OK on success, GNUNET_SYSERR if type not supported + * (or if extracting a key from a block of this type does not work) + */ +static int +block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type, + const void *block, size_t block_size, + GNUNET_HashCode * key) +{ + if (type != GNUNET_BLOCK_TYPE_GNS_RECORD) + return GNUNET_NO; + //FIXME calculate key from name and hash(pkey) here + return GNUNET_OK; +} + + +/** + * Entry point for the plugin. + */ +void * +libgnunet_plugin_block_gns_init (void *cls) +{ + static enum GNUNET_BLOCK_Type types[] = + { + GNUNET_BLOCK_TYPE_GNS_RECORD, + GNUNET_BLOCK_TYPE_ANY /* end of list */ + }; + struct GNUNET_BLOCK_PluginFunctions *api; + + api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions)); + api->evaluate = &block_plugin_gns_evaluate; + api->get_key = &block_plugin_gns_get_key; + api->types = types; + return api; +} + + +/** + * Exit point from the plugin. + */ +void * +libgnunet_plugin_block_gns_done (void *cls) +{ + struct GNUNET_TRANSPORT_PluginFunctions *api = cls; + + GNUNET_free (api); + return NULL; +} + +/* end of plugin_block_gns.c */ -- 2.25.1