#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.
*/
*/
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.
*/
};
+/**
+ * Public key of all zeros.
+ */
+static const struct GNUNET_CRYPTO_EcdsaPrivateKey zero;
+
/**
* Configuration handle.
*/
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));
}
+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;
+}
+
+
+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_ERROR, "No nick name set for zone `%s'\n",
+ GNUNET_CRYPTO_ecdsa_public_key_to_string (&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)
+{
+ int c;
+ size_t req;
+ char *data;
+ int record_offset;
+ size_t data_offset;
+ (*rdc_res) = rdc1 + rdc2;
+
+ if (0 == rdc1 + 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< rdc2; c++)
+ req += sizeof (struct GNUNET_GNSRECORD_Data) + rd2[c].data_size;
+ (*rd_res) = GNUNET_malloc (req);
+ data = (char *) &(*rd_res)[rdc1 + rdc2];
+ data_offset = 0;
+
+ for (c=0; c< rdc1; c++)
+ {
+ (*rd_res)[c] = rd1[c];
+ (*rd_res)[c].data = (void *) &data[data_offset];
+ memcpy ((void *) (*rd_res)[c].data, rd1[c].data, rd1[c].data_size);
+ data_offset += (*rd_res)[c].data_size;
+ }
+ record_offset = rdc1;
+ for (c=0; c< rdc2; c++)
+ {
+ (*rd_res)[c+record_offset] = rd2[c];
+ (*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);
+ 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.
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_records (rd_count,rd, 1, nick, &res_count, &res);
+ GNUNET_free (nick);
+ }
+ else
+ {
+ res_count = rd_count;
+ res = (struct GNUNET_GNSRECORD_Data *) rd;
+ }
+
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",
client,
&zir_msg->gns_header.header,
GNUNET_NO);
+ if (rd != res)
+ GNUNET_free (res);
GNUNET_free (zir_msg);
}
* Cache operation complete, clean up.
*
* @param cls the `struct CacheOperation`
+ * @param success success
+ * @param emsg error messages
*/
static void
finish_cache_operation (void *cls,
{
struct GNUNET_GNSRECORD_Block *block;
struct CacheOperation *cop;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
if (0 == rd_count)
block = GNUNET_GNSRECORD_block_create (zone_key,
rd),
name,
rd, rd_count);
+ GNUNET_assert (NULL != block);
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
+ &pkey);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Caching block in namecache\n");
+ "Caching block for label `%s' in zone `%s' in namecache\n",
+ name,
+ GNUNET_GNSRECORD_z2s (&pkey));
cop = GNUNET_new (struct CacheOperation);
cop->client = client;
cop->rid = rid;
}
+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))
+ {
+ 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_records (rd_count, rd,
+ 1, rlc->nick,
+ &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;
+ }
+ }
+}
+
+
+
+
+
+/**
+ * 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);
+}
+
+
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
*
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)))
+ {
+ 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);
}
- GNUNET_free (conv_name);
}
if (GNUNET_OK == res)
{
conv_name,
rd_count, rd);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (conv_name);
return;
}
+ GNUNET_free (conv_name);
}
send_store_response (client, res, rid);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
/**
* 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,
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);
}
send_lookup_response (monitor_nc,
zm->nc->client,
- zm->request_id,
+ 0,
zone_key,
name,
rd_count,
"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)
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
{&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,