/*
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_EccPrivateKey zone;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/**
* The operation id fot the zone iteration in the response for the client
*/
- uint64_t request_id;
+ uint32_t request_id;
/**
* Offset of the zone iteration used to address next result of the zone
/**
* Namestore client which intiated this zone monitor
*/
- struct GNUNET_SERVER_Client *client;
+ struct NamestoreClient *nc;
/**
* Private key of the zone.
*/
- struct GNUNET_CRYPTO_EccPrivateKey zone;
-
- /**
- * The operation id fot the zone iteration in the response for the client
- */
- uint64_t request_id;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/**
* Task active during initial iteration.
* 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
+ * Initialy set to 0.
+ * Incremented with by every call to #handle_iteration_next
*/
uint32_t offset;
};
+/**
+ * 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_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping namestore service\n");
if (NULL != snc)
{
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, (void *)NULL);
GNUNET_free (nc);
}
GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
}
-/**
- * Lookup our internal data structure for a given client.
- *
- * @param client server client handle to use for the lookup
- * @return our internal structure for the client, NULL if
- * we do not have any yet
- */
-static struct NamestoreClient *
-client_lookup (struct GNUNET_SERVER_Client *client)
-{
- struct NamestoreClient *nc;
-
- GNUNET_assert (NULL != client);
- for (nc = client_head; NULL != nc; nc = nc->next)
- if (client == nc->client)
- return nc;
- return NULL;
-}
-
-
/**
* Called whenever a client is disconnected.
* Frees our resources associated with that client.
* @param client identification of the client
*/
static void
-client_disconnect_notification (void *cls,
+client_disconnect_notification (void *cls,
struct GNUNET_SERVER_Client *client)
{
struct ZoneIteration *no;
struct NamestoreClient *nc;
struct ZoneMonitor *zm;
+ struct CacheOperation *cop;
if (NULL == client)
return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client %p disconnected\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p disconnected\n",
client);
- if (NULL == (nc = client_lookup (client)))
+ if (NULL == (nc = GNUNET_SERVER_client_get_user_context (client, struct NamestoreClient)))
return;
while (NULL != (no = nc->op_head))
{
GNUNET_free (nc);
for (zm = monitor_head; NULL != zm; zm = zm->next)
{
- if (client == zm->client)
+ if (client == zm->nc->client)
{
GNUNET_CONTAINER_DLL_remove (monitor_head,
monitor_tail,
break;
}
}
+ for (cop = cop_head; NULL != cop; cop = cop->next)
+ if (client == cop->client)
+ cop->client = NULL;
}
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_START' message
+ * Add a client to our list of active clients, if it is not yet
+ * in there.
*
- * @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
- * @param message unused
+ * @param client client to add
+ * @return internal namestore client structure for this client
*/
-static void
-handle_start (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+static struct NamestoreClient *
+client_lookup (struct GNUNET_SERVER_Client *client)
{
struct NamestoreClient *nc;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client %p connected\n", client);
- if (NULL != client_lookup (client))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- nc = GNUNET_malloc (sizeof (struct NamestoreClient));
+ nc = GNUNET_SERVER_client_get_user_context (client, struct NamestoreClient);
+ if (NULL != nc)
+ return nc;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p connected\n",
+ client);
+ nc = GNUNET_new (struct NamestoreClient);
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);
+ GNUNET_SERVER_client_set_user_context (client, nc);
+ return nc;
}
/**
- * 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 NamestoreClient *nc;
-
- /**
- * Requested zone
- */
- const struct GNUNET_CRYPTO_ShortHashCode *zone;
-
- /**
- * Requested name
- */
- const char *name;
-
- /**
- * Operation id for the name lookup
- */
- uint32_t request_id;
-
- /**
- * Requested specific record type
- */
- uint32_t record_type;
-};
-
-
-/**
- * A 'GNUNET_NAMESTORE_RecordIterator' for name lookups in handle_lookup_name
+ * 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 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
+ * @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_name_it (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+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)
{
- struct LookupNameContext *lnc = cls;
- struct LookupNameResponseMessage *lnr_msg;
- struct GNUNET_NAMESTORE_RecordData *rd_selected;
- struct GNUNET_NAMESTORE_CryptoContainer *cc;
- struct GNUNET_CRYPTO_EccSignature *signature_new;
- struct GNUNET_TIME_Absolute e;
- struct GNUNET_TIME_Relative re;
- struct GNUNET_CRYPTO_ShortHashCode zone_key_hash;
- struct GNUNET_HashCode long_hash;
- char *rd_tmp;
- char *name_tmp;
- size_t rd_ser_len;
- size_t r_size;
- size_t name_len;
- int copied_elements;
- int contains_signature;
- int authoritative;
- int rd_modified;
- unsigned int c;
+ struct GNUNET_GNSRECORD_Data **res = cls;
+ int c;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found %u records under name `%s'\n",
- rd_count,
- name);
- authoritative = GNUNET_NO;
- signature_new = NULL;
- cc = NULL;
- if (NULL != zone_key)
+ if (0 != strcmp (label, GNUNET_GNS_MASTERZONE_STR))
{
- GNUNET_CRYPTO_short_hash (zone_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &zone_key_hash);
- GNUNET_CRYPTO_short_hash_double (&zone_key_hash, &long_hash);
- if (NULL != (cc = GNUNET_CONTAINER_multihashmap_get (zonekeys, &long_hash)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Am authoritative for zone `%s'\n",
- GNUNET_NAMESTORE_short_h2s (&zone_key_hash));
- authoritative = GNUNET_YES;
- }
+ GNUNET_break (0);
+ return;
}
-
- copied_elements = 0;
- rd_modified = GNUNET_NO;
- rd_selected = NULL;
- /* count records to copy */
for (c = 0; c < rd_count; c++)
{
- if ( (GNUNET_YES == authoritative) &&
- (GNUNET_YES ==
- GNUNET_NAMESTORE_is_expired (&rd[c]) ) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Skipping expired record\n");
- continue;
- }
- if ( (GNUNET_NAMESTORE_TYPE_ANY == lnc->record_type) ||
- (rd[c].record_type == lnc->record_type) )
- copied_elements++; /* found matching record */
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Skipping non-mtaching record\n");
- rd_modified = GNUNET_YES;
- }
- }
- 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_NAMESTORE_short_h2s(lnc->zone));
- if (copied_elements > 0)
- {
- rd_selected = GNUNET_malloc (copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData));
- copied_elements = 0;
- for (c = 0; c < rd_count; c++)
- {
- if ( (GNUNET_YES == authoritative) &&
- (GNUNET_YES ==
- GNUNET_NAMESTORE_is_expired (&rd[c])) )
- continue;
- if ( (GNUNET_NAMESTORE_TYPE_ANY == lnc->record_type) ||
- (rd[c].record_type == lnc->record_type) )
- {
- if (0 != (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
- {
- GNUNET_break (GNUNET_YES == authoritative);
- rd_modified = GNUNET_YES;
- re.rel_value_us = rd[c].expiration_time;
- e = GNUNET_TIME_relative_to_absolute (re);
- }
- else
- {
- e.abs_value_us = rd[c].expiration_time;
- }
- /* found matching record, copy and convert flags to public format */
- rd_selected[copied_elements] = rd[c]; /* shallow copy! */
- rd_selected[copied_elements].expiration_time = e.abs_value_us;
- if (0 != (rd_selected[copied_elements].flags &
- (GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION | GNUNET_NAMESTORE_RF_AUTHORITY)))
- {
- rd_selected[copied_elements].flags &= ~ (GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION |
- GNUNET_NAMESTORE_RF_AUTHORITY);
- rd_modified = GNUNET_YES;
- }
- copied_elements++;
- }
- else
- {
- rd_modified = GNUNET_YES;
- }
- }
- }
- else
- rd_selected = NULL;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found %u matching records for name `%s' in zone `%s'\n",
- copied_elements,
- lnc->name,
- GNUNET_NAMESTORE_short_h2s (lnc->zone));
- contains_signature = GNUNET_NO;
- if (copied_elements > 0)
- {
- if (GNUNET_YES == authoritative)
- {
- GNUNET_assert (NULL != cc);
- e = get_block_expiration_time (rd_count, rd);
- signature_new = GNUNET_NAMESTORE_create_signature (cc->privkey, e, name, rd_selected, copied_elements);
- GNUNET_assert (NULL != signature_new);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating signature for name `%s' with %u records in zone `%s'\n",
- name,
- copied_elements,
- GNUNET_NAMESTORE_short_h2s(&zone_key_hash));
- }
- else
+ if (GNUNET_GNSRECORD_TYPE_NICK == rd[c].record_type)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Not authoritative, records modified is %d, have sig is %d\n",
- rd_modified,
- NULL != signature);
- if ((GNUNET_NO == rd_modified) && (NULL != signature))
- contains_signature = GNUNET_YES; /* returning all records, so include signature */
+ (*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;
}
}
-
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (copied_elements, rd_selected);
- name_len = (NULL == name) ? 0 : strlen(name) + 1;
- r_size = sizeof (struct LookupNameResponseMessage) +
- name_len +
- rd_ser_len;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
- "NAMESTORE_LOOKUP_NAME_RESPONSE");
- lnr_msg = GNUNET_malloc (r_size);
- lnr_msg->gns_header.header.type = ntohs (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE);
- lnr_msg->gns_header.header.size = ntohs (r_size);
- lnr_msg->gns_header.r_id = htonl (lnc->request_id);
- lnr_msg->rd_count = htons (copied_elements);
- lnr_msg->rd_len = htons (rd_ser_len);
- lnr_msg->name_len = htons (name_len);
- lnr_msg->expire = GNUNET_TIME_absolute_hton (get_block_expiration_time (copied_elements,
- rd_selected));
- name_tmp = (char *) &lnr_msg[1];
- memcpy (name_tmp, name, name_len);
- rd_tmp = &name_tmp[name_len];
- GNUNET_NAMESTORE_records_serialize (copied_elements, rd_selected, rd_ser_len, rd_tmp);
- if (rd_selected != rd)
- GNUNET_free_non_null (rd_selected);
- if (NULL != zone_key)
- lnr_msg->public_key = *zone_key;
- if ( (GNUNET_YES == authoritative) &&
- (copied_elements > 0) )
- {
- /* use new created signature */
- lnr_msg->contains_sig = htons (GNUNET_YES);
- GNUNET_assert (NULL != signature_new);
- lnr_msg->signature = *signature_new;
- GNUNET_free (signature_new);
- }
- else if (GNUNET_YES == contains_signature)
- {
- /* use existing signature */
- lnr_msg->contains_sig = htons (GNUNET_YES);
- GNUNET_assert (NULL != signature);
- lnr_msg->signature = *signature;
- }
- GNUNET_SERVER_notification_context_unicast (snc, lnc->nc->client,
- &lnr_msg->gns_header.header,
- GNUNET_NO);
- GNUNET_free (lnr_msg);
+ (*res) = NULL;
}
/**
- * Send an empty name response to indicate the end of the
- * set of results to the client.
+ * Return the NICK record for the zone (if it exists).
*
- * @param nc notification context to use for sending
- * @param client destination of the empty response
- * @param request_id identification for the request
+ * @param zone private key for the zone to look for nick
+ * @return NULL if no NICK record was found
*/
-static void
-send_empty_response (struct GNUNET_SERVER_NotificationContext *nc,
- struct GNUNET_SERVER_Client *client,
- uint32_t request_id)
+static struct GNUNET_GNSRECORD_Data *
+get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone)
{
- struct LookupNameResponseMessage zir_end;
-
- memset (&zir_end, 0, sizeof (zir_end));
- zir_end.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE);
- zir_end.gns_header.header.size = htons (sizeof (struct LookupNameResponseMessage));
- zir_end.gns_header.r_id = htonl(request_id);
- GNUNET_SERVER_notification_context_unicast (nc,
- client,
- &zir_end.gns_header.header, GNUNET_NO);
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_GNSRECORD_Data *nick;
+ int res;
+
+ res = GSN_database->lookup_records (GSN_database->cls, zone,
+ GNUNET_GNS_MASTERZONE_STR,
+ &lookup_nick_it, &nick);
+ if ((NULL == nick) || (GNUNET_OK != res))
+ {
+ 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;
}
-/**
- * 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)
+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)
{
- const struct LookupNameMessage *ln_msg;
- struct LookupNameContext lnc;
- struct NamestoreClient *nc;
- size_t name_len;
- const char *name;
- uint32_t rid;
- uint32_t type;
- char *conv_name;
- int ret;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "NAMESTORE_LOOKUP_NAME");
- if (ntohs (message->size) < sizeof (struct LookupNameMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if (NULL == (nc = client_lookup(client)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- ln_msg = (const 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 == name_len) || (name_len > MAX_NAME_LEN))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- name = (const char *) &ln_msg[1];
- if ('\0' != name[name_len - 1])
+ 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)
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ (*rd_res) = NULL;
return;
}
- if (GNUNET_NAMESTORE_TYPE_ANY == type)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Looking up all records for name `%s' in zone `%s'\n",
- name,
- GNUNET_NAMESTORE_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_NAMESTORE_short_h2s(&ln_msg->zone));
- conv_name = GNUNET_NAMESTORE_normalize_string (name);
- if (NULL == conv_name)
+ 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++)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error converting name `%s'\n", name);
- return;
+ 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;
}
-
- /* do the actual lookup */
- lnc.request_id = rid;
- lnc.nc = nc;
- lnc.record_type = type;
- lnc.name = conv_name;
- lnc.zone = &ln_msg->zone;
- if (GNUNET_SYSERR ==
- (ret = GSN_database->iterate_records (GSN_database->cls,
- &ln_msg->zone, conv_name, 0 /* offset */,
- &handle_lookup_name_it, &lnc)))
- {
- /* 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);
- GNUNET_free (conv_name);
- return;
- }
- GNUNET_free (conv_name);
- if (0 == ret)
+ record_offset = rdc2;
+ for (c=0; c< 1; c++)
{
- /* no records match at all, generate empty response */
- send_empty_response (snc, nc->client, rid);
+ (*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_SERVER_receive_done (client, GNUNET_OK);
+ 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
* @param client client to unicast to
* @param request_id request ID to use
* @param zone_key zone key of the zone
- * @param expire expiration time
* @param name name
- * @param rd_count number of records
+ * @param rd_count number of records in @a rd
* @param rd array of records
- * @param signature signature
*/
static void
-send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
+send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
struct GNUNET_SERVER_Client *client,
uint32_t request_id,
- const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
- struct GNUNET_TIME_Absolute expire,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- struct LookupNameResponseMessage *zir_msg;
+ 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;
- name_len = strlen (name) + 1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- msg_size = sizeof (struct LookupNameResponseMessage) + name_len + rd_ser_len;
+ 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_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_LOOKUP_NAME_RESPONSE);
+ 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->expire = GNUNET_TIME_absolute_hton (expire);
- zir_msg->contains_sig = htons ((NULL == signature) ? GNUNET_NO : GNUNET_YES);
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);
- if (NULL != signature)
- zir_msg->signature = *signature;
- zir_msg->public_key = *zone_key;
+ 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_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message with size %u\n",
- "ZONE_ITERATION_RESPONSE",
+ 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",
+ res_count,
msg_size);
GNUNET_SERVER_notification_context_unicast (nc,
- client,
+ client,
&zir_msg->gns_header.header,
GNUNET_NO);
+ if (rd != res)
+ GNUNET_free (res);
GNUNET_free (zir_msg);
}
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT' message
+ * Send response to the store request to the client.
*
- * @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
- * @param message message of type 'struct RecordPutMessage'
+ * @param client client to talk to
+ * @param res status of the operation
+ * @param rid client's request ID
*/
static void
-handle_record_put (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+send_store_response (struct GNUNET_SERVER_Client *client,
+ int res,
+ uint32_t rid)
{
- struct NamestoreClient *nc;
- const struct RecordPutMessage *rp_msg;
- struct GNUNET_TIME_Absolute expire;
- const struct GNUNET_CRYPTO_EccSignature *signature;
- struct RecordPutResponseMessage rpr_msg;
- struct GNUNET_CRYPTO_ShortHashCode zone_hash;
- size_t name_len;
- size_t msg_size;
- size_t msg_size_exp;
- const char *name;
- const char *rd_ser;
- char * conv_name;
- uint32_t rid;
- uint32_t rd_ser_len;
- uint32_t rd_count;
- int res;
+ struct RecordStoreResponseMessage rcr_msg;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "NAMESTORE_RECORD_PUT");
- if (ntohs (message->size) < sizeof (struct RecordPutMessage))
+ 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 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 (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_GNSRECORD_Data *rd)
+{
+ 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)
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ 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 (NULL == (nc = client_lookup (client)))
+
+ if (0 == res_count)
+ block = GNUNET_GNSRECORD_block_create (zone_key,
+ GNUNET_TIME_UNIT_ZERO_ABS,
+ name,
+ res, rd_count);
+ else
+ block = GNUNET_GNSRECORD_block_create (zone_key,
+ GNUNET_GNSRECORD_record_get_expiration_time (res_count,
+ res),
+ name,
+ 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_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ 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;
+ }
}
- rp_msg = (const 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);
- rd_count = ntohs (rp_msg->rd_count);
- rd_ser_len = ntohs (rp_msg->rd_len);
- if ((rd_count < 1) || (rd_ser_len < 1) || (name_len >= MAX_NAME_LEN) || (0 == name_len))
+}
+
+
+/**
+ * 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;
}
- msg_size_exp = sizeof (struct RecordPutMessage) + name_len + rd_ser_len;
- if (msg_size != msg_size_exp)
+
+ 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 = (const char *) &rp_msg[1];
- if ('\0' != name[name_len -1])
+
+ 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;
}
- expire = GNUNET_TIME_absolute_ntoh (rp_msg->expire);
- signature = &rp_msg->signature;
- rd_ser = &name[name_len];
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- if (GNUNET_OK !=
- GNUNET_NAMESTORE_records_deserialize (rd_ser_len, rd_ser, rd_count, rd))
+ 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;
}
- GNUNET_CRYPTO_short_hash (&rp_msg->public_key,
- sizeof (rp_msg->public_key),
- &zone_hash);
- conv_name = GNUNET_NAMESTORE_normalize_string (name);
- if (NULL == conv_name)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error converting name `%s'\n", name);
- 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_log (GNUNET_ERROR_TYPE_DEBUG,
- "Putting %u records under name `%s' in zone `%s'\n",
- rd_count, conv_name,
- GNUNET_NAMESTORE_short_h2s (&zone_hash));
- res = GSN_database->put_records (GSN_database->cls,
- &rp_msg->public_key,
- expire,
- conv_name,
- rd_count, rd,
- signature);
- if (GNUNET_OK == res)
- {
- struct ZoneMonitor *zm;
-
- for (zm = monitor_head; NULL != zm; zm = zm->next)
- if ( (GNUNET_NO == zm->has_zone) ||
- (0 == memcmp (&zone_hash, &zm->zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode))) )
- send_lookup_response (monitor_nc,
- zm->client,
- zm->request_id,
- &rp_msg->public_key,
- expire,
- conv_name,
- rd_count, rd,
- signature);
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Putting record for name `%s': %s\n",
- conv_name,
- (GNUNET_OK == res) ? "OK" : "FAILED");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
- "RECORD_PUT_RESPONSE");
- GNUNET_free (conv_name);
- rpr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE);
- rpr_msg.gns_header.header.size = htons (sizeof (struct RecordPutResponseMessage));
- rpr_msg.gns_header.r_id = htonl (rid);
- 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);
+ 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);
}
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE' message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
*
* @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
+ * @param client 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)
+handle_record_store (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- static struct GNUNET_CRYPTO_EccSignature dummy_signature;
- struct NamestoreClient *nc;
- const struct RecordCreateMessage *rp_msg;
- struct GNUNET_CRYPTO_EccPrivateKey *pkey;
- struct RecordCreateResponseMessage rcr_msg;
+ const struct RecordStoreMessage *rp_msg;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
const char *rd_ser;
unsigned int rd_count;
int res;
- struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
- struct GNUNET_CRYPTO_EccPublicKey pubkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+ struct ZoneMonitor *zm;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n", "NAMESTORE_RECORD_CREATE");
- if (ntohs (message->size) < sizeof (struct RecordCreateMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if (NULL == (nc = client_lookup (client)))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n",
+ "NAMESTORE_RECORD_STORE");
+ if (ntohs (message->size) < sizeof (struct RecordStoreMessage))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- rp_msg = (const struct RecordCreateMessage *) message;
+ rp_msg = (const struct RecordStoreMessage *) message;
rid = ntohl (rp_msg->gns_header.r_id);
name_len = ntohs (rp_msg->name_len);
msg_size = ntohs (message->size);
rd_count = ntohs (rp_msg->rd_count);
rd_ser_len = ntohs (rp_msg->rd_len);
GNUNET_break (0 == ntohs (rp_msg->reserved));
- msg_size_exp = sizeof (struct RecordCreateMessage) + name_len + rd_ser_len;
+ msg_size_exp = sizeof (struct RecordStoreMessage) + name_len + rd_ser_len;
if (msg_size != msg_size_exp)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
- memcpy (pkey, &rp_msg->private_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey));
+ (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_CRYPTO_ecc_key_free (pkey);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
/* Extracting and converting private key */
- GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey);
- GNUNET_CRYPTO_short_hash (&pubkey,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &pubkey_hash);
- learn_private_key (pkey);
- conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp);
+ GNUNET_CRYPTO_ecdsa_key_get_public (&rp_msg->private_key,
+ &pubkey);
+ conv_name = GNUNET_GNSRECORD_string_to_lowercase (name_tmp);
if (NULL == conv_name)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Error converting name `%s'\n", name_tmp);
- GNUNET_CRYPTO_ecc_key_free (pkey);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
"Creating %u records for name `%s' in zone `%s'\n",
(unsigned int) rd_count,
conv_name,
- GNUNET_NAMESTORE_short_h2s (&pubkey_hash));
- if (0 == rd_count)
- res = GSN_database->remove_records (GSN_database->cls,
- &pubkey_hash,
- conv_name);
+ GNUNET_GNSRECORD_z2s (&pubkey));
+
+ if ( (0 == rd_count) &&
+ (GNUNET_NO ==
+ GSN_database->iterate_records (GSN_database->cls,
+ &rp_msg->private_key, 0, NULL, 0)) )
+ {
+ /* This name does not exist, so cannot be removed */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Name `%s' does not exist, no deletion required\n",
+ conv_name);
+ res = GNUNET_NO;
+ }
else
- res = GSN_database->put_records (GSN_database->cls,
- &pubkey,
- GNUNET_TIME_absolute_ntoh (rp_msg->expire),
- conv_name,
- rd_count, rd,
- &dummy_signature);
+ {
+ 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_clean_off, rd_clean);
+ if (GNUNET_OK == res)
+ {
+ for (zm = monitor_head; NULL != zm; zm = zm->next)
+ {
+ 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,
+ 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)
{
- struct ZoneMonitor *zm;
-
- for (zm = monitor_head; NULL != zm; zm = zm->next)
- if ( (GNUNET_NO == zm->has_zone) ||
- (0 == memcmp (&pubkey_hash, &zm->zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode))) )
- send_lookup_response (monitor_nc,
- zm->client,
- zm->request_id,
- &pubkey,
- GNUNET_TIME_absolute_ntoh (rp_msg->expire),
- conv_name,
- rd_count, rd,
- &dummy_signature);
- }
+ 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_CREATE_RESPONSE");
- rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE);
- rcr_msg.gns_header.header.size = htons (sizeof (struct RecordCreateResponseMessage));
- 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);
}
/**
- * Context for record remove operations passed from 'handle_zone_to_name' to
- * 'handle_zone_to_name_it' as closure
+ * Context for record remove operations passed from #handle_zone_to_name to
+ * #handle_zone_to_name_it as closure
*/
struct ZoneToNameCtx
{
uint32_t rid;
/**
- * Set to GNUNET_OK on success, GNUNET_SYSERR on error. Note that
+ * Set to #GNUNET_OK on success, #GNUNET_SYSERR on error. Note that
* not finding a name for the zone still counts as a 'success' here,
* as this field is about the success of executing the IPC protocol.
*/
*
* @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_count number of records in @a rd
* @param rd record data
- * @param signature signature
*/
static void
handle_zone_to_name_it (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
- struct GNUNET_TIME_Absolute expire,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneToNameCtx *ztn_ctx = cls;
struct ZoneToNameResponseMessage *ztnr_msg;
size_t msg_size;
char *name_tmp;
char *rd_tmp;
- char *sig_tmp;
- if ((NULL != zone_key) && (NULL != name))
- {
- /* found result */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found result: name `%s' has %u records\n",
- name, rd_count);
- res = GNUNET_YES;
- name_len = strlen (name) + 1;
- }
- else
- {
- /* no result found */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found no results\n");
- res = GNUNET_NO;
- name_len = 0;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
- "ZONE_TO_NAME_RESPONSE");
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found result for zone-to-name lookup: `%s'\n",
+ name);
+ res = GNUNET_YES;
+ name_len = (NULL == name) ? 0 : strlen (name) + 1;
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
msg_size = sizeof (struct ZoneToNameResponseMessage) + name_len + rd_ser_len;
- if (NULL != signature)
- msg_size += sizeof (struct GNUNET_CRYPTO_EccSignature);
if (msg_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
ztnr_msg->rd_len = htons (rd_ser_len);
ztnr_msg->rd_count = htons (rd_count);
ztnr_msg->name_len = htons (name_len);
- ztnr_msg->expire = GNUNET_TIME_absolute_hton (expire);
- if (NULL != zone_key)
- ztnr_msg->zone_key = *zone_key;
+ ztnr_msg->zone = *zone_key;
name_tmp = (char *) &ztnr_msg[1];
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);
- sig_tmp = &rd_tmp[rd_ser_len];
- if (NULL != signature)
- memcpy (sig_tmp, signature, sizeof (struct GNUNET_CRYPTO_EccSignature));
+ 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,
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME' message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME message
*
* @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
+ * @param client client sending the message
* @param message message of type 'struct ZoneToNameMessage'
*/
static void
struct NamestoreClient *nc;
const struct ZoneToNameMessage *ztn_msg;
struct ZoneToNameCtx ztn_ctx;
+ struct ZoneToNameResponseMessage ztnr_msg;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s' message\n",
"ZONE_TO_NAME");
ztn_msg = (const struct ZoneToNameMessage *) message;
- if (NULL == (nc = client_lookup(client)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ nc = client_lookup (client);
ztn_ctx.rid = ntohl (ztn_msg->gns_header.r_id);
ztn_ctx.nc = nc;
- ztn_ctx.success = GNUNET_SYSERR;
+ ztn_ctx.success = GNUNET_NO;
if (GNUNET_SYSERR ==
- GSN_database->zone_to_name (GSN_database->cls,
+ GSN_database->zone_to_name (GSN_database->cls,
&ztn_msg->zone,
&ztn_msg->value_zone,
&handle_zone_to_name_it, &ztn_ctx))
that might be wrong */
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
+ }
+ if (GNUNET_NO == ztn_ctx.success)
+ {
+ /* no result found, send empty response */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found no result for zone-to-name lookup.\n");
+ memset (&ztnr_msg, 0, sizeof (ztnr_msg));
+ ztnr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE);
+ ztnr_msg.gns_header.header.size = htons (sizeof (ztnr_msg));
+ ztnr_msg.gns_header.r_id = ztn_msg->gns_header.r_id;
+ ztnr_msg.res = htons (GNUNET_NO);
+ GNUNET_SERVER_notification_context_unicast (snc,
+ client,
+ &ztnr_msg.gns_header.header,
+ GNUNET_NO);
}
- GNUNET_SERVER_receive_done (client, ztn_ctx.success);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
enum ZoneIterationResult
{
/**
- * Found records, but all records were filtered
- * Continue to iterate
+ * Iteration start.
*/
- IT_ALL_RECORDS_FILTERED = -1,
+ IT_START = 0,
/**
* Found records,
* Continue to iterate with next iteration_next call
*/
- IT_SUCCESS_MORE_AVAILABLE = 0,
+ IT_SUCCESS_MORE_AVAILABLE = 1,
/**
* Iteration complete
*/
- IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE = 1
+ IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE = 2
};
/**
* 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
{
/**
* Iteration result: iteration done?
- * IT_SUCCESS_MORE_AVAILABLE: if there may be more results overall but
+ * #IT_SUCCESS_MORE_AVAILABLE: if there may be more results overall but
* we got one for now and have sent it to the client
- * IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE: if there are no further results,
- * IT_ALL_RECORDS_FILTERED: if all results were filtered so far.
+ * #IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE: if there are no further results,
+ * #IT_START: if we are still trying to find a result.
*/
int res_iteration_finished;
*
* @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_EccPublicKey *zone_key,
- struct GNUNET_TIME_Absolute expire,
+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_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneIterationProcResult *proc = cls;
- struct GNUNET_NAMESTORE_RecordData rd_filtered[rd_count];
- struct GNUNET_CRYPTO_EccSignature *new_signature = NULL;
- struct GNUNET_NAMESTORE_CryptoContainer *cc;
- struct GNUNET_HashCode long_hash;
- struct GNUNET_CRYPTO_ShortHashCode zone_hash;
- struct GNUNET_TIME_Relative rt;
- unsigned int rd_count_filtered;
- unsigned int c;
+ unsigned int i;
+ int do_refresh_block;
- proc->res_iteration_finished = IT_SUCCESS_MORE_AVAILABLE;
if ((NULL == zone_key) && (NULL == name))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Iteration done\n");
proc->res_iteration_finished = IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE;
return;
}
- if ((NULL == zone_key) || (NULL == name))
+ if ((NULL == zone_key) || (NULL == name))
{
/* what is this!? should never happen */
+ proc->res_iteration_finished = IT_START;
GNUNET_break (0);
- return;
- }
- rd_count_filtered = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received result for zone iteration: `%s'\n",
- name);
- for (c = 0; c < rd_count; c++)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Record %u has flags: %x must have flags are %x, must not have flags are %x\n",
- c, rd[c].flags,
- proc->zi->must_have_flags,
- proc->zi->must_not_have_flags);
- /* Checking must have flags, except 'relative-expiration' which is a special flag */
- if ((rd[c].flags & proc->zi->must_have_flags & (~GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
- != (proc->zi->must_have_flags & (~ GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %u lacks 'must-have' flags: Not included\n", c);
- continue;
- }
- /* Checking must-not-have flags */
- if (0 != (rd[c].flags & proc->zi->must_not_have_flags))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Record %u has 'must-not-have' flags: Not included\n", c);
- continue;
- }
- rd_filtered[rd_count_filtered] = rd[c];
- /* convert relative to absolute expiration time unless explicitly requested otherwise */
- if ( (0 == (proc->zi->must_have_flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)) &&
- (0 != (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)) )
- {
- /* should convert relative-to-absolute expiration time */
- rt.rel_value_us = rd[c].expiration_time;
- rd_filtered[c].expiration_time = GNUNET_TIME_relative_to_absolute (rt).abs_value_us;
- rd_filtered[c].flags &= ~ GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
- }
- /* we NEVER keep the 'authority' flag */
- rd_filtered[c].flags &= ~ GNUNET_NAMESTORE_RF_AUTHORITY;
- rd_count_filtered++;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Included %u of %u records\n",
- rd_count_filtered, rd_count);
-
- signature = NULL;
- if ( (rd_count_filtered > 0) &&
- (0 == (proc->zi->must_have_flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)) )
- {
- /* compute / obtain signature, but only if we (a) have records and (b) expiration times were
- converted to absolute expiration times */
- GNUNET_CRYPTO_short_hash (zone_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &zone_hash);
- GNUNET_CRYPTO_short_hash_double (&zone_hash, &long_hash);
- if (NULL != (cc = GNUNET_CONTAINER_multihashmap_get (zonekeys, &long_hash)))
- {
- expire = get_block_expiration_time (rd_count_filtered, rd_filtered);
-
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating signature for `%s' in zone `%s' with %u records and expiration %s\n",
- name, GNUNET_NAMESTORE_short_h2s(&zone_hash),
- rd_count_filtered,
- GNUNET_STRINGS_absolute_time_to_string (expire));
- /* TODO 1) AB: New publishing
- * - Create HDKF(Q,i)
- * - Encrypt record block R with HKDF: HDKF(Q,i) == E(R)
- * - Create block |e,E(R)|
- * - Create d: h * x mod n == hash (name, zone) * c->privkey mod n
- * - Create ECC signature S_d (e, E_HKDF(Q,i))
- *
- * Return: zone_key , expire, name, rd_count_filtered, new signature S_d
- *
- * Q: zone's public key
- * x: zone's private key
- * i: name
- * d: derived secret
- *
- * - how do I get n:
- * Extract from private key s_expression
- * Question
- * - how do I multiply h * x?
- */
-
- new_signature = GNUNET_NAMESTORE_create_signature (cc->privkey, expire, name,
- rd_filtered, rd_count_filtered);
- GNUNET_assert (NULL != new_signature);
- signature = new_signature;
- }
- else if (rd_count_filtered == rd_count)
- {
- if (NULL != signature)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Using provided signature for `%s' in zone `%s' with %u records and expiration %s\n",
- name, GNUNET_NAMESTORE_short_h2s (&zone_hash), rd_count_filtered,
- GNUNET_STRINGS_absolute_time_to_string (expire));
- return;
- }
- }
- }
- if (0 == rd_count_filtered)
- {
- /* After filtering records there are no records left to return */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No records to transmit\n");
- proc->res_iteration_finished = IT_ALL_RECORDS_FILTERED;
return;
}
-
- if (GNUNET_YES == proc->zi->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending name `%s' for iteration over zone `%s'\n",
- name, GNUNET_NAMESTORE_short_h2s(&proc->zi->zone));
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending name `%s' for iteration over all zones\n",
- name);
+ proc->res_iteration_finished = IT_SUCCESS_MORE_AVAILABLE;
send_lookup_response (snc,
proc->zi->client->client,
proc->zi->request_id,
zone_key,
- expire,
name,
- rd_count_filtered,
- rd_filtered,
- signature);
- proc->res_iteration_finished = IT_SUCCESS_MORE_AVAILABLE;
- GNUNET_free_non_null (new_signature);
+ rd_count,
+ rd);
+ do_refresh_block = GNUNET_NO;
+ for (i=0;i<rd_count;i++)
+ 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 (NULL, 0,
+ zone_key,
+ name,
+ rd_count,
+ rd);
+
}
run_zone_iteration_round (struct ZoneIteration *zi)
{
struct ZoneIterationProcResult proc;
- struct GNUNET_CRYPTO_ShortHashCode *zone;
+ struct RecordResultMessage rrm;
int ret;
memset (&proc, 0, sizeof (proc));
proc.zi = zi;
- if (GNUNET_YES == zi->has_zone)
- zone = &zi->zone;
- else
- zone = NULL;
- proc.res_iteration_finished = IT_ALL_RECORDS_FILTERED;
- while (IT_ALL_RECORDS_FILTERED == proc.res_iteration_finished)
+ proc.res_iteration_finished = IT_START;
+ while (IT_START == proc.res_iteration_finished)
{
if (GNUNET_SYSERR ==
- (ret = GSN_database->iterate_records (GSN_database->cls, zone, NULL,
- zi->offset,
- &zone_iteraterate_proc, &proc)))
+ (ret = GSN_database->iterate_records (GSN_database->cls,
+ (0 == memcmp (&zi->zone, &zero, sizeof (zero)))
+ ? NULL
+ : &zi->zone,
+ zi->offset,
+ &zone_iterate_proc, &proc)))
{
GNUNET_break (0);
break;
"More results available\n");
return; /* more results later */
}
- if (GNUNET_YES == zi->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No more results for zone `%s'\n",
- GNUNET_NAMESTORE_short_h2s(&zi->zone));
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No more results for all zones\n");
- send_empty_response (snc, zi->client->client, zi->request_id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Removing zone iterator\n");
- GNUNET_CONTAINER_DLL_remove (zi->client->op_head,
+ /* send empty response to indicate end of list */
+ memset (&rrm, 0, sizeof (rrm));
+ rrm.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
+ rrm.gns_header.header.size = htons (sizeof (rrm));
+ rrm.gns_header.r_id = htonl (zi->request_id);
+ GNUNET_SERVER_notification_context_unicast (snc,
+ zi->client->client,
+ &rrm.gns_header.header,
+ GNUNET_NO);
+ GNUNET_CONTAINER_DLL_remove (zi->client->op_head,
zi->client->op_tail,
zi);
GNUNET_free (zi);
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START' message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_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 ZoneIterationStartMessage'
*/
static void
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- static struct GNUNET_CRYPTO_ShortHashCode zeros;
const struct ZoneIterationStartMessage *zis_msg;
struct NamestoreClient *nc;
struct ZoneIteration *zi;
zi->request_id = ntohl (zis_msg->gns_header.r_id);
zi->offset = 0;
zi->client = nc;
- 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;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to iterate over zone `%s'\n", GNUNET_NAMESTORE_short_h2s (&zis_msg->zone));
- zi->zone = zis_msg->zone;
- zi->has_zone = GNUNET_YES;
- }
+ 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);
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP' message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP message
*
* @param cls unused
* @param client GNUNET_SERVER_Client sending the message
return;
}
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_NAMESTORE_short_h2s (&zi->zone));
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopped zone iteration over all zones\n");
GNUNET_free (zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT' message
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT message
*
* @param cls unused
* @param client GNUNET_SERVER_Client sending the message
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);
}
-/**
- * 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)
-{
- unsigned int *counter = cls;
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
-
-
- if ((NULL == filename) ||
- (NULL == strstr (filename, ".zkey")))
- return GNUNET_OK;
- pk = GNUNET_CRYPTO_ecc_key_create_from_file (filename);
- learn_private_key (pk);
- (*counter)++;
- return GNUNET_OK;
-}
-
-
/**
* Send 'sync' message to zone monitor, we're now in sync.
*
* @param zm monitor that is now in sync
- */
+ */
static void
monitor_sync (struct ZoneMonitor *zm)
{
sync.size = htons (sizeof (struct GNUNET_MessageHeader));
sync.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC);
GNUNET_SERVER_notification_context_unicast (monitor_nc,
- zm->client,
+ zm->nc->client,
&sync,
GNUNET_NO);
}
/**
- * A 'GNUNET_NAMESTORE_RecordIterator' for monitors.
+ * A #GNUNET_NAMESTORE_RecordIterator for monitors.
*
* @param cls a 'struct ZoneMonitor *' with information about the monitor
* @param zone_key zone key of the zone
- * @param expire expiration time
* @param name name
- * @param rd_count number of records
+ * @param rd_count number of records in @a rd
* @param rd array of records
- * @param signature signature
*/
static void
monitor_iterate_cb (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
- struct GNUNET_TIME_Absolute expire,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneMonitor *zm = cls;
return;
}
send_lookup_response (monitor_nc,
- zm->client,
- zm->request_id,
+ zm->nc->client,
+ 0,
zone_key,
- expire,
name,
rd_count,
- rd,
- signature);
+ rd);
zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
}
/**
- * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START' message
+ * 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
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- static struct GNUNET_CRYPTO_ShortHashCode zeros;
const struct ZoneMonitorStartMessage *zis_msg;
struct ZoneMonitor *zm;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s' message\n",
"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->client = client; // FIXME: notify handler for disconnects, check monitors!
- if (0 == memcmp (&zeros, &zis_msg->zone, sizeof (zeros)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to monitor all zones\n");
- zm->zone = zis_msg->zone;
- zm->has_zone = GNUNET_NO;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to monitor zone `%s'\n",
- GNUNET_NAMESTORE_short_h2s (&zis_msg->zone));
- zm->zone = zis_msg->zone;
- zm->has_zone = GNUNET_YES;
- }
+ zm->nc = client_lookup (client);
+ zm->zone = zis_msg->zone;
GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, zm);
GNUNET_SERVER_client_mark_monitor (client);
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);
}
{
struct ZoneMonitor *zm = cls;
int ret;
-
+
zm->task = GNUNET_SCHEDULER_NO_TASK;
ret = GSN_database->iterate_records (GSN_database->cls,
- (GNUNET_YES == zm->has_zone) ? &zm->zone : NULL,
- NULL, zm->offset++,
+ (0 == memcmp (&zm->zone, &zero, sizeof (zero)))
+ ? NULL
+ : &zm->zone,
+ zm->offset++,
&monitor_iterate_cb, zm);
if (GNUNET_SYSERR == ret)
{
- GNUNET_SERVER_client_disconnect (zm->client);
+ GNUNET_SERVER_client_disconnect (zm->nc->client);
return;
}
if (GNUNET_NO == ret)
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_start, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_START, sizeof (struct StartMessage)},
- {&handle_lookup_name, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME, 0},
- {&handle_record_put, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT, 0},
- {&handle_record_create, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE, 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,
{NULL, NULL, 0, 0}
};
char *database;
- unsigned int counter;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting namestore service\n");
GSN_cfg = cfg;
monitor_nc = GNUNET_SERVER_notification_context_create (server, 1);
- /* Load private keys from disk */
- if (GNUNET_OK !=
- 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_SCHEDULER_add_now (&cleanup_task, NULL);
- return;
- }
-
- if (GNUNET_NO == GNUNET_DISK_file_test (zonefile_directory))
- {
- 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_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,
- "Scanning directory `%s' for zone files\n",
- zonefile_directory);
- zonekeys = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO);
- counter = 0;
- GNUNET_DISK_directory_scan (zonefile_directory,
- &zonekey_file_it, &counter);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found %u zone files\n",
- counter);
-
+ namecache = GNUNET_NAMECACHE_connect (cfg);
/* Loading database plugin */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, "namestore", "database",
GNUNET_free (database);
if (NULL == GSN_database)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not load database backend `%s'\n",
db_lib_name);
GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
projects / oweals / gnunet.git / blobdiff