/*
This file is part of GNUnet.
- (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ (C) 2012, 2013, 2014 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
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dnsparser_lib.h"
+#include "gnunet_gns_service.h"
+#include "gnunet_namecache_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_namestore_plugin.h"
#include "gnunet_signatures.h"
*/
struct NamestoreClient *client;
+ /**
+ * The nick to add to the records
+ */
+ struct GNUNET_GNSRECORD_Data *nick;
+
/**
* Key of the zone we are iterating over.
*/
*/
struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
- /**
- * The operation id fot the zone iteration in the response for the client
- */
- uint32_t request_id;
-
/**
* Task active during initial iteration.
*/
};
+/**
+ * Pending operation on the namecache.
+ */
+struct CacheOperation
+{
+
+ /**
+ * Kept in a DLL.
+ */
+ struct CacheOperation *prev;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct CacheOperation *next;
+
+ /**
+ * Handle to namecache queue.
+ */
+ struct GNUNET_NAMECACHE_QueueEntry *qe;
+
+ /**
+ * Client to notify about the result.
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Client's request ID.
+ */
+ uint32_t rid;
+};
+
+
+/**
+ * Public key of all zeros.
+ */
+static const struct GNUNET_CRYPTO_EcdsaPrivateKey zero;
+
/**
* Configuration handle.
*/
static const struct GNUNET_CONFIGURATION_Handle *GSN_cfg;
+/**
+ * Namecache handle.
+ */
+static struct GNUNET_NAMECACHE_Handle *namecache;
+
/**
* Database handle
*/
*/
static struct NamestoreClient *client_tail;
+/**
+ * Head of cop DLL.
+ */
+static struct CacheOperation *cop_head;
+
+/**
+ * Tail of cop DLL.
+ */
+static struct CacheOperation *cop_tail;
+
/**
* First active zone monitor.
*/
{
struct ZoneIteration *no;
struct NamestoreClient *nc;
+ struct CacheOperation *cop;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Stopping namestore service\n");
GNUNET_SERVER_notification_context_destroy (snc);
snc = NULL;
}
+ while (NULL != (cop = cop_head))
+ {
+ GNUNET_NAMECACHE_cancel (cop->qe);
+ GNUNET_CONTAINER_DLL_remove (cop_head,
+ cop_tail,
+ cop);
+ GNUNET_free (cop);
+ }
+ GNUNET_NAMECACHE_disconnect (namecache);
+ namecache = NULL;
while (NULL != (nc = client_head))
{
while (NULL != (no = nc->op_head))
GNUNET_free (no);
}
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
- GNUNET_SERVER_client_set_user_context (nc->client, NULL);
+ GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL);
GNUNET_free (nc);
}
GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
struct ZoneIteration *no;
struct NamestoreClient *nc;
struct ZoneMonitor *zm;
+ struct CacheOperation *cop;
if (NULL == client)
return;
break;
}
}
+ for (cop = cop_head; NULL != cop; cop = cop->next)
+ if (client == cop->client)
+ cop->client = NULL;
}
/**
- * Context for name lookups passed from #handle_lookup_block to
- * #handle_lookup_block_it as closure
- */
-struct LookupBlockContext
-{
- /**
- * The client to send the response to
- */
- struct NamestoreClient *nc;
-
- /**
- * Operation id for the name lookup
- */
- uint32_t request_id;
-
-};
-
-
-/**
- * A #GNUNET_NAMESTORE_BlockCallback for name lookups in #handle_lookup_block
+ * Function called with the records for the #GNUNET_GNS_MASTERZONE_STR
+ * label in the zone. Used to locate the #GNUNET_GNSRECORD_TYPE_NICK
+ * record, which (if found) is then copied to @a cls for future use.
*
- * @param cls a `struct LookupNameContext *` with information about the request
- * @param block the block
- */
-static void
-handle_lookup_block_it (void *cls,
- const struct GNUNET_NAMESTORE_Block *block)
-{
- struct LookupBlockContext *lnc = cls;
- struct LookupBlockResponseMessage *r;
- size_t esize;
-
- esize = ntohl (block->purpose.size)
- - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)
- - sizeof (struct GNUNET_TIME_AbsoluteNBO);
- r = GNUNET_malloc (sizeof (struct LookupBlockResponseMessage) + esize);
- r->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE);
- r->gns_header.header.size = htons (sizeof (struct LookupBlockResponseMessage) + esize);
- r->gns_header.r_id = htonl (lnc->request_id);
- r->expire = block->expiration_time;
- r->signature = block->signature;
- r->derived_key = block->derived_key;
- memcpy (&r[1], &block[1], esize);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message with expiration time %s\n",
- "NAMESTORE_LOOKUP_BLOCK_RESPONSE",
- GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (r->expire)));
- GNUNET_SERVER_notification_context_unicast (snc,
- lnc->nc->client,
- &r->gns_header.header,
- GNUNET_NO);
- GNUNET_free (r);
-}
-
-
-/**
- * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK message
- *
- * @param cls unused
- * @param client client sending the message
- * @param message message of type 'struct LookupNameMessage'
+ * @param cls a `struct GNUNET_GNSRECORD_Data **` for storing the nick (if found)
+ * @param private_key the private key of the zone (unused)
+ * @param label should be #GNUNET_GNS_MASTERZONE_STR
+ * @param rd_count number of records in @a rd
+ * @param rd records stored under @a label in the zone
*/
static void
-handle_lookup_block (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+lookup_nick_it (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- const struct LookupBlockMessage *ln_msg;
- struct LookupBlockContext lnc;
- struct NamestoreClient *nc;
- struct LookupBlockResponseMessage zir_end;
- int ret;
+ struct GNUNET_GNSRECORD_Data **res = cls;
+ int c;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "NAMESTORE_LOOKUP_BLOCK");
- nc = client_lookup(client);
- ln_msg = (const struct LookupBlockMessage *) message;
- lnc.request_id = ntohl (ln_msg->gns_header.r_id);
- lnc.nc = nc;
- if (GNUNET_SYSERR ==
- (ret = GSN_database->lookup_block (GSN_database->cls,
- &ln_msg->query,
- &handle_lookup_block_it, &lnc)))
+ if (0 != strcmp (label, GNUNET_GNS_MASTERZONE_STR))
{
- /* internal error (in database plugin); might be best to just hang up on
- plugin rather than to signal that there are 'no' results, which
- might also be false... */
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- if (0 == ret)
+ for (c = 0; c < rd_count; c++)
{
- /* no records match at all, generate empty response */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending empty `%s' message\n",
- "NAMESTORE_LOOKUP_BLOCK_RESPONSE");
- memset (&zir_end, 0, sizeof (zir_end));
- zir_end.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE);
- zir_end.gns_header.header.size = htons (sizeof (struct LookupBlockResponseMessage));
- zir_end.gns_header.r_id = ln_msg->gns_header.r_id;
- GNUNET_SERVER_notification_context_unicast (snc,
- client,
- &zir_end.gns_header.header,
- GNUNET_NO);
-
+ if (GNUNET_GNSRECORD_TYPE_NICK == rd[c].record_type)
+ {
+ (*res) = GNUNET_malloc (rd[c].data_size + sizeof (struct GNUNET_GNSRECORD_Data));
+ (*res)->data = &(*res)[1];
+ memcpy ((char *)(*res)->data, rd[c].data, rd[c].data_size);
+ (*res)->data_size = rd[c].data_size;
+ (*res)->expiration_time = rd[c].expiration_time;
+ (*res)->flags = rd[c].flags;
+ (*res)->record_type = GNUNET_GNSRECORD_TYPE_NICK;
+ return;
+ }
}
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ (*res) = NULL;
}
/**
- * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE message
+ * Return the NICK record for the zone (if it exists).
*
- * @param cls unused
- * @param client client sending the message
- * @param message message of type 'struct BlockCacheMessage'
+ * @param zone private key for the zone to look for nick
+ * @return NULL if no NICK record was found
*/
-static void
-handle_block_cache (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+static struct GNUNET_GNSRECORD_Data *
+get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone)
{
- struct NamestoreClient *nc;
- const struct BlockCacheMessage *rp_msg;
- struct BlockCacheResponseMessage rpr_msg;
- struct GNUNET_NAMESTORE_Block *block;
- size_t esize;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_GNSRECORD_Data *nick;
int res;
- nc = client_lookup (client);
- if (ntohs (message->size) < sizeof (struct BlockCacheMessage))
+ res = GSN_database->lookup_records (GSN_database->cls, zone,
+ GNUNET_GNS_MASTERZONE_STR,
+ &lookup_nick_it, &nick);
+ if ((NULL == nick) || (GNUNET_OK != res))
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone, &pub);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+ "No nick name set for zone `%s'\n",
+ GNUNET_GNSRECORD_z2s (&pub));
+ return NULL;
+ }
+ return nick;
+}
+
+
+static void
+merge_with_nick_records ( const struct GNUNET_GNSRECORD_Data *nick_rd,
+ unsigned int rdc2,
+ const struct GNUNET_GNSRECORD_Data *rd2,
+ unsigned int *rdc_res,
+ struct GNUNET_GNSRECORD_Data **rd_res)
+{
+ uint64_t latest_expiration;
+ int c;
+ size_t req;
+ char *data;
+ int record_offset;
+ size_t data_offset;
+ (*rdc_res) = 1 + rdc2;
+
+ if (0 == 1 + rdc2)
+ {
+ (*rd_res) = NULL;
return;
}
- rp_msg = (const struct BlockCacheMessage *) message;
- esize = ntohs (rp_msg->gns_header.header.size) - sizeof (struct BlockCacheMessage);
- block = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Block) + esize);
- block->signature = rp_msg->signature;
- block->derived_key = rp_msg->derived_key;
- block->purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- sizeof (struct GNUNET_TIME_AbsoluteNBO) +
- esize);
- block->expiration_time = rp_msg->expire;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message with expiration time %s\n",
- "NAMESTORE_BLOCK_CACHE",
- GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (block->expiration_time)));
- memcpy (&block[1], &rp_msg[1], esize);
- res = GSN_database->cache_block (GSN_database->cls,
- block);
- GNUNET_free (block);
- rpr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE);
- rpr_msg.gns_header.header.size = htons (sizeof (struct BlockCacheResponseMessage));
- rpr_msg.gns_header.r_id = rp_msg->gns_header.r_id;
- rpr_msg.op_result = htonl (res);
- GNUNET_SERVER_notification_context_unicast (snc,
- nc->client,
- &rpr_msg.gns_header.header,
- GNUNET_NO);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ req = 0;
+ for (c=0; c< 1; c++)
+ req += sizeof (struct GNUNET_GNSRECORD_Data) + nick_rd[c].data_size;
+ for (c=0; c< rdc2; c++)
+ req += sizeof (struct GNUNET_GNSRECORD_Data) + rd2[c].data_size;
+ (*rd_res) = GNUNET_malloc (req);
+ data = (char *) &(*rd_res)[1 + rdc2];
+ data_offset = 0;
+ latest_expiration = 0;
+
+ for (c=0; c< rdc2; c++)
+ {
+ if (0 != (rd2[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
+ {
+ if ((GNUNET_TIME_absolute_get().abs_value_us + rd2[c].expiration_time) >
+ latest_expiration)
+ latest_expiration = rd2[c].expiration_time;
+ }
+ else if (rd2[c].expiration_time > latest_expiration)
+ latest_expiration = rd2[c].expiration_time;
+ (*rd_res)[c] = rd2[c];
+ (*rd_res)[c].data = (void *) &data[data_offset];
+ // WTF?
+ memcpy ((void *) (*rd_res)[c].data, rd2[c].data, rd2[c].data_size);
+ data_offset += (*rd_res)[c].data_size;
+ }
+ record_offset = rdc2;
+ for (c=0; c< 1; c++)
+ {
+ (*rd_res)[c+record_offset] = nick_rd[c];
+ (*rd_res)[c+record_offset].expiration_time = latest_expiration;
+ (*rd_res)[c+record_offset].data = (void *) &data[data_offset];
+ // WTF?
+ memcpy ((void *) (*rd_res)[c+record_offset].data,
+ nick_rd[c].data,
+ nick_rd[c].data_size);
+ data_offset += (*rd_res)[c+record_offset].data_size;
+ }
+ GNUNET_assert (req == (sizeof (struct GNUNET_GNSRECORD_Data)) * (*rdc_res) + data_offset);
}
/**
- * Generate a 'struct LookupNameResponseMessage' and send it to the
+ * Generate a `struct LookupNameResponseMessage` and send it to the
* given client using the given notification context.
*
* @param nc notification context to use
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct RecordResultMessage *zir_msg;
+ struct GNUNET_GNSRECORD_Data *nick;
+ struct GNUNET_GNSRECORD_Data *res;
+ unsigned int res_count;
size_t name_len;
size_t rd_ser_len;
size_t msg_size;
char *name_tmp;
char *rd_ser;
+ nick = get_nick_record (zone_key);
+ if ((NULL != nick) && (0 != strcmp(name, GNUNET_GNS_MASTERZONE_STR)))
+ {
+ nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (nick, rd_count, rd, &res_count, &res);
+ //fprintf (stderr, "Merging %u records for `%s' with NICK records\n",rd_count, name);
+ GNUNET_free (nick);
+ }
+ else
+ {
+ res_count = rd_count;
+ res = (struct GNUNET_GNSRECORD_Data *) rd;
+ //fprintf (stderr, "Not merging %u records for `%s' with NICK records\n",rd_count, name);
+ }
+
name_len = strlen (name) + 1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (res_count, res);
msg_size = sizeof (struct RecordResultMessage) + name_len + rd_ser_len;
-
+ (void) client_lookup (client);
zir_msg = GNUNET_malloc (msg_size);
zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
zir_msg->gns_header.header.size = htons (msg_size);
zir_msg->gns_header.r_id = htonl (request_id);
zir_msg->name_len = htons (name_len);
- zir_msg->rd_count = htons (rd_count);
+ zir_msg->rd_count = htons (res_count);
zir_msg->rd_len = htons (rd_ser_len);
zir_msg->private_key = *zone_key;
name_tmp = (char *) &zir_msg[1];
memcpy (name_tmp, name, name_len);
rd_ser = &name_tmp[name_len];
- GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
+ GNUNET_GNSRECORD_records_serialize (res_count, res, rd_ser_len, rd_ser);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending `%s' message with %u records and size %u\n",
"RECORD_RESULT",
- rd_count,
+ res_count,
msg_size);
GNUNET_SERVER_notification_context_unicast (nc,
client,
&zir_msg->gns_header.header,
GNUNET_NO);
+ if (rd != res)
+ GNUNET_free (res);
GNUNET_free (zir_msg);
}
+/**
+ * Send response to the store request to the client.
+ *
+ * @param client client to talk to
+ * @param res status of the operation
+ * @param rid client's request ID
+ */
+static void
+send_store_response (struct GNUNET_SERVER_Client *client,
+ int res,
+ uint32_t rid)
+{
+ struct RecordStoreResponseMessage rcr_msg;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message\n",
+ "RECORD_STORE_RESPONSE");
+ rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE);
+ rcr_msg.gns_header.header.size = htons (sizeof (struct RecordStoreResponseMessage));
+ rcr_msg.gns_header.r_id = htonl (rid);
+ rcr_msg.op_result = htonl (res);
+ GNUNET_SERVER_notification_context_unicast (snc, client,
+ &rcr_msg.gns_header.header,
+ GNUNET_NO);
+}
+
+
+/**
+ * Cache operation complete, clean up.
+ *
+ * @param cls the `struct CacheOperation`
+ * @param success success
+ * @param emsg error messages
+ */
+static void
+finish_cache_operation (void *cls,
+ int32_t success,
+ const char *emsg)
+{
+ struct CacheOperation *cop = cls;
+
+ if (NULL != emsg)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to replicate block in namecache: %s\n"),
+ emsg);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "CACHE operation completed\n");
+ GNUNET_CONTAINER_DLL_remove (cop_head,
+ cop_tail,
+ cop);
+ if (NULL != cop->client)
+ send_store_response (cop->client,
+ success,
+ cop->rid);
+ GNUNET_free (cop);
+}
+
+
/**
* We just touched the plaintext information about a name in our zone;
- * refresh the corresponding (encrypted) block in the namestore.
+ * refresh the corresponding (encrypted) block in the namecache.
*
+ * @param client client responsible for the request
+ * @param rid request ID of the client
* @param zone_key private key of the zone
* @param name label for the records
* @param rd_count number of records
* @param rd records stored under the given @a name
*/
static void
-refresh_block (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+refresh_block (struct GNUNET_SERVER_Client *client,
+ uint32_t rid,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- struct GNUNET_NAMESTORE_Block *block;
+ struct GNUNET_GNSRECORD_Block *block;
+ struct CacheOperation *cop;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+ struct GNUNET_GNSRECORD_Data *nick;
+ struct GNUNET_GNSRECORD_Data *res;
+ unsigned int res_count;
+
+ nick = get_nick_record (zone_key);
+ res_count = rd_count;
+ res = (struct GNUNET_GNSRECORD_Data *) rd; /* fixme: a bit unclean... */
+ if (NULL != nick)
+ {
+ nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (nick, rd_count,rd, &res_count, &res);
+ GNUNET_free (nick);
+ }
- if (0 == rd_count)
- block = GNUNET_NAMESTORE_block_create (zone_key,
+ if (0 == res_count)
+ block = GNUNET_GNSRECORD_block_create (zone_key,
GNUNET_TIME_UNIT_ZERO_ABS,
name,
- rd, rd_count);
+ res, rd_count);
else
- block = GNUNET_NAMESTORE_block_create (zone_key,
- GNUNET_NAMESTORE_record_get_expiration_time (rd_count,
- rd),
+ block = GNUNET_GNSRECORD_block_create (zone_key,
+ GNUNET_GNSRECORD_record_get_expiration_time (res_count,
+ res),
name,
- rd, rd_count);
- if (GNUNET_OK !=
- GSN_database->cache_block (GSN_database->cls,
- block))
+ res, res_count);
+ GNUNET_assert (NULL != block);
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
+ &pkey);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Caching block for label `%s' with %u records in zone `%s' in namecache\n",
+ name,
+ res_count,
+ GNUNET_GNSRECORD_z2s (&pkey));
+ cop = GNUNET_new (struct CacheOperation);
+ cop->client = client;
+ cop->rid = rid;
+ GNUNET_CONTAINER_DLL_insert (cop_head,
+ cop_tail,
+ cop);
+ cop->qe = GNUNET_NAMECACHE_block_cache (namecache,
+ block,
+ &finish_cache_operation,
+ cop);
+ GNUNET_free (block);
+}
+
+
+/**
+ * Closure for #lookup_it().
+ */
+struct RecordLookupContext
+{
+ const char *label;
+
+ int found;
+
+ unsigned int res_rd_count;
+
+ size_t rd_ser_len;
+
+ char *res_rd;
+
+ struct GNUNET_GNSRECORD_Data *nick;
+};
+
+
+static void
+lookup_it (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct RecordLookupContext *rlc = cls;
+ struct GNUNET_GNSRECORD_Data *rd_res;
+ unsigned int rdc_res;
+
+ if (0 == strcmp (label, rlc->label))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to cache encrypted block of my own zone!\n"));
+ rlc->found = GNUNET_YES;
+ if (0 != rd_count)
+ {
+ if ((NULL != rlc->nick) && (0 != strcmp(label, GNUNET_GNS_MASTERZONE_STR)))
+ {
+ /* Merge */
+ rd_res = NULL;
+ rdc_res = 0;
+ rlc->nick->flags = (rlc->nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (rlc->nick,
+ rd_count, rd,
+ &rdc_res, &rd_res);
+
+ rlc->rd_ser_len = GNUNET_GNSRECORD_records_get_size (rdc_res, rd_res);
+ rlc->res_rd_count = rdc_res;
+ rlc->res_rd = GNUNET_malloc (rlc->rd_ser_len);
+ GNUNET_GNSRECORD_records_serialize (rdc_res, rd_res, rlc->rd_ser_len , rlc->res_rd);
+
+ GNUNET_free (rd_res);
+ GNUNET_free (rlc->nick);
+ rlc->nick = NULL;
+ }
+ else
+ {
+ rlc->rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
+ rlc->res_rd_count = rd_count;
+ rlc->res_rd = GNUNET_malloc (rlc->rd_ser_len);
+ GNUNET_GNSRECORD_records_serialize (rd_count, rd, rlc->rd_ser_len , rlc->res_rd);
+ }
+ }
+ else
+ {
+ rlc->rd_ser_len = 0;
+ rlc->res_rd_count = 0;
+ rlc->res_rd = NULL;
+ }
}
- GNUNET_free (block);
+}
+
+
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
+ *
+ * @param cls unused
+ * @param client client sending the message
+ * @param message message of type 'struct RecordCreateMessage'
+ */
+static void
+handle_record_lookup (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct LabelLookupMessage *ll_msg;
+ struct LabelLookupResponseMessage *llr_msg;
+ struct RecordLookupContext rlc;
+ const char *name_tmp;
+ char *res_name;
+ uint32_t name_len;
+ size_t src_size;
+ size_t res_size;
+ int res;
+
+ if (ntohs (message->size) < sizeof (struct LabelLookupMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ ll_msg = (const struct LabelLookupMessage *) message;
+ name_len = ntohl (ll_msg->label_len);
+ src_size = ntohs (message->size);
+
+ if (name_len != src_size - sizeof (struct LabelLookupMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ name_tmp = (const char *) &ll_msg[1];
+ if ('\0' != name_tmp[name_len -1])
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message for name `%s'\n",
+ "NAMESTORE_RECORD_LOOKUP", name_tmp);
+
+ if (NULL == (client_lookup (client)))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ rlc.label = name_tmp;
+ rlc.found = GNUNET_NO;
+ rlc.res_rd_count = 0;
+ rlc.res_rd = NULL;
+ rlc.rd_ser_len = 0;
+ rlc.nick = get_nick_record (&ll_msg->zone);
+
+ res = GSN_database->lookup_records (GSN_database->cls,
+ &ll_msg->zone, name_tmp, &lookup_it, &rlc);
+
+ res_size = sizeof (struct LabelLookupResponseMessage) + name_len + rlc.rd_ser_len;
+ llr_msg = GNUNET_malloc (res_size);
+ llr_msg->gns_header.header.size = htons (res_size);
+ llr_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE);
+ llr_msg->gns_header.r_id = ll_msg->gns_header.r_id;
+ llr_msg->private_key = ll_msg->zone;
+ llr_msg->name_len = htons (name_len);
+ llr_msg->rd_count = htons (rlc.res_rd_count);
+ llr_msg->rd_len = htons (rlc.rd_ser_len);
+ res_name = (char *) &llr_msg[1];
+ if ((GNUNET_YES == rlc.found) && (GNUNET_OK == res))
+ llr_msg->found = ntohs (GNUNET_YES);
+ else
+ llr_msg->found = ntohs (GNUNET_NO);
+ memcpy (&llr_msg[1], name_tmp, name_len);
+ memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len);
+
+ GNUNET_SERVER_notification_context_unicast (snc, client, &llr_msg->gns_header.header,
+ GNUNET_NO);
+
+ GNUNET_free_non_null (rlc.res_rd);
+ GNUNET_free (llr_msg);
}
*/
static void
handle_record_store (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct NamestoreClient *nc;
const struct RecordStoreMessage *rp_msg;
- struct RecordStoreResponseMessage rcr_msg;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- nc = client_lookup (client);
rp_msg = (const struct RecordStoreMessage *) message;
rid = ntohl (rp_msg->gns_header.r_id);
name_len = ntohs (rp_msg->name_len);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ (void) client_lookup (client);
{
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
if (GNUNET_OK !=
- GNUNET_NAMESTORE_records_deserialize (rd_ser_len, rd_ser, rd_count, rd))
+ GNUNET_GNSRECORD_records_deserialize (rd_ser_len, rd_ser, rd_count, rd))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
/* Extracting and converting private key */
GNUNET_CRYPTO_ecdsa_key_get_public (&rp_msg->private_key,
&pubkey);
- conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp);
+ conv_name = GNUNET_GNSRECORD_string_to_lowercase (name_tmp);
if (NULL == conv_name)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Creating %u records for name `%s' in zone `%s'\n",
(unsigned int) rd_count,
conv_name,
- GNUNET_NAMESTORE_z2s (&pubkey));
+ GNUNET_GNSRECORD_z2s (&pubkey));
if ( (0 == rd_count) &&
(GNUNET_NO ==
}
else
{
+ struct GNUNET_GNSRECORD_Data rd_clean[rd_count];
+ unsigned int i;
+ unsigned int rd_clean_off;
+
+ /* remove "NICK" records, unless this is for the "+" label */
+ rd_clean_off = 0;
+ for (i=0;i<rd_count;i++)
+ {
+ rd_clean[rd_clean_off] = rd[i];
+ if ( (0 == strcmp (GNUNET_GNS_MASTERZONE_STR,
+ conv_name)) ||
+ (GNUNET_GNSRECORD_TYPE_NICK != rd[i].record_type) )
+ rd_clean_off++;
+ }
res = GSN_database->store_records (GSN_database->cls,
&rp_msg->private_key,
conv_name,
- rd_count, rd);
+ rd_clean_off, rd_clean);
if (GNUNET_OK == res)
{
- refresh_block (&rp_msg->private_key,
- conv_name,
- rd_count, rd);
-
for (zm = monitor_head; NULL != zm; zm = zm->next)
- if (0 == memcmp (&rp_msg->private_key, &zm->zone,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+ {
+ if ( (0 == memcmp (&rp_msg->private_key, &zm->zone,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) ||
+ (0 == memcmp (&zm->zone,
+ &zero,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying monitor about changes under label `%s'\n",
+ conv_name);
send_lookup_response (monitor_nc,
zm->nc->client,
- zm->request_id,
+ 0,
&rp_msg->private_key,
conv_name,
rd_count, rd);
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Monitor is for another zone\n");
+ }
+ if (NULL == monitor_head)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No monitors active\n");
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error storing record: %d\n",
+ res);
+ }
+ }
+ if (GNUNET_OK == res)
+ {
+ refresh_block (client, rid,
+ &rp_msg->private_key,
+ conv_name,
+ rd_count, rd);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
GNUNET_free (conv_name);
+ return;
}
+ GNUNET_free (conv_name);
}
-
- /* Send response */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
- "RECORD_STORE_RESPONSE");
- rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE);
- rcr_msg.gns_header.header.size = htons (sizeof (struct RecordStoreResponseMessage));
- rcr_msg.gns_header.r_id = htonl (rid);
- rcr_msg.op_result = htonl (res);
- GNUNET_SERVER_notification_context_unicast (snc, nc->client,
- &rcr_msg.gns_header.header,
- GNUNET_NO);
+ send_store_response (client, res, rid);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneToNameCtx *ztn_ctx = cls;
struct ZoneToNameResponseMessage *ztnr_msg;
name);
res = GNUNET_YES;
name_len = (NULL == name) ? 0 : strlen (name) + 1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
msg_size = sizeof (struct ZoneToNameResponseMessage) + name_len + rd_ser_len;
if (msg_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
if (NULL != name)
memcpy (name_tmp, name, name_len);
rd_tmp = &name_tmp[name_len];
- GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_tmp);
+ GNUNET_GNSRECORD_records_serialize (rd_count, rd, rd_ser_len, rd_tmp);
ztn_ctx->success = GNUNET_OK;
GNUNET_SERVER_notification_context_unicast (snc, ztn_ctx->nc->client,
&ztnr_msg->gns_header.header,
/**
* Context for record remove operations passed from
- * #run_zone_iteration_round to #zone_iteraterate_proc as closure
+ * #run_zone_iteration_round to #zone_iterate_proc as closure
*/
struct ZoneIterationProcResult
{
* @param rd record data
*/
static void
-zone_iteraterate_proc (void *cls,
+zone_iterate_proc (void *cls,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneIterationProcResult *proc = cls;
unsigned int i;
rd);
do_refresh_block = GNUNET_NO;
for (i=0;i<rd_count;i++)
- if( (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)) &&
- (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING)) )
+ if( (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) &&
+ (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) )
{
do_refresh_block = GNUNET_YES;
break;
}
if (GNUNET_YES == do_refresh_block)
- refresh_block (zone_key,
+ refresh_block (NULL, 0,
+ zone_key,
name,
rd_count,
rd);
static void
run_zone_iteration_round (struct ZoneIteration *zi)
{
- static struct GNUNET_CRYPTO_EcdsaPrivateKey zero;
struct ZoneIterationProcResult proc;
struct RecordResultMessage rrm;
int ret;
? NULL
: &zi->zone,
zi->offset,
- &zone_iteraterate_proc, &proc)))
+ &zone_iterate_proc, &proc)))
{
GNUNET_break (0);
break;
zi->offset = 0;
zi->client = nc;
zi->zone = zis_msg->zone;
+
+
GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
run_zone_iteration_round (zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
const struct ZoneIterationNextMessage *zis_msg;
uint32_t rid;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_NEXT");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n",
+ "ZONE_ITERATION_NEXT");
if (NULL == (nc = client_lookup(client)))
{
GNUNET_break (0);
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneMonitor *zm = cls;
}
send_lookup_response (monitor_nc,
zm->nc->client,
- zm->request_id,
+ 0,
zone_key,
name,
rd_count,
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START message
*
* @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
+ * @param client the client sending the message
* @param message message of type 'struct ZoneMonitorStartMessage'
*/
static void
"ZONE_MONITOR_START");
zis_msg = (const struct ZoneMonitorStartMessage *) message;
zm = GNUNET_new (struct ZoneMonitor);
- zm->request_id = ntohl (zis_msg->gns_header.r_id);
zm->offset = 0;
zm->nc = client_lookup (client);
zm->zone = zis_msg->zone;
GNUNET_SERVER_disable_receive_done_warning (client);
GNUNET_SERVER_notification_context_add (monitor_nc,
client);
- zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
+ if (GNUNET_YES == ntohl (zis_msg->iterate_first))
+ zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
+ else
+ monitor_sync (zm);
}
zm->task = GNUNET_SCHEDULER_NO_TASK;
ret = GSN_database->iterate_records (GSN_database->cls,
- &zm->zone,
+ (0 == memcmp (&zm->zone, &zero, sizeof (zero)))
+ ? NULL
+ : &zm->zone,
zm->offset++,
&monitor_iterate_cb, zm);
if (GNUNET_SYSERR == ret)
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_lookup_block, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK, sizeof (struct LookupBlockMessage)},
- {&handle_block_cache, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE, 0},
{&handle_record_store, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE, 0},
+ {&handle_record_lookup, NULL,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP, 0},
{&handle_zone_to_name, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME, sizeof (struct ZoneToNameMessage) },
{&handle_iteration_start, NULL,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting namestore service\n");
GSN_cfg = cfg;
monitor_nc = GNUNET_SERVER_notification_context_create (server, 1);
-
+ namecache = GNUNET_NAMECACHE_connect (cfg);
/* Loading database plugin */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, "namestore", "database",
projects / oweals / gnunet.git / blobdiff