#include "gnunet_dnsparser_lib.h"
#include "gnunet_arm_service.h"
#include "gnunet_signatures.h"
+#include "gnunet_gns_service.h"
#include "gnunet_namestore_service.h"
#include "namestore.h"
*/
void *proc_cls;
- /**
- * Function to call with the blocks we get back; or NULL.
- */
- GNUNET_NAMESTORE_BlockProcessor block_proc;
-
- /**
- * Closure for @e block_proc.
- */
- void *block_proc_cls;
-
/**
* The operation id this zone iteration operation has
*/
/**
* Private key of the zone.
*/
- struct GNUNET_CRYPTO_EccPrivateKey zone;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/**
* The operation id this zone iteration operation has
/**
* Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE.
+ * #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE
*
* @param qe the respective entry in the message queue
* @param msg the message we received
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
*/
static int
-handle_lookup_block_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct LookupBlockResponseMessage *msg,
+handle_record_store_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ const struct RecordStoreResponseMessage* msg,
size_t size)
{
- struct GNUNET_NAMESTORE_Block *block;
- char buf[size + sizeof (struct GNUNET_NAMESTORE_Block)
- - sizeof (struct LookupBlockResponseMessage)];
+ int res;
+ const char *emsg;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s'\n",
- "LOOKUP_BLOCK_RESPONSE");
- if (0 == GNUNET_TIME_absolute_ntoh (msg->expire).abs_value_us)
- {
- /* no match found */
- if (NULL != qe->block_proc)
- qe->block_proc (qe->block_proc_cls, NULL);
- return GNUNET_OK;
- }
-
- block = (struct GNUNET_NAMESTORE_Block *) buf;
- block->signature = msg->signature;
- block->derived_key = msg->derived_key;
- block->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
- block->purpose.size = htonl (size - sizeof (struct LookupBlockResponseMessage) +
- sizeof (struct GNUNET_TIME_AbsoluteNBO) +
- sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
- block->expiration_time = msg->expire;
- memcpy (&block[1],
- &msg[1],
- size - sizeof (struct LookupBlockResponseMessage));
- if (GNUNET_OK !=
- GNUNET_NAMESTORE_block_verify (block))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- if (NULL != qe->block_proc)
- qe->block_proc (qe->block_proc_cls, block);
+ "Received `%s' with result %i\n",
+ "RECORD_STORE_RESPONSE",
+ ntohl (msg->op_result));
+ /* TODO: add actual error message from namestore to response... */
+ res = ntohl (msg->op_result);
+ if (GNUNET_SYSERR == res)
+ emsg = _("Namestore failed to store record\n");
else
- GNUNET_break (0);
+ emsg = NULL;
+ if (NULL != qe->cont)
+ qe->cont (qe->cont_cls, res, emsg);
return GNUNET_OK;
}
/**
* Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE
+ * #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE
*
* @param qe the respective entry in the message queue
* @param msg the message we received
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
*/
static int
-handle_block_cache_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct BlockCacheResponseMessage *msg,
- size_t size)
+handle_lookup_result (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ const struct LabelLookupResponseMessage *msg,
+ size_t size)
{
- int res;
+ const char *name;
+ const char *rd_tmp;
+ size_t exp_msg_len;
+ size_t msg_len;
+ size_t name_len;
+ size_t rd_len;
+ unsigned int rd_count;
+ int found;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s'\n",
- "BLOCK_CACHE_RESPONSE");
- res = ntohl (msg->op_result);
- /* TODO: add actual error message from namestore to response... */
- if (NULL != qe->cont)
- qe->cont (qe->cont_cls,
- res,
- (GNUNET_OK == res) ?
- NULL
- : _("Namestore failed to cache block"));
- return GNUNET_OK;
-}
+ "RECORD_LOOKUP_RESULT");
+ rd_len = ntohs (msg->rd_len);
+ rd_count = ntohs (msg->rd_count);
+ msg_len = ntohs (msg->gns_header.header.size);
+ name_len = ntohs (msg->name_len);
+ found = ntohs (msg->found);
+ exp_msg_len = sizeof (struct LabelLookupResponseMessage) + name_len + rd_len;
+ if (msg_len != exp_msg_len)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ name = (const char *) &msg[1];
+ if ( (name_len > 0) &&
+ ('\0' != name[name_len -1]) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_NO == found)
+ {
+ /* label was not in namestore */
+ if (NULL != qe->proc)
+ qe->proc (qe->proc_cls,
+ &msg->private_key,
+ name,
+ 0, NULL);
+ return GNUNET_OK;
+ }
-/**
- * Handle an incoming message of type
- * #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE
- *
- * @param qe the respective entry in the message queue
- * @param msg the message we received
- * @param size the message size
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
- */
-static int
-handle_record_store_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct RecordStoreResponseMessage* msg,
- size_t size)
-{
- int res;
- const char *emsg;
+ rd_tmp = &name[name_len];
+ {
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s'\n",
- "RECORD_STORE_RESPONSE");
- /* TODO: add actual error message from namestore to response... */
- res = ntohl (msg->op_result);
- if (GNUNET_SYSERR == res)
- emsg = _("Namestore failed to store record\n");
- else
- emsg = NULL;
- if (NULL != qe->cont)
- qe->cont (qe->cont_cls, res, emsg);
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize(rd_len, rd_tmp, rd_count, rd))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (0 == name_len)
+ name = NULL;
+ if (NULL != qe->proc)
+ qe->proc (qe->proc_cls,
+ &msg->private_key,
+ name,
+ rd_count,
+ (rd_count > 0) ? rd : NULL);
+ }
return GNUNET_OK;
}
}
rd_tmp = &name[name_len];
{
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
- if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_len, rd_tmp, rd_count, rd))
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize(rd_len, rd_tmp, rd_count, rd))
{
GNUNET_break (0);
return GNUNET_SYSERR;
case GNUNET_NO:
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Namestore has no result for zone to name mapping \n");
- break;
+ if (NULL != qe->proc)
+ qe->proc (qe->proc_cls, &msg->zone, NULL, 0, NULL);
+ return GNUNET_NO;
case GNUNET_YES:
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Namestore has result for zone to name mapping \n");
}
rd_tmp = &name_tmp[name_len];
{
- 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_tmp, rd_count, rd))
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize(rd_ser_len, rd_tmp, rd_count, rd))
{
GNUNET_break (0);
return GNUNET_SYSERR;
/* handle different message type */
switch (type)
{
- case GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE:
- if (size < sizeof (struct LookupBlockResponseMessage))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- return handle_lookup_block_response (qe, (const struct LookupBlockResponseMessage *) msg, size);
- case GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE:
- if (size != sizeof (struct BlockCacheResponseMessage))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- return handle_block_cache_response (qe, (const struct BlockCacheResponseMessage *) msg, size);
case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE:
if (size != sizeof (struct RecordStoreResponseMessage))
{
return GNUNET_SYSERR;
}
return handle_record_result (qe, (const struct RecordResultMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE:
+ if (size < sizeof (struct LabelLookupResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_lookup_result (qe, (const struct LabelLookupResponseMessage *) msg, size);
default:
GNUNET_break (0);
return GNUNET_SYSERR;
const struct RecordResultMessage *msg,
size_t size)
{
- static struct GNUNET_CRYPTO_EccPrivateKey priv_dummy;
+ static struct GNUNET_CRYPTO_EcdsaPrivateKey priv_dummy;
size_t msg_len;
size_t exp_msg_len;
size_t name_len;
}
rd_ser_tmp = (const char *) &name_tmp[name_len];
{
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
- if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize (rd_len,
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (rd_len,
rd_ser_tmp,
rd_count,
rd))
}
-/**
- * Store an item in the namestore. If the item is already present,
- * it is replaced with the new record.
- *
- * @param h handle to the namestore
- * @param block block to store
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- * @return handle to abort the request
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_NAMESTORE_Block *block,
- GNUNET_NAMESTORE_ContinuationWithStatus cont,
- void *cont_cls)
-{
- struct GNUNET_NAMESTORE_QueueEntry *qe;
- struct PendingMessage *pe;
- struct BlockCacheMessage *msg;
- uint32_t rid;
- size_t blen;
- size_t msg_size;
-
- GNUNET_assert (NULL != h);
- blen = ntohl (block->purpose.size)
- - sizeof (struct GNUNET_TIME_AbsoluteNBO)
- - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose);
- rid = get_op_id (h);
- qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
- qe->nsh = h;
- qe->cont = cont;
- qe->cont_cls = cont_cls;
- qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
-
- /* setup msg */
- msg_size = sizeof (struct BlockCacheMessage) + blen;
- pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
- pe->size = msg_size;
- msg = (struct BlockCacheMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE);
- msg->gns_header.header.size = htons (msg_size);
- msg->gns_header.r_id = htonl (rid);
- msg->expire = block->expiration_time;
- msg->signature = block->signature;
- msg->derived_key = block->derived_key;
- memcpy (&msg[1], &block[1], blen);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message with size %u and expiration %s\n",
- "NAMESTORE_BLOCK_CACHE",
- (unsigned int) msg_size,
- GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (msg->expire)));
- GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit (h);
- return qe;
-}
-
-
/**
* Store an item in the namestore. If the item is already present,
* it is replaced with the new record. Use an empty array to
* @param rd_count number of records in the 'rd' array
* @param rd array of records with data to store
* @param cont continuation to call when done
- * @param cont_cls closure for 'cont'
+ * @param cont_cls closure for @a cont
* @return handle to abort the request
*/
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *pkey,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
const char *label,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_GNSRECORD_Data *rd,
GNUNET_NAMESTORE_ContinuationWithStatus cont,
void *cont_cls)
{
GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
/* setup msg */
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
msg_size = sizeof (struct RecordStoreMessage) + name_len + rd_ser_len;
pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
memcpy (name_tmp, label, name_len);
rd_ser = &name_tmp[name_len];
GNUNET_break (rd_ser_len ==
- GNUNET_NAMESTORE_records_serialize (rd_count, rd,
+ GNUNET_GNSRECORD_records_serialize (rd_count, rd,
rd_ser_len,
rd_ser));
LOG (GNUNET_ERROR_TYPE_DEBUG,
return qe;
}
+/**
+ * Set the desired nick name for a zone
+ *
+ * @param h handle to the namestore
+ * @param pkey private key of the zone
+ * @param nick the nick name to set
+ * @param cont continuation to call when done
+ * @param cont_cls closure for 'cont'
+ * @return handle to abort the request
+ */
+struct GNUNET_NAMESTORE_QueueEntry *
+GNUNET_NAMESTORE_set_nick (struct GNUNET_NAMESTORE_Handle *h,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+ const char *nick,
+ GNUNET_NAMESTORE_ContinuationWithStatus cont,
+ void *cont_cls)
+{
+ struct GNUNET_GNSRECORD_Data rd;
+
+ memset (&rd, 0, sizeof (rd));
+ rd.data = nick;
+ rd.data_size = strlen (nick) +1;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_NICK;
+ rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+ rd.flags |= GNUNET_GNSRECORD_RF_PRIVATE;
+ return GNUNET_NAMESTORE_records_store(h, pkey, GNUNET_GNS_MASTERZONE_STR, 1, &rd, cont, cont_cls);
+}
+
/**
- * Get a result for a particular key from the namestore. The processor
- * will only be called once.
+ * Lookup an item in the namestore.
*
* @param h handle to the namestore
- * @param derived_hash hash of zone key combined with name to lookup
- * @param proc function to call on the matching block, or with
- * NULL if there is no matching block
- * @param proc_cls closure for proc
- * @return a handle that can be used to cancel
+ * @param pkey private key of the zone
+ * @param label name that is being mapped (at most 255 characters long)
+ * @param rm function to call with the result (with 0 records if we don't have that label)
+ * @param rm_cls closure for @a rm
+ * @return handle to abort the request
*/
struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_HashCode *derived_hash,
- GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls)
+GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+ const char *label,
+ GNUNET_NAMESTORE_RecordMonitor rm,
+ void *rm_cls)
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
- struct LookupBlockMessage *msg;
+ struct LabelLookupMessage * msg;
size_t msg_size;
- uint32_t rid;
+ size_t label_len;
GNUNET_assert (NULL != h);
- GNUNET_assert (NULL != derived_hash);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Looking for block under %s\n",
- GNUNET_h2s (derived_hash));
- rid = get_op_id(h);
+ GNUNET_assert (NULL != pkey);
+ GNUNET_assert (NULL != label);
+
+ if (1 == (label_len = strlen (label) + 1))
+ return NULL;
+
qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
qe->nsh = h;
- qe->block_proc = proc;
- qe->block_proc_cls = proc_cls;
- qe->op_id = rid;
+ qe->proc = rm;
+ qe->proc_cls = rm_cls;
+ qe->op_id = get_op_id(h);
GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- msg_size = sizeof (struct LookupBlockMessage);
+ msg_size = sizeof (struct LabelLookupMessage) + label_len;
pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- msg = (struct LookupBlockMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK);
+ msg = (struct LabelLookupMessage *) &pe[1];
+ msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP);
msg->gns_header.header.size = htons (msg_size);
- msg->gns_header.r_id = htonl (rid);
- msg->query = *derived_hash;
+ msg->gns_header.r_id = htonl (qe->op_id);
+ msg->zone = *pkey;
+ msg->label_len = htonl(label_len);
+ memcpy (&msg[1], label, label_len);
+
+ /* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit (h);
return qe;
*/
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
- const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls)
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
*/
struct GNUNET_NAMESTORE_ZoneIterator *
GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
GNUNET_NAMESTORE_RecordMonitor proc,
void *proc_cls)
{
projects / oweals / gnunet.git / blobdiff