/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (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
*/
struct GNUNET_NAMESTORE_ZoneIteration
{
+ /**
+ * Next element in the DLL
+ */
struct GNUNET_NAMESTORE_ZoneIteration *next;
+
+ /**
+ * Previous element in the DLL
+ */
struct GNUNET_NAMESTORE_ZoneIteration *prev;
- struct GNUNET_NAMESTORE_Client * client;
+ /**
+ * Namestore client which intiated this zone iteration
+ */
+ struct GNUNET_NAMESTORE_Client *client;
+ /**
+ * GNUNET_YES if we iterate over a specific zone
+ * GNUNET_NO if we iterate over all zones
+ */
int has_zone;
- GNUNET_HashCode zone;
+ /**
+ * Hash of the specific zone if 'has_zone' is GNUNET_YES,
+ * othwerwise set to '\0'
+ */
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+ /**
+ * The operation id fot the zone iteration in the response for the client
+ */
uint64_t request_id;
- uint32_t offset;
+ /**
+ * Offset of the zone iteration used to address next result of the zone
+ * iteration in the store
+ *
+ * Initialy set to 0 in handle_iteration_start
+ * Incremented with by every call to handle_iteration_next
+ *
+ */
+ uint32_t offset;
+ /**
+ * Which flags must be included
+ */
+ uint16_t must_have_flags;
+ /**
+ * Which flags must not be included
+ */
+ uint16_t must_not_have_flags;
};
*/
struct GNUNET_NAMESTORE_Client
{
+ /**
+ * Next element in the DLL
+ */
struct GNUNET_NAMESTORE_Client *next;
+
+ /**
+ * Previous element in the DLL
+ */
struct GNUNET_NAMESTORE_Client *prev;
- struct GNUNET_SERVER_Client * client;
+ /**
+ * The client
+ */
+ struct GNUNET_SERVER_Client *client;
+ /**
+ * Head of the DLL of
+ * Zone iteration operations in progress initiated by this client
+ */
struct GNUNET_NAMESTORE_ZoneIteration *op_head;
+
+ /**
+ * Tail of the DLL of
+ * Zone iteration operations in progress initiated by this client
+ */
struct GNUNET_NAMESTORE_ZoneIteration *op_tail;
};
+
+/**
+ * A container struct to store information belonging to a zone crypto key pair
+ */
struct GNUNET_NAMESTORE_CryptoContainer
{
- char * filename;
-
- GNUNET_HashCode zone;
+ /**
+ * Filename where to store the container
+ */
+ char *filename;
+
+ /**
+ * Short hash of the zone's public key
+ */
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+
+ /**
+ * Zone's private key
+ */
struct GNUNET_CRYPTO_RsaPrivateKey *privkey;
+
+ /**
+ * Zone's public key
+ */
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
};
/**
-* Configuration handle.
-*/
+ * Configuration handle.
+ */
const struct GNUNET_CONFIGURATION_Handle *GSN_cfg;
/**
-* Database handle
-*/
+ * Database handle
+ */
struct GNUNET_NAMESTORE_PluginFunctions *GSN_database;
/**
-* Zonefile directory
-*/
+ * Zonefile directory
+ */
static char *zonefile_directory;
+/**
+ * Name of the database plugin
+ */
static char *db_lib_name;
-
/**
* Our notification context.
*/
static struct GNUNET_SERVER_NotificationContext *snc;
+/**
+ * Head of the Client DLL
+ */
static struct GNUNET_NAMESTORE_Client *client_head;
+
+/**
+ * Tail of the Client DLL
+ */
static struct GNUNET_NAMESTORE_Client *client_tail;
+/**
+ * Hashmap containing the zone keys this namestore has is authoritative for
+ *
+ * Keys are the GNUNET_CRYPTO_HashCode of the GNUNET_CRYPTO_ShortHashCode
+ * The values are 'struct GNUNET_NAMESTORE_CryptoContainer *'
+ */
struct GNUNET_CONTAINER_MultiHashMap *zonekeys;
/**
- * Write zonefile to disk
- * @param file where to write
- * @param ret the key
+ * Writes the encrypted private key of a zone in a file
*
+ * @param filename where to store the zone
+ * @param c the crypto container containing private key of the zone
* @return GNUNET_OK on success, GNUNET_SYSERR on fail
*/
-
-int write_key_to_file (const char *filename, struct GNUNET_NAMESTORE_CryptoContainer *c)
+static int
+write_key_to_file (const char *filename, struct GNUNET_NAMESTORE_CryptoContainer *c)
{
struct GNUNET_CRYPTO_RsaPrivateKey *ret = c->privkey;
struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *enc;
if (GNUNET_YES == GNUNET_DISK_file_test (filename))
{
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
- struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
+ struct GNUNET_CRYPTO_RsaPrivateKey *privkey;
privkey = GNUNET_CRYPTO_rsa_key_create_from_file(filename);
if (privkey == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("File zone `%s' but corrupt content already exists, failed to write! \n"), GNUNET_h2s (&zone));
+ _("File zone `%s' but corrupt content already exists, failed to write! \n"),
+ GNUNET_short_h2s (&zone));
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
- GNUNET_CRYPTO_hash(&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
- GNUNET_CRYPTO_rsa_key_free(privkey);
+ GNUNET_CRYPTO_rsa_key_get_public (privkey, &pubkey);
+ GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
+ GNUNET_CRYPTO_rsa_key_free (privkey);
if (0 == memcmp (&zone, &c->zone, sizeof(zone)))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("File zone `%s' containing this key already exists\n"), GNUNET_h2s (&zone));
+ _("File zone `%s' containing this key already exists\n"), GNUNET_short_h2s (&zone));
return GNUNET_OK;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("File zone `%s' but different zone key already exists, failed to write! \n"), GNUNET_h2s (&zone));
+ _("File zone `%s' but different zone key already exists, failed to write! \n"),
+ GNUNET_short_h2s (&zone));
return GNUNET_OK;
}
}
}
if (GNUNET_YES != GNUNET_DISK_file_lock (fd, 0, sizeof (struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded), GNUNET_YES))
+ {
+ GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
return GNUNET_SYSERR;
+ }
enc = GNUNET_CRYPTO_rsa_encode_key (ret);
GNUNET_assert (enc != NULL);
GNUNET_assert (ntohs (enc->len) == GNUNET_DISK_file_write (fd, enc, ntohs (enc->len)));
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "fcntl", filename);
GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Stored zonekey for zone `%s' in file `%s'\n"),GNUNET_h2s(&c->zone), c->filename);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stored zonekey for zone `%s' in file `%s'\n",
+ GNUNET_short_h2s(&c->zone), c->filename);
return GNUNET_OK;
}
-int zone_to_disk_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
-{
- struct GNUNET_NAMESTORE_CryptoContainer * c = value;
+/**
+ * Write all zone keys to disk.
+ * Iterates over all entries of the hashmap 'zonekeys'
+ *
+ * @param cls unused
+ * @param key zone key
+ * @param value 'struct GNUNET_NAMESTORE_CryptoContainer' containing the private
+ * key
+ * @return GNUNET_OK to continue iteration
+ */
+static int
+zone_to_disk_it (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_NAMESTORE_CryptoContainer *c = value;
if (c->filename != NULL)
write_key_to_file(c->filename, c);
else
{
- GNUNET_asprintf(&c->filename, "%s/%s.zkey", zonefile_directory, GNUNET_h2s_full (&c->zone));
+ GNUNET_asprintf(&c->filename, "%s/%s.zkey", zonefile_directory, GNUNET_short_h2s (&c->zone));
write_key_to_file(c->filename, c);
}
- GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value);;
- GNUNET_CRYPTO_rsa_key_free(c->privkey);
+ GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value));
+ GNUNET_CRYPTO_rsa_key_free (c->privkey);
GNUNET_free (c->pubkey);
- GNUNET_free(c->filename);
+ GNUNET_free (c->filename);
GNUNET_free (c);
return GNUNET_OK;
}
-struct GNUNET_TIME_Absolute
+/**
+ * Returns the expiration time of the given block of records
+ * The block expiration time is the expiration time of the block with smallest
+ * expiration time
+ *
+ * @param rd_count number of records given in 'rd'
+ * @param rd array of records
+ * @return absolute expiration time
+ */
+static struct GNUNET_TIME_Absolute
get_block_expiration_time (unsigned int rd_count, const struct GNUNET_NAMESTORE_RecordData *rd)
{
- int c;
- struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get_forever();
+ unsigned int c;
+ struct GNUNET_TIME_Absolute expire = GNUNET_TIME_UNIT_FOREVER_ABS;
+ struct GNUNET_TIME_Absolute at;
+ struct GNUNET_TIME_Relative rt;
+
if (NULL == rd)
- return GNUNET_TIME_absolute_get_zero();
- for (c = 0; c < rd_count; c++)
+ return GNUNET_TIME_UNIT_ZERO_ABS;
+ for (c = 0; c < rd_count; c++)
{
- if (rd[c].expiration.abs_value < expire.abs_value)
- expire = rd[c].expiration;
+ if (0 != (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
+ {
+ rt.rel_value = rd[c].expiration_time;
+ at = GNUNET_TIME_relative_to_absolute (rt);
+ }
+ else
+ {
+ at.abs_value = rd[c].expiration_time;
+ }
+ expire = GNUNET_TIME_absolute_min (at, expire);
}
return expire;
}
cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping namestore service\n");
- struct GNUNET_NAMESTORE_ZoneIteration * no;
- struct GNUNET_NAMESTORE_ZoneIteration * tmp;
- struct GNUNET_NAMESTORE_Client * nc;
- struct GNUNET_NAMESTORE_Client * next;
-
- GNUNET_SERVER_notification_context_destroy (snc);
- snc = NULL;
+ struct GNUNET_NAMESTORE_ZoneIteration *no;
+ struct GNUNET_NAMESTORE_ZoneIteration *tmp;
+ struct GNUNET_NAMESTORE_Client *nc;
+ struct GNUNET_NAMESTORE_Client *next;
+ if (NULL != snc)
+ {
+ GNUNET_SERVER_notification_context_destroy (snc);
+ snc = NULL;
+ }
GNUNET_CONTAINER_multihashmap_iterate(zonekeys, &zone_to_disk_it, NULL);
GNUNET_CONTAINER_multihashmap_destroy(zonekeys);
static struct GNUNET_NAMESTORE_Client *
client_lookup (struct GNUNET_SERVER_Client *client)
{
- struct GNUNET_NAMESTORE_Client * nc;
+ struct GNUNET_NAMESTORE_Client *nc;
GNUNET_assert (NULL != client);
return nc;
}
+
/**
- * Called whenever a client is disconnected. Frees our
- * resources associated with that client.
+ * Called whenever a client is disconnected.
+ * Frees our resources associated with that client.
*
* @param cls closure
* @param client identification of the client
static void
client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
{
- struct GNUNET_NAMESTORE_ZoneIteration * no;
- struct GNUNET_NAMESTORE_Client * nc;
+ struct GNUNET_NAMESTORE_ZoneIteration *no;
+ struct GNUNET_NAMESTORE_Client *nc;
if (NULL == client)
return;
if ((NULL == client) || (NULL == nc))
return;
- for (no = nc->op_head; no != NULL; no = no->next)
+ no = nc->op_head;
+ while (NULL != no)
{
GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
GNUNET_free (no);
+ no = nc->op_head;
}
-
GNUNET_SERVER_client_drop(nc->client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
GNUNET_free (nc);
}
-
-static void handle_start (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_START' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message unused
+ */
+static void
+handle_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", client);
- struct GNUNET_NAMESTORE_Client * nc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Client));
+ struct GNUNET_NAMESTORE_Client *nc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Client));
nc->client = client;
GNUNET_SERVER_notification_context_add (snc, client);
GNUNET_CONTAINER_DLL_insert(client_head, client_tail, nc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+
+/**
+ * LookupNameContext
+ *
+ * Context for name lookups passed from 'handle_lookup_name' to
+ * 'handle_lookup_name_it' as closure
+ */
struct LookupNameContext
{
+ /**
+ * The client to send the response to
+ */
struct GNUNET_NAMESTORE_Client *nc;
+
+ /**
+ * Operation id for the name lookup
+ */
uint32_t request_id;
+
+ /**
+ * Requested specific record type
+ */
uint32_t record_type;
- GNUNET_HashCode *zone;
- char * name;
-};
-void drop_iterator (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- GNUNET_HashCode zone_hash;
- int * stop = cls;
- if (NULL != zone_key)
- {
- GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_hash);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting zone `%s'\n", GNUNET_h2s (&zone_hash));
- GSN_database->delete_zone (GSN_database->cls, &zone_hash);
- }
- else
- {
- (*stop) = GNUNET_YES;
- }
-}
+ /**
+ * Requested zone
+ */
+ struct GNUNET_CRYPTO_ShortHashCode *zone;
+
+ /**
+ * Requested name
+ */
+ char *name;
+};
+/**
+ * A 'GNUNET_NAMESTORE_RecordIterator' for name lookups in handle_lookup_name
+ *
+ * @param cls a 'struct LookupNameContext *' with information about the request
+ * @param zone_key zone key of the zone
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records
+ * @param rd array of records
+ * @param signature signature
+ */
static void
handle_lookup_name_it (void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
struct GNUNET_NAMESTORE_CryptoContainer *cc;
struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
struct GNUNET_TIME_Absolute e;
- GNUNET_HashCode zone_key_hash;
+ struct GNUNET_CRYPTO_ShortHashCode zone_key_hash;
+ struct GNUNET_HashCode long_hash;
char *rd_tmp;
char *name_tmp;
size_t rd_ser_len;
if (rd[c].record_type == lnc->record_type)
copied_elements++; /* found matching record */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records with type %u for name `%s' in zone `%s'\n",
- copied_elements, lnc->record_type, lnc->name, GNUNET_h2s(lnc->zone));
+ copied_elements, lnc->record_type, lnc->name, GNUNET_short_h2s(lnc->zone));
rd_selected = GNUNET_malloc (copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData));
copied_elements = 0;
for (c = 0; c < rd_count; c ++)
GNUNET_NAMESTORE_records_serialize(copied_elements, rd_selected, rd_ser_len, rd_ser);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records for name `%s' in zone `%s'\n",
- copied_elements, lnc->name, GNUNET_h2s(lnc->zone));
+ copied_elements, lnc->name, GNUNET_short_h2s(lnc->zone));
if ((copied_elements == rd_count) && (NULL != signature))
contains_signature = GNUNET_YES; /* returning all records, so include signature */
if ((NULL != zone_key) && (copied_elements == rd_count))
{
- GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
- if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &zone_key_hash))
+ GNUNET_CRYPTO_short_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
+ GNUNET_CRYPTO_short_hash_double (&zone_key_hash, &long_hash);
+ if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &zone_key_hash);
+ cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &long_hash);
e = get_block_expiration_time(rd_count, rd);
signature_new = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd, rd_count);
GNUNET_assert (signature_new != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for name `%s' with %u records in zone `%s'\n",name, copied_elements, GNUNET_h2s(&zone_key_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for name `%s' with %u records in zone `%s'\n",name, copied_elements, GNUNET_short_h2s(&zone_key_hash));
authoritative = GNUNET_YES;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "I am not authoritative for name `%s' in zone `%s'\n",name, GNUNET_h2s(&zone_key_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "I am not authoritative for name `%s' in zone `%s'\n",name, GNUNET_short_h2s(&zone_key_hash));
}
r_size = sizeof (struct LookupNameResponseMessage) +
GNUNET_free (lnr_msg);
}
-static void handle_lookup_name (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct LookupNameMessage'
+ */
+static void
+handle_lookup_name (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_LOOKUP_NAME");
struct LookupNameContext lnc;
struct GNUNET_NAMESTORE_Client *nc;
size_t name_len;
- char * name;
+ char *name;
uint32_t rid = 0;
uint32_t type = 0;
return;
}
- struct LookupNameMessage * ln_msg = (struct LookupNameMessage *) message;
+ struct LookupNameMessage *ln_msg = (struct LookupNameMessage *) message;
rid = ntohl (ln_msg->gns_header.r_id);
name_len = ntohl (ln_msg->name_len);
type = ntohl (ln_msg->record_type);
}
if (0 == type)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up all records for name `%s' in zone `%s'\n", name, GNUNET_h2s(&ln_msg->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up all records for name `%s' in zone `%s'\n", name, GNUNET_short_h2s(&ln_msg->zone));
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up records with type %u for name `%s' in zone `%s'\n", type, name, GNUNET_h2s(&ln_msg->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up records with type %u for name `%s' in zone `%s'\n", type, name, GNUNET_short_h2s(&ln_msg->zone));
/* do the actual lookup */
lnc.request_id = rid;
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-static void handle_record_put (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct RecordPutMessage'
+ */
+static void
+handle_record_put (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_PUT");
struct GNUNET_NAMESTORE_Client *nc;
+ struct RecordPutMessage *rp_msg;
struct GNUNET_TIME_Absolute expire;
struct GNUNET_CRYPTO_RsaSignature *signature;
struct RecordPutResponseMessage rpr_msg;
+ struct GNUNET_CRYPTO_ShortHashCode zone_hash;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
- char * name;
- char * rd_ser;
+ char *name;
+ char *rd_ser;
uint32_t rid = 0;
uint32_t rd_ser_len;
uint32_t rd_count;
return;
}
- struct RecordPutMessage * rp_msg = (struct RecordPutMessage *) message;
-
+ rp_msg = (struct RecordPutMessage *) message;
rid = ntohl (rp_msg->gns_header.r_id);
msg_size = ntohs (rp_msg->gns_header.header.size);
name_len = ntohs (rp_msg->name_len);
goto send;
}
- GNUNET_HashCode zone_hash;
- GNUNET_CRYPTO_hash (&rp_msg->public_key, sizeof (rp_msg->public_key), &zone_hash);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Putting %u record for name `%s' in zone `%s'\n", rd_count, name, GNUNET_h2s(&zone_hash));
+ GNUNET_CRYPTO_short_hash (&rp_msg->public_key, sizeof (rp_msg->public_key), &zone_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Putting %u record for name `%s' in zone `%s'\n", rd_count, name, GNUNET_short_h2s(&zone_hash));
/* Database operation */
res = GSN_database->put_records(GSN_database->cls,
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+
+/**
+ * CreateRecordContext
+ *
+ * Context for record create operations passed from 'handle_record_create' to
+ * 'handle_create_record_it' as closure
+ */
struct CreateRecordContext
{
+ /**
+ * Record data
+ */
struct GNUNET_NAMESTORE_RecordData *rd;
+
+ /**
+ * Zone's private key
+ */
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+
+ /**
+ * Zone's public key
+ */
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
+
+ /**
+ * Record expiration time
+ */
struct GNUNET_TIME_Absolute expire;
+
+ /**
+ * Name for the record to create
+ */
char *name;
+
+ /**
+ * result returned from 'handle_create_record_it'
+ * GNUNET_SYSERR: failed to create the record
+ * GNUNET_NO: we updated an existing record or identical entry existed
+ * GNUNET_YES : we created a new record
+ */
int res;
};
+/**
+ * A 'GNUNET_NAMESTORE_RecordIterator' for record create operations
+ * in handle_record_create
+ *
+ * @param cls a 'struct CreateRecordContext *' with information about the request
+ * @param pubkey zone key of the zone
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records
+ * @param rd array of records
+ * @param signature signature
+ */
static void
handle_create_record_it (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct CreateRecordContext * crc = cls;
+ struct CreateRecordContext *crc = cls;
struct GNUNET_NAMESTORE_RecordData *rd_new = NULL;
struct GNUNET_CRYPTO_RsaSignature dummy_signature;
struct GNUNET_TIME_Absolute block_expiration;
int rd_count_new = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u existing records for `%s'\n", rd_count, crc->name);
-
for (c = 0; c < rd_count; c++)
{
-
+ if ( (crc->rd->record_type == GNUNET_NAMESTORE_TYPE_PKEY) &&
+ (rd[c].record_type == GNUNET_NAMESTORE_TYPE_PKEY))
+ {
+ /* Update unique PKEY */
+ exist = c;
+ update = GNUNET_YES;
+ break;
+ }
+ if ( (crc->rd->record_type == GNUNET_NAMESTORE_TYPE_PSEU) &&
+ (rd[c].record_type == GNUNET_NAMESTORE_TYPE_PSEU))
+ {
+ /* Update unique PSEU */
+ exist = c;
+ update = GNUNET_YES;
+ break;
+ }
if ((crc->rd->record_type == rd[c].record_type) &&
- (crc->rd->data_size == rd[c].data_size) &&
- (0 == memcmp (crc->rd->data, rd[c].data, rd[c].data_size)))
+ (crc->rd->data_size == rd[c].data_size) &&
+ (0 == memcmp (crc->rd->data, rd[c].data, rd[c].data_size)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found existing records for `%s' to update expiration date!\n", crc->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found existing records for `%s' to update expiration date!\n",
+ crc->name);
exist = c;
- if (crc->rd->expiration.abs_value != rd[c].expiration.abs_value)
+ if ( (crc->rd->expiration_time != rd[c].expiration_time) &&
+ ((crc->rd->flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)
+ == (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION) ) )
update = GNUNET_YES;
- break;
+ break;
}
}
- if (exist == GNUNET_SYSERR)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New record does not exist for name `%s'!\n", crc->name);
-
if (exist == GNUNET_SYSERR)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No existing record for name `%s'!\n",
+ crc->name);
rd_new = GNUNET_malloc ((rd_count+1) * sizeof (struct GNUNET_NAMESTORE_RecordData));
memcpy (rd_new, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
rd_count_new = rd_count + 1;
else if (update == GNUNET_NO)
{
/* Exact same record already exists */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No update for %s' record required!\n", crc->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Matching record for %s' exists, no change required!\n",
+ crc->name);
res = GNUNET_NO;
goto end;
}
- else if (update == GNUNET_YES)
+ else
{
/* Update record */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating existing records for `%s'!\n", crc->name);
+ GNUNET_assert (GNUNET_YES == update);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating existing records for `%s'!\n",
+ crc->name);
rd_new = GNUNET_malloc ((rd_count) * sizeof (struct GNUNET_NAMESTORE_RecordData));
memcpy (rd_new, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
rd_count_new = rd_count;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating expiration from %llu to %llu!\n", rd_new[exist].expiration.abs_value, crc->rd->expiration.abs_value);
- rd_new[exist].expiration = crc->rd->expiration;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ (0 == (crc->rd->flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
+ ? "Updating absolute expiration from %llu to %llu!\n"
+ : "Updating relative expiration from %llu to %llu!\n",
+ rd_new[exist].expiration_time, crc->rd->expiration_time);
+ rd_new[exist] = *(crc->rd);
}
block_expiration = GNUNET_TIME_absolute_max(crc->expire, expire);
if (block_expiration.abs_value != expire.abs_value)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updated block expiration time\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updated block expiration time\n");
memset (&dummy_signature, '\0', sizeof (dummy_signature));
case GNUNET_YES:
/* database operations OK */
if (GNUNET_YES == update)
+ {
/* we updated an existing record */
crc->res = GNUNET_NO;
+ }
else
+ {
/* we created a new record */
crc->res = GNUNET_YES;
+ }
break;
case GNUNET_NO:
/* identical entry existed, so we did nothing */
default:
break;
}
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Update result for name `%s' %u\n", crc->name, res);
-
}
-static void handle_record_create (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct RecordCreateMessage'
+ */
+static void
+handle_record_create (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_CREATE");
struct GNUNET_NAMESTORE_Client *nc;
+ struct RecordCreateMessage *rp_msg;
struct GNUNET_NAMESTORE_CryptoContainer *cc;
struct CreateRecordContext crc;
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
struct RecordCreateResponseMessage rcr_msg;
- GNUNET_HashCode pubkey_hash;
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ struct GNUNET_HashCode long_hash;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
return;
}
- struct RecordCreateMessage * rp_msg = (struct RecordCreateMessage *) message;
+ rp_msg = (struct RecordCreateMessage *) message;
rid = ntohl (rp_msg->gns_header.r_id);
name_len = ntohs (rp_msg->name_len);
msg_size = ntohs (message->size);
GNUNET_break_op (0);
goto send;
}
-
/* Extracting and converting private key */
pkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
GNUNET_assert (pkey != NULL);
GNUNET_CRYPTO_rsa_key_get_public(pkey, &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash_double (&pubkey_hash, &long_hash);
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &pubkey_hash))
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_h2s(&pubkey_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_short_h2s(&pubkey_hash));
cc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
cc->privkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
cc->pubkey = GNUNET_malloc(sizeof (pub));
memcpy (cc->pubkey, &pub, sizeof(pub));
cc->zone = pubkey_hash;
-
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &pubkey_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_multihashmap_put(zonekeys, &long_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
crc.expire = GNUNET_TIME_absolute_ntoh(rp_msg->expire);
crc.rd = rd;
crc.name = name_tmp;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating record for name `%s' in zone `%s'\n", name_tmp, GNUNET_h2s(&pubkey_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating record for name `%s' in zone `%s'\n", name_tmp, GNUNET_short_h2s(&pubkey_hash));
/* Get existing records for name */
res = GSN_database->iterate_records(GSN_database->cls, &pubkey_hash, name_tmp, 0, &handle_create_record_it, &crc);
}
+/**
+ * RemoveRecordContext
+ *
+ * Context for record remove operations passed from 'handle_record_remove' to
+ * 'handle_record_remove_it' as closure
+ */
struct RemoveRecordContext
{
+ /**
+ * Record to remove
+ */
struct GNUNET_NAMESTORE_RecordData *rd;
+
+ /**
+ * Zone's private keys
+ */
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+
+ /**
+ * Name to remove
+ */
+ int remove_name;
+
+ /**
+ * 0 : Success
+ * 1 : Could not find record to remove, empty result set
+ * 2 : Could not find record to remove, record did not exist in result set
+ * 3 : Could not remove records from database
+ * 4 : Could not put records into database
+ */
uint16_t op_res;
};
+
+/**
+ * FIXME...
+ */
static void
handle_record_remove_it (void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
found = GNUNET_SYSERR;
for (c = 0; c < rd_count; c++)
{
- if ((rd[c].expiration.abs_value == rrc->rd->expiration.abs_value) &&
- (rd[c].flags == rrc->rd->flags) &&
- (rd[c].record_type == rrc->rd->record_type) &&
- (rd[c].data_size == rrc->rd->data_size) &&
- (0 == memcmp (rd[c].data, rrc->rd->data, rrc->rd->data_size)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found record to remove!\n", rd_count);
- found = c;
- break;
- }
+ /*
+ if (rd[c].flags != rrc->rd->flags)
+ continue;*/
+ if (rd[c].record_type != rrc->rd->record_type)
+ continue;
+ /*
+ if (rd[c].data_size != rrc->rd->data_size)
+ continue;
+ GNUNET_break(0);
+ if (0 != memcmp (rd[c].data, rrc->rd->data, rrc->rd->data_size))
+ continue;
+ GNUNET_break(0); */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found record to remove!\n", rd_count);
+ found = c;
+ break;
}
if (GNUNET_SYSERR == found)
{
return;
}
+ if (rd_count-1 == 0)
+ {
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ res = GSN_database->remove_records (GSN_database->cls,
+ &pubkey_hash,
+ name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No records left for name `%s', removing name\n",
+ name, res);
+ if (GNUNET_OK != res)
+ {
+ /* Could not remove records from database */
+ rrc->op_res = 3;
+ return;
+ }
+ rrc->op_res = 0;
+ return;
+ }
+
rd_count_new = rd_count -1;
struct GNUNET_NAMESTORE_RecordData rd_new[rd_count_new];
&dummy_signature);
if (GNUNET_OK != res)
{
- /* Could put records into database */
+ /* Could not put records into database */
rrc->op_res = 4;
return;
}
rrc->op_res = 0;
}
-static void handle_record_remove (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct RecordRemoveMessage'
+ */
+static void
+handle_record_remove (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_REMOVE");
struct GNUNET_NAMESTORE_Client *nc;
+ const struct RecordRemoveMessage *rr_msg;
struct RecordRemoveResponseMessage rrr_msg;
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
- struct GNUNET_NAMESTORE_CryptoContainer *cc = NULL;
+ struct GNUNET_NAMESTORE_CryptoContainer *cc;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
- GNUNET_HashCode pubkey_hash;
- char * pkey_tmp = NULL;
- char * name_tmp = NULL;
- char * rd_ser = NULL;
- size_t key_len = 0;
- size_t name_len = 0;
- size_t rd_ser_len = 0;
- size_t msg_size = 0;
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ struct GNUNET_HashCode long_hash;
+ const char *pkey_tmp;
+ const char *name_tmp;
+ const char *rd_ser;
+ size_t key_len;
+ size_t name_len;
+ size_t rd_ser_len;
+ size_t msg_size;
size_t msg_size_exp = 0;
uint32_t rd_count;
- uint32_t rid = 0;
+ uint32_t rid;
int res = GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_REMOVE");
if (ntohs (message->size) < sizeof (struct RecordRemoveMessage))
{
GNUNET_break_op (0);
return;
}
- struct RecordRemoveMessage * rr_msg = (struct RecordRemoveMessage *) message;
+ rr_msg = (const struct RecordRemoveMessage *) message;
rid = ntohl (rr_msg->gns_header.r_id);
name_len = ntohs (rr_msg->name_len);
rd_ser_len = ntohs (rr_msg->rd_len);
return;
}
- if ((rd_count != 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
+ if ((name_len >=256) || (name_len == 0))
{
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if ((rd_count != 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
-
- pkey_tmp = (char *) &rr_msg[1];
+ pkey_tmp = (const char *) &rr_msg[1];
name_tmp = &pkey_tmp[key_len];
rd_ser = &name_tmp[name_len];
pkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
GNUNET_assert (pkey != NULL);
GNUNET_CRYPTO_rsa_key_get_public(pkey, &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash_double (&pubkey_hash, &long_hash);
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &pubkey_hash))
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_h2s(&pubkey_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received new private key for zone `%s'\n",
+ GNUNET_short_h2s(&pubkey_hash));
cc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
cc->privkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
cc->pubkey = GNUNET_malloc(sizeof (pub));
memcpy (cc->pubkey, &pub, sizeof(pub));
cc->zone = pubkey_hash;
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &pubkey_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_multihashmap_put(zonekeys, &long_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
+
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
res = GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
- if ((res != GNUNET_OK) || (rd_count != 1))
+ if ((res != GNUNET_OK) || (rd_count > 1))
{
GNUNET_break_op (0);
goto send;
}
- struct RemoveRecordContext rrc;
- rrc.rd = rd;
- rrc.pkey = pkey;
+ if (0 == rd_count)
+ {
+ /* remove the whole name and all records */
+ /* Database operation */
+ res = GSN_database->remove_records (GSN_database->cls,
+ &pubkey_hash,
+ name_tmp);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing name `%s': %s\n",
+ name_tmp, (GNUNET_OK == res) ? "OK" : "FAIL");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s' in zone `%s'\n", name_tmp, GNUNET_h2s(&pubkey_hash));
+ if (GNUNET_OK != res)
+ /* Could not remove entry from database */
+ res = 4;
+ else
+ res = 0;
+ }
+ else
+ {
+ /* remove a single record */
+ struct RemoveRecordContext rrc;
+ rrc.rd = rd;
+ rrc.pkey = pkey;
- /* Database operation */
- res = GSN_database->iterate_records (GSN_database->cls,
- &pubkey_hash,
- name_tmp,
- 0,
- handle_record_remove_it, &rrc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s' in zone `%s'\n", name_tmp, GNUNET_short_h2s(&pubkey_hash));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s': %s\n",
- name_tmp, (rrc.op_res == 0) ? "OK" : "FAIL");
- res = rrc.op_res;
+ /* Database operation */
+ res = GSN_database->iterate_records (GSN_database->cls,
+ &pubkey_hash,
+ name_tmp,
+ 0,
+ handle_record_remove_it, &rrc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s': %s\n",
+ name_tmp, (rrc.op_res == 0) ? "OK" : "FAIL");
+ res = rrc.op_res;
+ }
/* Send response */
send:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "RECORD_REMOVE_RESPONSE");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-
+/**
+ * ZoneToNameCtx
+ *
+ * Context for record remove operations passed from 'handle_zone_to_name' to
+ * 'handle_zone_to_name_it' as closure
+ */
struct ZoneToNameCtx
{
+ /**
+ * Namestore client
+ */
struct GNUNET_NAMESTORE_Client *nc;
+
+ /**
+ * Request id
+ */
uint32_t rid;
};
+
+/**
+ * Zone to name iterator
+ *
+ * @param cls struct ZoneToNameCtx *
+ * @param zone_key the zone key
+ * @param expire expiration date
+ * @param name name
+ * @param rd_count number of records
+ * @param rd record data
+ * @param signature signature
+ */
static void
handle_zone_to_name_it (void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct ZoneToNameCtx * ztn_ctx = cls;
+ struct ZoneToNameCtx *ztn_ctx = cls;
struct ZoneToNameResponseMessage *ztnr_msg;
int16_t res = GNUNET_SYSERR;
uint16_t name_len = 0;
else
contains_sig = GNUNET_NO;
-
-
msg_size = sizeof (struct ZoneToNameResponseMessage) + name_len + rd_ser_len + contains_sig * sizeof (struct GNUNET_CRYPTO_RsaSignature);
ztnr_msg = GNUNET_malloc (msg_size);
- memset(ztnr_msg, 0, msg_size);
name_tmp = (char *) &ztnr_msg[1];
rd_tmp = &name_tmp[name_len];
}
-static void handle_zone_to_name (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct ZoneToNameMessage'
+ */
+static void
+handle_zone_to_name (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_TO_NAME");
struct GNUNET_NAMESTORE_Client *nc;
+ struct ZoneToNameMessage *ztn_msg;
struct ZoneToNameCtx ztn_ctx;
size_t msg_size = 0;
uint32_t rid = 0;
return;
}
- struct ZoneToNameMessage *ztn_msg = (struct ZoneToNameMessage *) message;
+ ztn_msg = (struct ZoneToNameMessage *) message;
if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
ztn_ctx.rid = rid;
ztn_ctx.nc = nc;
- char * z_tmp = strdup (GNUNET_h2s (&ztn_msg->zone));
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded z_tmp;
+ GNUNET_CRYPTO_short_hash_to_enc(&ztn_msg->zone, &z_tmp);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up name for zone `%s' in zone `%s'\n",
- z_tmp,
- GNUNET_h2s (&ztn_msg->value_zone));
- GNUNET_free (z_tmp);
+ (char *) &z_tmp,
+ GNUNET_short_h2s (&ztn_msg->value_zone));
GSN_database->zone_to_name (GSN_database->cls, &ztn_msg->zone, &ztn_msg->value_zone, &handle_zone_to_name_it, &ztn_ctx);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+
+/**
+ * Copy record, data has to be free'd separetely
+ *
+ * @param src source record
+ * @param dest destination record
+ */
+static void
+copy_record (const struct GNUNET_NAMESTORE_RecordData *src, struct GNUNET_NAMESTORE_RecordData *dest)
+{
+ memcpy (dest, src, sizeof (struct GNUNET_NAMESTORE_RecordData));
+ dest->data = GNUNET_malloc (src->data_size);
+ memcpy ((void *) dest->data, src->data, src->data_size);
+}
+
+
+/**
+ * ZoneIterationProcResult
+ *
+ * Context for record remove operations passed from
+ * 'find_next_zone_iteration_result' to 'zone_iteraterate_proc' as closure
+ */
struct ZoneIterationProcResult
{
- int have_zone_key;
+ /**
+ * The zone iteration handle
+ */
+ struct GNUNET_NAMESTORE_ZoneIteration *zi;
+
+ /**
+ * Iteration result: iteration done?
+ */
+ int res_iteration_finished;
+
+ /**
+ * Iteration result: number of records included
+ */
+ int records_included;
+
+ /**
+ * Iteration result: is a valid signature included?
+ */
+ int has_signature;
+
+ /**
+ * Name
+ */
+ char *name;
+
+ /**
+ * Zone hash
+ */
+ struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+
+ /**
+ * Record data
+ */
+ struct GNUNET_NAMESTORE_RecordData *rd;
+
+ /**
+ * Zone's public key
+ */
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
- int have_signature;
+ /**
+ * Signature
+ */
struct GNUNET_CRYPTO_RsaSignature signature;
- struct GNUNET_TIME_Absolute expire;
- int have_name;
- char name[256];
-
- size_t rd_ser_len;
- char *rd_ser;
+ /**
+ * Expiration date
+ */
+ struct GNUNET_TIME_Absolute expire;
};
-void zone_iteration_proc (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+/**
+ * Process results for zone iteration from database
+ *
+ * @param cls struct ZoneIterationProcResult *proc
+ * @param zone_key the zone key
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records for this name
+ * @param rd record data
+ * @param signature block signature
+ */
+static void
+zone_iteraterate_proc (void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_NAMESTORE_ZoneIteration *zi = cls;
- struct GNUNET_NAMESTORE_Client *nc = zi->client;
- struct GNUNET_NAMESTORE_CryptoContainer * cc;
- struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
+ struct ZoneIterationProcResult *proc = cls;
+ struct GNUNET_NAMESTORE_RecordData *rd_filtered;
+ struct GNUNET_CRYPTO_RsaSignature *new_signature;
+ struct GNUNET_NAMESTORE_CryptoContainer *cc;
+ struct GNUNET_CRYPTO_ShortHashCode hash;
+ struct GNUNET_HashCode long_hash;
struct GNUNET_TIME_Absolute e;
- GNUNET_HashCode zone_key_hash;
- int authoritative = GNUNET_NO;
+ unsigned int rd_count_filtered = 0;
+ int include;
+ int c;
+
+ proc->res_iteration_finished = GNUNET_NO;
+ proc->records_included = 0;
if ((zone_key == NULL) && (name == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Iteration done\n");
+ proc->res_iteration_finished = GNUNET_YES;
+ proc->rd = NULL;
+ proc->name = NULL;
+ }
+ else if ((zone_key != NULL) && (name != NULL)) /* just a safety check */
+ {
+ rd_filtered = GNUNET_malloc (rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received result for zone iteration: `%s'\n", name);
+ for (c = 0; c < rd_count; c++)
+ {
+ include = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: 0x%x must have 0x%x \n",
+ c, rd[c].flags, proc->zi->must_have_flags);
+ /* Checking must have flags */
+ if ((rd[c].flags & proc->zi->must_have_flags) == proc->zi->must_have_flags)
+ {
+ /* Include */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Include \n", c);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Not include \n", c);
+ include = GNUNET_NO;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: 0x%x must not have 0x%x\n",
+ c, rd[c].flags, proc->zi->must_not_have_flags);
+ if ((rd[c].flags & proc->zi->must_not_have_flags) != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Not include \n", c);
+ include = GNUNET_NO;
+ }
+ else
+ {
+ /* Include */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Include \n", c);
+ }
+ if (GNUNET_YES == include)
+ {
+ copy_record (&rd[c], &rd_filtered[rd_count_filtered]);
+ rd_count_filtered++;
+ }
+
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Included %i of %i records \n", rd_count_filtered, rd_count);
+
+ proc->records_included = rd_count_filtered;
+ if (0 == rd_count_filtered)
+ {
+ GNUNET_free (rd_filtered);
+ rd_filtered = NULL;
+ }
+ proc->rd = rd_filtered;
+ proc->name = GNUNET_strdup(name);
+ memcpy (&proc->zone_key, zone_key, sizeof (proc->zone_key));
+
+ /* Signature */
+ proc->has_signature = GNUNET_NO;
+ GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &hash);
+ GNUNET_CRYPTO_short_hash_double(&hash, &long_hash);
+ proc->zone_hash = hash;
+
+ if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
+ {
+ cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &long_hash);
+ e = get_block_expiration_time(rd_count_filtered, rd_filtered);
+ proc->expire = e;
+ new_signature = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd_filtered, rd_count_filtered);
+ GNUNET_assert (signature != NULL);
+ proc->signature = (*new_signature);
+ GNUNET_free (new_signature);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for `%s' in zone `%s' with %u records and expiration %llu\n",
+ name, GNUNET_short_h2s(&hash), rd_count_filtered, e.abs_value);
+ proc->has_signature = GNUNET_YES;
+ }
+ else if (rd_count_filtered == rd_count)
+ {
+ proc->expire = expire;
+ if (NULL != signature)
+ {
+ proc->signature = (*signature);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using provided signature for `%s' in zone `%s' with %u records and expiration %llu\n",
+ name, GNUNET_short_h2s(&hash), rd_count_filtered, expire.abs_value);
+ proc->has_signature = GNUNET_YES;
+ }
+ else
+ {
+ memset (&proc->signature, '\0', sizeof (proc->signature));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No signature provided for `%s'\n", name);
+ }
+ }
+ }
+ else
+ {
+ GNUNET_break (0);
+ return;
+ }
+}
+
+
+/**
+ * Find next zone iteration result in database
+ * @param proc the zone iteration processing to use
+ */
+static void
+find_next_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+
+ struct GNUNET_CRYPTO_ShortHashCode *zone;
+
+ if (GNUNET_YES == proc->zi->has_zone)
+ zone = &proc->zi->zone;
+ else
+ zone = NULL;
+
+ do
+ {
+ if (GNUNET_SYSERR ==
+ GSN_database->iterate_records (GSN_database->cls, zone, NULL, proc->zi->offset, &zone_iteraterate_proc, proc))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ proc->zi->offset++;
+ }
+ while ((0 == proc->records_included) && (GNUNET_NO == proc->res_iteration_finished));
+}
+
+
+/**
+ * Send zone iteration result to client
+ * @param proc the zone iteration processing result to send
+ */
+static void
+send_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+ struct GNUNET_NAMESTORE_ZoneIteration *zi = proc->zi;
+
+ if (GNUNET_YES == proc->res_iteration_finished)
{
struct ZoneIterationResponseMessage zir_msg;
if (zi->has_zone == GNUNET_YES)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for zone `%s'\n", GNUNET_h2s(&zi->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for zone `%s'\n", GNUNET_short_h2s(&zi->zone));
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for all zones\n");
zir_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
zir_msg.gns_header.header.size = htons (sizeof (struct ZoneIterationResponseMessage));
zir_msg.gns_header.r_id = htonl(zi->request_id);
- zir_msg.expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_absolute_get_zero());
+ zir_msg.expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_UNIT_ZERO_ABS);
zir_msg.name_len = htons (0);
zir_msg.reserved = htons (0);
zir_msg.rd_count = htons (0);
zir_msg.rd_len = htons (0);
memset (&zir_msg.public_key, '\0', sizeof (zir_msg.public_key));
memset (&zir_msg.signature, '\0', sizeof (zir_msg.signature));
- GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
+ GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing zone iterator\n");
- GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, zi);
+ GNUNET_CONTAINER_DLL_remove (zi->client->op_head, zi->client->op_tail, zi);
GNUNET_free (zi);
return;
}
- else
- {
- struct ZoneIterationResponseMessage *zir_msg;
- if (zi->has_zone == GNUNET_YES)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over zone `%s'\n",
- name, GNUNET_h2s(&zi->zone));
- if (zi->has_zone == GNUNET_NO)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over all zones\n",
- name);
-
- size_t name_len;
- size_t rd_ser_len;
- size_t msg_size;
- char *name_tmp;
- char *rd_tmp;
- name_len = strlen (name) +1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
- char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
- msg_size = sizeof (struct ZoneIterationResponseMessage) + name_len + rd_ser_len;
- zir_msg = GNUNET_malloc(msg_size);
+ GNUNET_assert (proc->records_included > 0);
- name_tmp = (char *) &zir_msg[1];
- rd_tmp = &name_tmp[name_len];
+ struct ZoneIterationResponseMessage *zir_msg;
+ size_t name_len;
+ size_t rd_ser_len;
+ size_t msg_size;
+ char *name_tmp;
+ char *rd_tmp;
- GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
- if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &zone_key_hash))
- {
- cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &zone_key_hash);
- e = get_block_expiration_time(rd_count, rd);
- expire = e;
- signature_new = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd, rd_count);
- GNUNET_assert (signature_new != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for `%s' in zone `%s' with %u records and expiration %llu\n", name, GNUNET_h2s(&zone_key_hash), rd_count, e.abs_value);
- authoritative = GNUNET_YES;
- }
+ if (zi->has_zone == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over zone `%s'\n",
+ proc->name, GNUNET_short_h2s(&zi->zone));
+ if (zi->has_zone == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over all zones\n",
+ proc->name);
+ name_len = strlen (proc->name) +1;
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(proc->records_included, proc->rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(proc->records_included, proc->rd, rd_ser_len, rd_ser);
+ msg_size = sizeof (struct ZoneIterationResponseMessage) + name_len + rd_ser_len;
+ zir_msg = GNUNET_malloc(msg_size);
+ name_tmp = (char *) &zir_msg[1];
+ rd_tmp = &name_tmp[name_len];
+ zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
+ zir_msg->gns_header.header.size = htons (msg_size);
+ zir_msg->gns_header.r_id = htonl(zi->request_id);
+ zir_msg->expire = GNUNET_TIME_absolute_hton(proc->expire);
+ zir_msg->reserved = htons (0);
+ zir_msg->name_len = htons (name_len);
+ zir_msg->rd_count = htons (proc->records_included);
+ zir_msg->rd_len = htons (rd_ser_len);
+ zir_msg->signature = proc->signature;
+ zir_msg->public_key = proc->zone_key;
+ memcpy (name_tmp, proc->name, name_len);
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with size %u\n", "ZONE_ITERATION_RESPONSE", msg_size);
+ GNUNET_SERVER_notification_context_unicast (snc, zi->client->client,
+ (const struct GNUNET_MessageHeader *) zir_msg,
+ GNUNET_NO);
+ GNUNET_free (zir_msg);
+}
- zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
- zir_msg->gns_header.header.size = htons (msg_size);
- zir_msg->gns_header.r_id = htonl(zi->request_id);
- zir_msg->expire = GNUNET_TIME_absolute_hton(expire);
- zir_msg->reserved = htons (0);
- zir_msg->name_len = htons (name_len);
- zir_msg->rd_count = htons (rd_count);
- zir_msg->rd_len = htons (rd_ser_len);
- if ((GNUNET_YES == authoritative) && (NULL != signature_new))
- {
- zir_msg->signature = *signature_new;
- GNUNET_free (signature_new);
- }
- else
- zir_msg->signature = *signature;
- GNUNET_assert (NULL != zone_key);
- if (zone_key != NULL)
- zir_msg->public_key = *zone_key;
- memcpy (name_tmp, name, name_len);
- memcpy (rd_tmp, rd_ser, rd_ser_len);
+/**
+ * Clean up after zone iteration
+ * @param proc the zone iteration processor
+ */
+static void
+clean_up_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+ unsigned int c;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending empty `%s' message with size %u\n", "ZONE_ITERATION_RESPONSE", msg_size);
- GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) zir_msg, GNUNET_NO);
- GNUNET_free (zir_msg);
+ GNUNET_free_non_null (proc->name);
+ for (c = 0; c < proc->records_included; c++)
+ {
+ GNUNET_free ((void *) proc->rd[c].data);
}
+ GNUNET_free_non_null (proc->rd);
+ proc->name = NULL;
+ proc->rd = NULL;
}
-static void handle_iteration_start (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+
+/**
+ * Perform the next round of the zone iteration.
+ *
+ * @param zi zone iterator to process
+ */
+static void
+run_zone_iteration_round (struct GNUNET_NAMESTORE_ZoneIteration *zi)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_START");
+ struct ZoneIterationProcResult proc;
- struct ZoneIterationStartMessage * zis_msg = (struct ZoneIterationStartMessage *) message;
+ memset (&proc, 0, sizeof (proc));
+ proc.zi = zi;
+ find_next_zone_iteration_result (&proc);
+ if (GNUNET_YES == proc.res_iteration_finished)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration done\n");
+ }
+ else if (0 != proc.records_included)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration return %u records\n",
+ proc.records_included);
+ }
+ send_zone_iteration_result (&proc);
+ clean_up_zone_iteration_result (&proc);
+}
+
+
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct ZoneIterationStartMessage'
+ */
+static void
+handle_iteration_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ static struct GNUNET_CRYPTO_ShortHashCode zeros;
+ const struct ZoneIterationStartMessage *zis_msg;
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
- nc = client_lookup(client);
- if (nc == NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_START");
+ nc = client_lookup (client);
+ if (NULL == nc)
{
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
+ zis_msg = (const struct ZoneIterationStartMessage *) message;
zi = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_ZoneIteration));
zi->request_id = ntohl (zis_msg->gns_header.r_id);
zi->offset = 0;
zi->client = nc;
- zi->zone = zis_msg->zone;
-
- GNUNET_HashCode dummy;
- GNUNET_HashCode *zone_tmp;
- memset (&dummy, '\0', sizeof (dummy));
- if (0 == memcmp (&dummy, &zis_msg->zone, sizeof (dummy)))
+ zi->must_have_flags = ntohs (zis_msg->must_have_flags);
+ zi->must_not_have_flags = ntohs (zis_msg->must_not_have_flags);
+ if (0 == memcmp (&zeros, &zis_msg->zone, sizeof (zeros)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over all zones\n");
+ zi->zone = zis_msg->zone;
zi->has_zone = GNUNET_NO;
- zone_tmp = NULL;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over zone `%s'\n", GNUNET_h2s (&zis_msg->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting to iterate over zone `%s'\n", GNUNET_short_h2s (&zis_msg->zone));
+ zi->zone = zis_msg->zone;
zi->has_zone = GNUNET_YES;
- zone_tmp = &zis_msg->zone;
}
-
GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
-
- GSN_database->iterate_records (GSN_database->cls, zone_tmp , NULL, zi->offset , &zone_iteration_proc, zi);
+ run_zone_iteration_round (zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-static void handle_iteration_stop (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_STOP");
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct ZoneIterationStopMessage'
+ */
+static void
+handle_iteration_stop (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
- struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
+ struct ZoneIterationStopMessage *zis_msg;
uint32_t rid;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n",
+ "ZONE_ITERATION_STOP");
nc = client_lookup(client);
- if (nc == NULL)
+ if (NULL == nc)
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
+ zis_msg = (struct ZoneIterationStopMessage *) message;
rid = ntohl (zis_msg->gns_header.r_id);
- for (zi = nc->op_head; zi != NULL; zi = zi->next)
- {
+ for (zi = nc->op_head; NULL != zi; zi = zi->next)
if (zi->request_id == rid)
break;
- }
- if (zi == NULL)
+ if (NULL == zi)
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- GNUNET_CONTAINER_DLL_remove(nc->op_head, nc->op_tail, zi);
+ GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, zi);
if (GNUNET_YES == zi->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration for zone `%s'\n", GNUNET_h2s (&zi->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopped zone iteration for zone `%s'\n",
+ GNUNET_short_h2s (&zi->zone));
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration all zones\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopped zone iteration over all zones\n");
GNUNET_free (zi);
-
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-static void handle_iteration_next (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_NEXT");
+/**
+ * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT' message
+ *
+ * @param cls unused
+ * @param client GNUNET_SERVER_Client sending the message
+ * @param message message of type 'struct ZoneIterationNextMessage'
+ */
+static void
+handle_iteration_next (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
- GNUNET_HashCode *zone_tmp;
- struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
+ const struct ZoneIterationNextMessage *zis_msg;
uint32_t rid;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_NEXT");
nc = client_lookup(client);
- if (nc == NULL)
+ if (NULL == nc)
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
+ zis_msg = (const struct ZoneIterationNextMessage *) message;
rid = ntohl (zis_msg->gns_header.r_id);
- for (zi = nc->op_head; zi != NULL; zi = zi->next)
- {
+ for (zi = nc->op_head; NULL != zi; zi = zi->next)
if (zi->request_id == rid)
break;
- }
- if (zi == NULL)
+ if (NULL == zi)
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- if (GNUNET_YES == zi->has_zone)
- zone_tmp = &zi->zone;
- else
- zone_tmp = NULL;
-
- zi->offset++;
- GSN_database->iterate_records (GSN_database->cls, zone_tmp, NULL, zi->offset , &zone_iteration_proc, zi);
+ run_zone_iteration_round (zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-int zonekey_file_it (void *cls, const char *filename)
+
+/**
+ * Load zone keys from directory by reading all .zkey files in this directory
+ *
+ * @param cls int * 'counter' to store the number of files found
+ * @param filename directory to scan
+ * @return GNUNET_OK to continue
+ */
+static int
+zonekey_file_it (void *cls, const char *filename)
{
- int *counter = cls;
- if ((filename != NULL) && (NULL != strstr(filename, ".zkey")))
- {
- struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
- struct GNUNET_NAMESTORE_CryptoContainer *c;
- privkey = GNUNET_CRYPTO_rsa_key_create_from_file(filename);
- if (privkey == NULL)
- return GNUNET_OK;
-
- c = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
- c->pubkey = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
- c->privkey = privkey;
- GNUNET_CRYPTO_rsa_key_get_public(privkey, c->pubkey);
- GNUNET_CRYPTO_hash(c->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &c->zone);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found zonefile for zone `%s'\n", GNUNET_h2s (&c->zone));
-
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &c->zone, c, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- (*counter) ++;
- }
- return GNUNET_OK;
+ unsigned int *counter = cls;
+ struct GNUNET_HashCode long_hash;
+ struct GNUNET_CRYPTO_RsaPrivateKey *privkey;
+ struct GNUNET_NAMESTORE_CryptoContainer *c;
+
+ if ((NULL == filename) ||
+ (NULL == strstr(filename, ".zkey")))
+ return GNUNET_OK;
+ privkey = GNUNET_CRYPTO_rsa_key_create_from_file (filename);
+ if (NULL == privkey)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Could not parse zone key file `%s'\n"),
+ filename);
+ return GNUNET_OK;
+ }
+ c = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
+ c->pubkey = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ c->privkey = privkey;
+ GNUNET_CRYPTO_rsa_key_get_public(privkey, c->pubkey);
+ GNUNET_CRYPTO_short_hash(c->pubkey,
+ sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &c->zone);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found zonefile for zone `%s'\n", GNUNET_short_h2s (&c->zone));
+ GNUNET_CRYPTO_short_hash_double (&c->zone, &long_hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (zonekeys, &long_hash, c,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ (*counter)++;
+ return GNUNET_OK;
}
/**
- * Process template requests.
+ * Process namestore requests.
*
* @param cls closure
* @param server the initialized server
run (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- char * database;
- int counter = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting namestore service\n");
-
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
{&handle_start, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_START, sizeof (struct StartMessage)},
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP, 0},
{NULL, NULL, 0, 0}
};
+ char *database;
+ unsigned int counter;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting namestore service\n");
GSN_cfg = cfg;
/* Load private keys from disk */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore", "zonefile_directory",
- &zonefile_directory))
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore",
+ "zonefile_directory",
+ &zonefile_directory))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("No directory to load zonefiles specified in configuration\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("No directory to load zonefiles specified in configuration\n"));
GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
return;
}
{
if (GNUNET_SYSERR == GNUNET_DISK_directory_create (zonefile_directory))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Creating directory `%s' for zone files failed!\n"), zonefile_directory);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Creating directory `%s' for zone files failed!\n"),
+ zonefile_directory);
GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created directory `%s' for zone files\n", zonefile_directory);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created directory `%s' for zone files\n",
+ zonefile_directory);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Scanning directory `%s' for zone files\n", zonefile_directory);
- zonekeys = GNUNET_CONTAINER_multihashmap_create (10);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Scanning directory `%s' for zone files\n", zonefile_directory);
+ zonekeys = GNUNET_CONTAINER_multihashmap_create (16);
+ counter = 0;
GNUNET_DISK_directory_scan (zonefile_directory, zonekey_file_it, &counter);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u zone files\n", counter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found %u zone files\n",
+ counter);
/* Loading database plugin */
if (GNUNET_OK !=
GNUNET_asprintf (&db_lib_name, "libgnunet_plugin_namestore_%s", database);
GSN_database = GNUNET_PLUGIN_load (db_lib_name, (void *) GSN_cfg);
GNUNET_free (database);
- if (GSN_database == NULL)
+ if (NULL == GSN_database)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not load database backend `%s'\n",
- db_lib_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not load database backend `%s'\n",
+ db_lib_name);
GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
return;
}
GNUNET_SERVER_disconnect_notify (server,
&client_disconnect_notification,
NULL);
-
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
NULL);
-
}
projects / oweals / gnunet.git / blobdiff