/*
* This file is part of GNUnet
- * Copyright (C) 2009-2015 GNUnet e.V.
+ * Copyright (C) 2009-2015, 2018 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
* @file namestore/plugin_namestore_flat.c
* @brief file-based namestore backend
* @author Martin Schanzenbach
+ * @author Christian Grothoff
*/
#include "platform.h"
/**
* PKEY to look for in zone to name
*/
- struct GNUNET_CRYPTO_EcdsaPublicKey *iter_pkey;
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *iter_pkey;
/**
* Iteration result found
};
+
struct FlatFileEntry
{
/**
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->cfg,
"namestore-flat",
- "FILENAME", &afsdir))
+ "FILENAME",
+ &afsdir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "namestore-flat", "FILENAME");
+ "namestore-flat",
+ "FILENAME");
return GNUNET_SYSERR;
}
- if (GNUNET_OK != GNUNET_DISK_file_test (afsdir))
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_test (afsdir))
{
- if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (afsdir))
+ if (GNUNET_OK !=
+ GNUNET_DISK_directory_create_for_file (afsdir))
{
GNUNET_break (0);
GNUNET_free (afsdir);
if (NULL == label)
break;
line = strtok (NULL, "\n");
- entry = GNUNET_malloc (sizeof (struct FlatFileEntry));
- if (1 != sscanf (rvalue, "%lu", &entry->rvalue))
+ entry = GNUNET_new (struct FlatFileEntry);
+ if (1 != sscanf (rvalue,
+ "%lu",
+ &entry->rvalue))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Error parsing entry\n");
GNUNET_free (entry);
break;
}
- if (1 != sscanf (record_count, "%u", &entry->record_count))
+ if (1 != sscanf (record_count,
+ "%u",
+ &entry->record_count))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Error parsing entry\n");
break;
}
entry->label = GNUNET_strdup (label);
- record_data_size = GNUNET_STRINGS_base64_decode (record_data_b64,
- strlen (record_data_b64),
- &record_data);
+ record_data_size
+ = GNUNET_STRINGS_base64_decode (record_data_b64,
+ strlen (record_data_b64),
+ &record_data);
entry->record_data =
- GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Data) * entry->record_count);
- if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (record_data_size,
- record_data,
- entry->record_count,
- entry->record_data))
+ GNUNET_new_array (entry->record_count,
+ struct GNUNET_GNSRECORD_Data);
+ if (GNUNET_OK !=
+ GNUNET_GNSRECORD_records_deserialize (record_data_size,
+ record_data,
+ entry->record_count,
+ entry->record_data))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Unable to deserialize record %s\n", label);
+ "Unable to deserialize record %s\n",
+ label);
GNUNET_free (entry->label);
GNUNET_free (entry);
GNUNET_free (record_data);
(char**)&entry->private_key);
key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
key = GNUNET_malloc (strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
- GNUNET_memcpy (key, label, strlen (label));
+ GNUNET_memcpy (key,
+ label,
+ strlen (label));
GNUNET_memcpy (key+strlen(label),
- entry->private_key,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
+ entry->private_key,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
GNUNET_CRYPTO_hash (key,
key_len,
&hkey);
* Store values in hashmap in file and free data
*
* @param plugin the plugin context
+ * @param key key in the map
+ * @param value a `struct FlatFileEntry`
*/
static int
store_and_free_entries (void *cls,
char *record_data_b64;
size_t data_size;
+ (void) key;
GNUNET_STRINGS_base64_encode ((char*)entry->private_key,
sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey),
&zone_private_key);
entry->record_data);
{
char data[data_size];
-
- if (data_size !=
- GNUNET_GNSRECORD_records_serialize (entry->record_count,
- entry->record_data,
- data_size,
- data))
+ ssize_t ret;
+
+ ret = GNUNET_GNSRECORD_records_serialize (entry->record_count,
+ entry->record_data,
+ data_size,
+ data);
+ if ( (ret < 0) ||
+ (data_size != (size_t) ret) )
{
GNUNET_break (0);
GNUNET_free (zone_private_key);
database_shutdown (struct Plugin *plugin)
{
struct GNUNET_DISK_FileHandle *fh;
+
fh = GNUNET_DISK_file_open (plugin->fn,
GNUNET_DISK_OPEN_CREATE |
GNUNET_DISK_OPEN_TRUNCATE |
* @return #GNUNET_OK on success, else #GNUNET_SYSERR
*/
static int
-namestore_store_records (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+namestore_flat_store_records (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct Plugin *plugin = cls;
uint64_t rvalue;
char *key;
struct GNUNET_HashCode hkey;
struct FlatFileEntry *entry;
- int i;
- rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
+ rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX);
key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
key = GNUNET_malloc (key_len);
GNUNET_memcpy (key, label, strlen (label));
if (0 < rd_count)
{
- entry = GNUNET_malloc (sizeof (struct FlatFileEntry));
- entry->private_key = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
+ entry = GNUNET_new (struct FlatFileEntry);
+ entry->private_key = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
GNUNET_asprintf (&entry->label,
label,
strlen (label));
GNUNET_memcpy (entry->private_key,
- zone_key,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
+ zone_key,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
entry->rvalue = rvalue;
entry->record_count = rd_count;
- entry->record_data = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Data) * rd_count);
- for (i = 0; i < rd_count; i++)
+ entry->record_data = GNUNET_new_array (rd_count,
+ struct GNUNET_GNSRECORD_Data);
+ for (unsigned int i = 0; i < rd_count; i++)
{
entry->record_data[i].expiration_time = rd[i].expiration_time;
entry->record_data[i].record_type = rd[i].record_type;
* @return #GNUNET_OK on success, else #GNUNET_SYSERR
*/
static int
-namestore_lookup_records (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const char *label,
- GNUNET_NAMESTORE_RecordIterator iter,
- void *iter_cls)
+namestore_flat_lookup_records (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ GNUNET_NAMESTORE_RecordIterator iter,
+ void *iter_cls)
{
struct Plugin *plugin = cls;
struct FlatFileEntry *entry;
size_t key_len;
if (NULL == zone)
- {
return GNUNET_SYSERR;
- }
key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
key = GNUNET_malloc (key_len);
- GNUNET_memcpy (key, label, strlen (label));
+ GNUNET_memcpy (key,
+ label,
+ strlen (label));
GNUNET_memcpy (key+strlen(label),
- zone,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
+ zone,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
GNUNET_CRYPTO_hash (key,
key_len,
&hkey);
GNUNET_free (key);
- entry = GNUNET_CONTAINER_multihashmap_get (plugin->hm, &hkey);
+ entry = GNUNET_CONTAINER_multihashmap_get (plugin->hm,
+ &hkey);
if (NULL == entry)
return GNUNET_NO;
if (NULL != iter)
- iter (iter_cls, entry->private_key, entry->label, entry->record_count, entry->record_data);
+ iter (iter_cls,
+ entry->private_key,
+ entry->label,
+ entry->record_count,
+ entry->record_data);
return GNUNET_YES;
}
+/**
+ * Closure for #iterate_zones.
+ */
+struct IterateContext
+{
+ /**
+ * How many more records should we skip before returning results?
+ */
+ uint64_t offset;
+
+ /**
+ * How many more records should we return?
+ */
+ uint64_t limit;
+
+ /**
+ * Target zone.
+ */
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone;
+
+ /**
+ * Function to call on each record.
+ */
+ GNUNET_NAMESTORE_RecordIterator iter;
+
+ /**
+ * Closure for @e iter.
+ */
+ void *iter_cls;
+
+};
+
+
+/**
+ * Helper function for #namestore_flat_iterate_records().
+ *
+ * @param cls a `struct IterateContext`
+ * @param key unused
+ * @param value a `struct FlatFileEntry`
+ * @return #GNUNET_YES to continue the iteration
+ */
static int
iterate_zones (void *cls,
const struct GNUNET_HashCode *key,
void *value)
{
- struct Plugin *plugin = cls;
+ struct IterateContext *ic = cls;
struct FlatFileEntry *entry = value;
- if ((plugin->target_offset > plugin->offset) ||
- ( (NULL != plugin->iter_zone) &&
- (0 != memcmp (entry->private_key,
- plugin->iter_zone,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))))) {
- plugin->offset++;
+ (void) key;
+ if (0 == ic->limit)
+ return GNUNET_NO;
+ if ( (NULL != ic->zone) &&
+ (0 != memcmp (entry->private_key,
+ ic->zone,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+ return GNUNET_YES;
+ if (ic->offset > 0)
+ {
+ ic->offset--;
return GNUNET_YES;
}
- plugin->iter (plugin->iter_cls,
- entry->private_key,
- entry->label,
- entry->record_count,
- entry->record_data);
- plugin->iter_result_found = GNUNET_YES;
- return GNUNET_NO;
+ ic->iter (ic->iter_cls,
+ entry->private_key,
+ entry->label,
+ entry->record_count,
+ entry->record_data);
+ ic->limit--;
+ if (0 == ic->limit)
+ return GNUNET_NO;
+ return GNUNET_YES;
}
+
/**
* Iterate over the results for a particular key and zone in the
* datastore. Will return at most one result to the iterator.
* @param cls closure (internal context for the plugin)
* @param zone hash of public key of the zone, NULL to iterate over all zones
* @param offset offset in the list of all matching records
+ * @param limit maximum number of results to return to @a iter
* @param iter function to call with the result
* @param iter_cls closure for @a iter
- * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_NO if there were no more results, #GNUNET_SYSERR on error
*/
static int
-namestore_iterate_records (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- uint64_t offset,
- GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
+namestore_flat_iterate_records (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ uint64_t offset,
+ uint64_t limit,
+ GNUNET_NAMESTORE_RecordIterator iter,
+ void *iter_cls)
{
struct Plugin *plugin = cls;
- plugin->target_offset = offset;
- plugin->offset = 0;
- plugin->iter = iter;
- plugin->iter_cls = iter_cls;
- plugin->iter_zone = zone;
- plugin->iter_result_found = GNUNET_NO;
+ struct IterateContext ic;
+
+ ic.offset = offset;
+ ic.limit = limit;
+ ic.iter = iter;
+ ic.iter_cls = iter_cls;
+ ic.zone = zone;
GNUNET_CONTAINER_multihashmap_iterate (plugin->hm,
&iterate_zones,
- plugin);
- return plugin->iter_result_found;
+ &ic);
+ return (0 == ic.limit) ? GNUNET_OK : GNUNET_NO;
}
+
static int
zone_to_name (void *cls,
const struct GNUNET_HashCode *key,
{
struct Plugin *plugin = cls;
struct FlatFileEntry *entry = value;
- int i;
+ (void) key;
if (0 != memcmp (entry->private_key,
plugin->iter_zone,
sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
return GNUNET_YES;
- for (i = 0; i < entry->record_count; i++) {
+ for (unsigned int i = 0; i < entry->record_count; i++)
+ {
if (GNUNET_GNSRECORD_TYPE_PKEY != entry->record_data[i].record_type)
continue;
if (0 == memcmp (plugin->iter_pkey,
}
}
-
return GNUNET_YES;
}
+
/**
* Look for an existing PKEY delegation record for a given public key.
* Returns at most one result to the iterator.
* @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
*/
static int
-namestore_zone_to_name (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
- GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
+namestore_flat_zone_to_name (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
+ GNUNET_NAMESTORE_RecordIterator iter,
+ void *iter_cls)
{
struct Plugin *plugin = cls;
+ /* FIXME: maybe use separate closure to better handle
+ recursive calls? */
+ plugin->iter = iter;
+ plugin->iter_cls = iter_cls;
+ plugin->iter_zone = zone;
+ plugin->iter_pkey = value_zone;
+ plugin->iter_result_found = GNUNET_NO;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Performing reverse lookup for `%s'\n",
GNUNET_GNSRECORD_z2s (value_zone));
-
GNUNET_CONTAINER_multihashmap_iterate (plugin->hm,
&zone_to_name,
plugin);
-
-
return plugin->iter_result_found;
}
if (NULL != plugin.cfg)
return NULL; /* can only initialize once! */
- memset (&plugin, 0, sizeof (struct Plugin));
+ memset (&plugin,
+ 0,
+ sizeof (struct Plugin));
plugin.cfg = cfg;
if (GNUNET_OK != database_setup (&plugin))
{
}
api = GNUNET_new (struct GNUNET_NAMESTORE_PluginFunctions);
api->cls = &plugin;
- api->store_records = &namestore_store_records;
- api->iterate_records = &namestore_iterate_records;
- api->zone_to_name = &namestore_zone_to_name;
- api->lookup_records = &namestore_lookup_records;
+ api->store_records = &namestore_flat_store_records;
+ api->iterate_records = &namestore_flat_iterate_records;
+ api->zone_to_name = &namestore_flat_zone_to_name;
+ api->lookup_records = &namestore_flat_lookup_records;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("flat file database running\n"));
return api;
projects / oweals / gnunet.git / blobdiff