/*
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
}
-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)
+/**
+ * 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);
-
+ struct GNUNET_GNSRECORD_Data **res = cls;
int c;
+
if (0 != strcmp (label, GNUNET_GNS_MASTERZONE_STR))
{
GNUNET_break (0);
}
+/**
+ * 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)
{
int res;
res = GSN_database->lookup_records (GSN_database->cls, zone,
- GNUNET_GNS_MASTERZONE_STR, &lookup_nick_it, &nick);
-
+ 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_ERROR, "No nick name set for zone `%s'\n",
- GNUNET_CRYPTO_ecdsa_public_key_to_string (&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_records (unsigned int rdc1,
- const struct GNUNET_GNSRECORD_Data *rd1,
- unsigned int rdc2,
- const struct GNUNET_GNSRECORD_Data *rd2,
- unsigned int *rdc_res,
- struct GNUNET_GNSRECORD_Data **rd_res)
+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) = rdc1 + rdc2;
+ (*rdc_res) = 1 + rdc2;
- if (0 == rdc1 + rdc2)
+ if (0 == 1 + rdc2)
{
(*rd_res) = NULL;
return;
}
req = 0;
- for (c=0; c< rdc1; c++)
- req += sizeof (struct GNUNET_GNSRECORD_Data) + rd1[c].data_size;
+ 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)[rdc1 + rdc2];
+ data = (char *) &(*rd_res)[1 + rdc2];
data_offset = 0;
+ latest_expiration = 0;
- for (c=0; c< rdc1; c++)
+ for (c=0; c< rdc2; c++)
{
- (*rd_res)[c] = rd1[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];
- memcpy ((void *) (*rd_res)[c].data, rd1[c].data, rd1[c].data_size);
+ // WTF?
+ memcpy ((void *) (*rd_res)[c].data, rd2[c].data, rd2[c].data_size);
data_offset += (*rd_res)[c].data_size;
}
- record_offset = rdc1;
- for (c=0; c< rdc2; c++)
+ record_offset = rdc2;
+ for (c=0; c< 1; c++)
{
- (*rd_res)[c+record_offset] = rd2[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];
- memcpy ((void *) (*rd_res)[c+record_offset].data, rd2[c].data, rd2[c].data_size);
+ // 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
if ((NULL != nick) && (0 != strcmp(name, GNUNET_GNS_MASTERZONE_STR)))
{
nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
- merge_records (rd_count,rd, 1, nick, &res_count, &res);
+ 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;
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,
/**
* 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;
};
-
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)
+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;
rd_res = NULL;
rdc_res = 0;
rlc->nick->flags = (rlc->nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
- merge_records (rd_count, rd,
- 1, rlc->nick,
- &rdc_res, &rd_res);
+ 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;
}
-
-
-
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
*
}
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)
projects / oweals / gnunet.git / blobdiff