[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28574 - in gnunet/src: gns include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r28574 - in gnunet/src: gns include |
|
Date: |
Tue, 13 Aug 2013 18:40:42 +0200 |
Author: grothoff
Date: 2013-08-13 18:40:41 +0200 (Tue, 13 Aug 2013)
New Revision: 28574
Removed:
gnunet/src/include/block_gns.h
Modified:
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/plugin_block_gns.c
gnunet/src/include/Makefile.am
gnunet/src/include/gnunet_gns_service.h
gnunet/src/include/gnunet_namestore_service.h
Log:
-working on new, simplified GNS API
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-08-13 16:40:20 UTC (rev 28573)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-08-13 16:40:41 UTC (rev 28574)
@@ -31,7 +31,6 @@
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_statistics_service.h"
-#include "block_gns.h"
#include "gns.h"
#include "gns_common.h"
#include "gnunet-service-gns_resolver.h"
Modified: gnunet/src/gns/plugin_block_gns.c
===================================================================
--- gnunet/src/gns/plugin_block_gns.c 2013-08-13 16:40:20 UTC (rev 28573)
+++ gnunet/src/gns/plugin_block_gns.c 2013-08-13 16:40:41 UTC (rev 28574)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2010, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2010-2013 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
@@ -27,7 +27,6 @@
#include "platform.h"
#include "gnunet_block_plugin.h"
#include "gnunet_namestore_service.h"
-#include "block_gns.h"
#include "gnunet_signatures.h"
#include "gns_common.h"
@@ -47,49 +46,32 @@
* @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 bf pointer to bloom filter associated with @a query; possibly
updated (!)
+ * @param bf_mutator mutation value for @a bf
+ * @param xquery extrended query data (can be NULL, depending on @a type)
+ * @param xquery_size number of bytes in @a xquery
* @param reply_block response to validate
- * @param reply_block_size number of bytes in reply block
+ * @param reply_block_size number of bytes in @a reply_block
* @return characterization of result
*/
static enum GNUNET_BLOCK_EvaluationResult
block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
- const struct GNUNET_HashCode * query,
+ 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,
size_t reply_block_size)
{
- const struct GNSNameRecordBlock *nrb;
- const char* name;
- const char *name_end;
- const char *rd_data;
- struct GNUNET_HashCode query_key;
+ const struct GNUNET_NAMESTORE_Block *block;
+ struct GNUNET_HashCode h;
+ struct GNUNET_HashCode chash;
struct GNUNET_HashCode mhash;
- struct GNUNET_HashCode chash;
- struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
- struct GNUNET_CRYPTO_HashAsciiEncoded xor_exp;
- struct GNUNET_CRYPTO_HashAsciiEncoded xor_got;
- uint32_t rd_count;
- size_t rd_len;
- size_t name_len;
- uint32_t record_xquery;
- unsigned int record_match;
-
- //GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "RB SIZE %d\n", reply_block_size);
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
- if (reply_block == NULL)
+ if (NULL == reply_block)
{
- /**
- * check if request is valid
- * FIXME we could check for the record types here
- **/
- if (xquery_size < sizeof(uint32_t))
+ if (0 != xquery_size)
{
GNUNET_break_op (0);
return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
@@ -98,111 +80,47 @@
}
/* this is a reply */
-
- nrb = (const struct GNSNameRecordBlock *)reply_block;
- name = (const char*) &nrb[1];
- name_end = memchr (name, 0, reply_block_size - sizeof (struct
GNSNameRecordBlock));
- if (NULL == name_end)
- {
- GNUNET_break_op (0);
- return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
- }
- name_len = (name_end - name) + 1;
- GNUNET_CRYPTO_short_hash (&nrb->public_key,
- sizeof(nrb->public_key),
- &pkey_hash);
- GNUNET_GNS_get_key_for_record (name, &pkey_hash, &query_key);
-
- GNUNET_CRYPTO_hash_to_enc (&query_key, &xor_exp);
- GNUNET_CRYPTO_hash_to_enc (query, &xor_got);
-
- //GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- // "BLOCK_TEST for %s got %s expected %s\n",
- // name, (char*) &xor_got, (char*) &xor_exp);
-
- /* Check query key against public key */
- if (0 != GNUNET_CRYPTO_hash_cmp(query, &query_key))
- {
- GNUNET_break_op (0);
- return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
- }
-
- record_match = 0;
- rd_count = ntohl(nrb->rd_count);
- rd_data = &name[name_len];
- rd_len = reply_block_size - (name_len
- + sizeof(struct GNSNameRecordBlock));
- {
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- unsigned int i;
- uint64_t exp = UINT64_MAX;
- struct GNUNET_TIME_Absolute et = GNUNET_TIME_UNIT_FOREVER_ABS;
-
- if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_len,
- rd_data,
- rd_count,
- rd))
+ if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Data invalid (%d bytes, %d records)\n", rd_len, rd_count);
+ GNUNET_break_op (0);
return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
}
-
- if (xquery_size < sizeof(uint32_t))
- record_xquery = 0;
- else
- record_xquery = ntohl(*((uint32_t*)xquery));
-
- for (i=0; i<rd_count; i++)
- {
- GNUNET_break (0 == (rd[i].flags &
GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
- exp = GNUNET_MIN (exp, rd[i].expiration_time);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got record of size %d expiration %u\n",
- rd[i].data_size, rd[i].expiration_time);
- if ((record_xquery != 0)
- && (rd[i].record_type == record_xquery))
- {
- record_match++;
- }
+ block = reply_block;
+ if (ntohs (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EccSignature)
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) !=
+ reply_block_size)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
}
- et.abs_value_us = exp;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Verifying signature of %d records for name %s with expiration
of %s\n",
- rd_count, name,
- GNUNET_STRINGS_absolute_time_to_string (et));
-
- if (GNUNET_OK !=
- GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
- et,
- name,
- rd_count,
- rd,
- &nrb->signature))
+ GNUNET_CRYPTO_hash (&block->derived_key,
+ sizeof (block->derived_key),
+ &h);
+ if (0 != memcmp (&h, query, sizeof (struct GNUNET_HashCode)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Signature invalid for %s\n", name);
GNUNET_break_op (0);
return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
}
- }
-
- if (NULL != bf)
- {
- GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
- GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
- if (NULL != *bf)
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_block_verify (block))
{
- if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test(*bf, &mhash))
- return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
}
- else
+ if (NULL != bf)
{
- *bf = GNUNET_CONTAINER_bloomfilter_init(NULL, 8, BLOOMFILTER_K);
+ GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
+ GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
+ if (NULL != *bf)
+ {
+ if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test(*bf, &mhash))
+ return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+ }
+ else
+ {
+ *bf = GNUNET_CONTAINER_bloomfilter_init(NULL, 8, BLOOMFILTER_K);
+ }
+ GNUNET_CONTAINER_bloomfilter_add(*bf, &mhash);
}
- GNUNET_CONTAINER_bloomfilter_add(*bf, &mhash);
- }
return GNUNET_BLOCK_EVALUATION_OK_MORE;
}
@@ -212,35 +130,30 @@
*
* @param cls closure
* @param type block type
- * @param block block to get the key for
- * @param block_size number of bytes in block
+ * @param reply_block block to get the key for
+ * @param reply_block_size number of bytes in @a reply_block
* @param key set to the key (query) for the given block
- * @return GNUNET_OK on success, GNUNET_SYSERR if type not supported
+ * @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,
- struct GNUNET_HashCode * key)
+ const void *reply_block, size_t reply_block_size,
+ struct GNUNET_HashCode *key)
{
- struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
- const struct GNSNameRecordBlock *nrb = block;
- const char *name;
+ const struct GNUNET_NAMESTORE_Block *block;
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
return GNUNET_SYSERR;
- name = (const char *) &nrb[1];
- if (NULL == memchr (name, '\0',
- block_size - sizeof (struct GNSNameRecordBlock)))
- {
- /* malformed, no 0-termination in name */
- GNUNET_break_op (0);
- return GNUNET_SYSERR;
- }
- GNUNET_CRYPTO_short_hash (&nrb->public_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &pkey_hash);
- GNUNET_GNS_get_key_for_record (name, &pkey_hash, key);
+ if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ block = reply_block;
+ GNUNET_CRYPTO_hash (&block->derived_key,
+ sizeof (block->derived_key),
+ key);
return GNUNET_OK;
}
@@ -258,7 +171,7 @@
};
struct GNUNET_BLOCK_PluginFunctions *api;
- api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+ api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
api->evaluate = &block_plugin_gns_evaluate;
api->get_key = &block_plugin_gns_get_key;
api->types = types;
Modified: gnunet/src/include/Makefile.am
===================================================================
--- gnunet/src/include/Makefile.am 2013-08-13 16:40:20 UTC (rev 28573)
+++ gnunet/src/include/Makefile.am 2013-08-13 16:40:41 UTC (rev 28574)
@@ -13,7 +13,6 @@
gauger.h \
block_fs.h \
block_dns.h \
- block_gns.h \
block_mesh.h \
block_regex.h
Deleted: gnunet/src/include/block_gns.h
===================================================================
--- gnunet/src/include/block_gns.h 2013-08-13 16:40:20 UTC (rev 28573)
+++ gnunet/src/include/block_gns.h 2013-08-13 16:40:41 UTC (rev 28574)
@@ -1,61 +0,0 @@
-/*
- 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 record block for a given name of a single authority
- */
-struct GNSNameRecordBlock
-{
-
- /**
- * The public key of the authority
- */
- struct GNUNET_CRYPTO_EccPublicKey public_key;
-
- /**
- * GNUNET_RSA_Signature using RSA-key generated from the records.
- */
- struct GNUNET_CRYPTO_EccSignature signature;
-
- /**
- * number of records that follow
- */
- uint32_t rd_count GNUNET_PACKED;
-
- /* 0-terminated name here */
-
- /* variable-size serialized namestore record data */
-
-};
-
-GNUNET_NETWORK_STRUCT_END
-#endif
Modified: gnunet/src/include/gnunet_gns_service.h
===================================================================
--- gnunet/src/include/gnunet_gns_service.h 2013-08-13 16:40:20 UTC (rev
28573)
+++ gnunet/src/include/gnunet_gns_service.h 2013-08-13 16:40:41 UTC (rev
28574)
@@ -154,7 +154,6 @@
* Initialize the connection with the GNS service.
*
* @param cfg configuration to use
- *
* @return handle to the GNS service, or NULL on error
*/
struct GNUNET_GNS_Handle *
@@ -187,56 +186,34 @@
/**
- * Perform an asynchronous lookup operation on the GNS
- * in the default zone.
+ * Perform an asynchronous lookup operation on the GNS.
*
* @param handle handle to the GNS service
* @param name the name to look up
- * @param type the GNUNET_GNS_RecordType to look for
- * @param only_cached GNUNET_NO to only check locally not DHT for performance
- * @param shorten_key the private key of the shorten zone (can be NULL)
+ * @param zone zone to look in
+ * @param type the record type to look for
+ * @param only_cached #GNUNET_NO to only check locally (not in the DHT)
+ * @param shorten_zone_key the private key of the shorten zone (can be NULL);
+ * specify to enable automatic shortening (given a PSEU
+ * record, if a given pseudonym is not yet used in the
+ * shorten zone, we automatically add the respective zone
+ * under that name)
* @param proc function to call on result
* @param proc_cls closure for processor
- *
* @return handle to the queued request
*/
struct GNUNET_GNS_LookupRequest*
GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
- const char * name,
+ const char *name,
+ const struct GNUNET_CRYPTO_EccPublicKey *zone,
enum GNUNET_GNS_RecordType type,
int only_cached,
- struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key,
GNUNET_GNS_LookupResultProcessor proc,
void *proc_cls);
/**
- * Perform an asynchronous lookup operation on the GNS
- * in the zone specified by 'zone'.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param zone the zone to start the resolution in
- * @param type the GNUNET_GNS_RecordType to look for
- * @param only_cached GNUNET_YES to only check locally not DHT for performance
- * @param shorten_key the private key of the shorten zone (can be NULL)
- * @param proc function to call on result
- * @param proc_cls closure for processor
- *
- * @return handle to the queued request
- */
-struct GNUNET_GNS_LookupRequest*
-GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
- const char * name,
- struct GNUNET_CRYPTO_ShortHashCode *zone,
- enum GNUNET_GNS_RecordType type,
- int only_cached,
- struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
- GNUNET_GNS_LookupResultProcessor proc,
- void *proc_cls);
-
-
-/**
* Cancel pending lookup request
*
* @param lr the lookup request to cancel
@@ -244,71 +221,8 @@
void
GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr);
-/* *************** Standard API: shorten ******************* */
-/**
- * Processor called on for a name shortening result
- * called only once
- *
- * @param cls closure
- * @param short_name the shortened name or NULL if no result / error
- */
-typedef void (*GNUNET_GNS_ShortenResultProcessor) (void *cls,
- const char* short_name);
-
-
-/**
- * Perform a name shortening operation on the GNS.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param private_zone the public zone of the private zone
- * @param shorten_zone the public zone of the shorten zone
- * @param proc function to call on result
- * @param proc_cls closure for processor
- * @return handle to the operation
- */
-struct GNUNET_GNS_ShortenRequest*
-GNUNET_GNS_shorten (struct GNUNET_GNS_Handle *handle,
- const char * name,
- struct GNUNET_CRYPTO_ShortHashCode *private_zone,
- struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
- GNUNET_GNS_ShortenResultProcessor proc,
- void *proc_cls);
-
-
-/**
- * Perform a name shortening operation on the GNS.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param private_zone the public zone of the private zone
- * @param shorten_zone the public zone of the shorten zone
- * @param zone the zone to start the resolution in
- * @param proc function to call on result
- * @param proc_cls closure for processor
- * @return handle to the operation
- */
-struct GNUNET_GNS_ShortenRequest*
-GNUNET_GNS_shorten_zone (struct GNUNET_GNS_Handle *handle,
- const char * name,
- struct GNUNET_CRYPTO_ShortHashCode *private_zone,
- struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
- struct GNUNET_CRYPTO_ShortHashCode *zone,
- GNUNET_GNS_ShortenResultProcessor proc,
- void *proc_cls);
-
-
-/**
- * Cancel pending shorten request
- *
- * @param sr the lookup request to cancel
- */
-void
-GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr);
-
-
/* *************** Standard API: get authority ******************* */
Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h 2013-08-13 16:40:20 UTC
(rev 28573)
+++ gnunet/src/include/gnunet_namestore_service.h 2013-08-13 16:40:41 UTC
(rev 28574)
@@ -226,6 +226,10 @@
};
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
/**
* Information we have in an encrypted block with record data (i.e. in the
DHT).
*/
@@ -256,6 +260,7 @@
/* followed by encrypted data */
};
+GNUNET_NETWORK_STRUCT_END
/**
* Store an item in the namestore. If the item is already present,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28574 - in gnunet/src: gns include,
gnunet <=