/*
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"
*/
struct NamestoreClient *client;
+ /**
+ * The nick to add to the records
+ */
+ struct GNUNET_GNSRECORD_Data *nick;
+
/**
* Key of the zone we are iterating over.
*/
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));
/**
- * Generate a 'struct LookupNameResponseMessage' and send it to the
+ * 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 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
+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 GNUNET_GNSRECORD_Data **res = cls;
+ int c;
+
+ if (0 != strcmp (label, GNUNET_GNS_MASTERZONE_STR))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ for (c = 0; c < rd_count; c++)
+ {
+ 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;
+ }
+ }
+ (*res) = NULL;
+}
+
+
+/**
+ * Return the NICK record for the zone (if it exists).
+ *
+ * @param zone private key for the zone to look for nick
+ * @return NULL if no NICK record was found
+ */
+static struct GNUNET_GNSRECORD_Data *
+get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone)
+{
+ 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;
+}
+
+
+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;
+ }
+
+ 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
* given client using the given notification context.
*
* @param nc notification context to use
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_GNSRECORD_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.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_GNSRECORD_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);
}
/**
* 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
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)
+ 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_GNSRECORD_block_create (zone_key,
- GNUNET_GNSRECORD_record_get_expiration_time (rd_count,
- rd),
+ GNUNET_GNSRECORD_record_get_expiration_time (res_count,
+ res),
name,
- rd, rd_count);
+ 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' in zone `%s' in namecache\n",
+ "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;
}
+/**
+ * Closure for #lookup_it().
+ */
struct RecordLookupContext
{
const char *label;
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)
+
+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))
{
rlc->found = GNUNET_YES;
if (0 != rd_count)
{
- 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);
+ 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
{
uint32_t name_len;
size_t src_size;
size_t res_size;
- int offset;
int res;
if (ntohs (message->size) < sizeof (struct LabelLookupMessage))
"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.rd_ser_len = 0;
rlc.res_rd = NULL;
+ rlc.rd_ser_len = 0;
+ rlc.nick = get_nick_record (&ll_msg->zone);
- offset = 0;
- do
- {
- /* changee this call */
- res = GSN_database->iterate_records (GSN_database->cls,
- &ll_msg->zone, offset, &lookup_it, &rlc);
- offset++;
- }
- while ((GNUNET_NO == rlc.found) && (GNUNET_OK == res));
+ 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->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);
}
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)
{
for (zm = monitor_head; NULL != zm; zm = zm->next)
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);
projects / oweals / gnunet.git / blobdiff