#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"
GNUNET_NAMESTORE_RecordMonitor proc;
/**
- * Closure for 'proc'.
+ * Closure for @e proc.
*/
void *proc_cls;
- /**
- * Function to call with the blocks we get back; or NULL.
- */
- GNUNET_NAMESTORE_BlockProcessor block_proc;
-
- /**
- * Closure for 'block_proc'.
- */
- void *block_proc_cls;
-
/**
* The operation id this zone iteration operation has
*/
GNUNET_NAMESTORE_RecordMonitor proc;
/**
- * Closure for 'proc'.
+ * Closure for @e proc.
*/
void* proc_cls;
/**
* Private key of the zone.
*/
- struct GNUNET_CRYPTO_EccPrivateKey zone;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/**
* The operation id this zone iteration operation has
/**
* Head of linked list of pending messages to send to the service
*/
- struct PendingMessage * pending_head;
+ struct PendingMessage *pending_head;
/**
* Tail of linked list of pending messages to send to the service
*/
- struct PendingMessage * pending_tail;
+ struct PendingMessage *pending_tail;
/**
* Head of pending namestore queue entries
*/
- struct GNUNET_NAMESTORE_QueueEntry * op_head;
+ struct GNUNET_NAMESTORE_QueueEntry *op_head;
/**
* Tail of pending namestore queue entries
*/
- struct GNUNET_NAMESTORE_QueueEntry * op_tail;
+ struct GNUNET_NAMESTORE_QueueEntry *op_tail;
/**
* Head of pending namestore zone iterator entries
*/
- struct GNUNET_NAMESTORE_ZoneIterator * z_head;
+ struct GNUNET_NAMESTORE_ZoneIterator *z_head;
/**
* Tail of pending namestore zone iterator entries
*/
- struct GNUNET_NAMESTORE_ZoneIterator * z_tail;
+ struct GNUNET_NAMESTORE_ZoneIterator *z_tail;
/**
* Reconnect task
*/
GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ /**
+ * Delay introduced before we reconnect.
+ */
+ struct GNUNET_TIME_Relative reconnect_delay;
+
/**
* Should we reconnect to service due to some serious error?
*/
/**
- * Handle an incoming message of type 'GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE'
+ * 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
+ * @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");
- 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->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'
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_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
+ * @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;
-}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s'\n",
+ "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;
+ }
+ rd_tmp = &name[name_len];
+ {
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
-/**
- * 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;
-
- 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;
}
/**
- * Handle an incoming message of type 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT'
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT
*
* @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
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
*/
static int
handle_record_result (struct GNUNET_NAMESTORE_QueueEntry *qe,
unsigned int rd_count;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s'\n",
+ "Received `%s'\n",
"RECORD_RESULT");
rd_len = ntohs (msg->rd_len);
rd_count = ntohs (msg->rd_count);
}
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;
if (0 == name_len)
name = NULL;
if (NULL != qe->proc)
- qe->proc (qe->proc_cls,
+ qe->proc (qe->proc_cls,
&msg->private_key,
name,
rd_count,
- (rd_count > 0) ? rd : NULL);
+ (rd_count > 0) ? rd : NULL);
}
return GNUNET_OK;
}
/**
- * Handle an incoming message of type 'GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE'
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_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_NO if we notified the client about
- * the error, GNUNET_SYSERR on error and we did NOT notify the client
+ * @return #GNUNET_OK on success, #GNUNET_NO if we notified the client about
+ * the error, #GNUNET_SYSERR on error and we did NOT notify the client
*/
static int
handle_zone_to_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
const char *name_tmp;
const char *rd_tmp;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s'\n",
"ZONE_TO_NAME_RESPONSE");
res = ntohs (msg->res);
switch (res)
{
case GNUNET_SYSERR:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "An error occured during zone to name operation\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "An error occured during zone to name operation\n");
break;
case GNUNET_NO:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Namestore has no result for zone to name mapping \n");
- break;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Namestore has no result for zone to name mapping \n");
+ 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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Namestore has result for zone to name mapping \n");
name_len = ntohs (msg->name_len);
rd_count = ntohs (msg->rd_count);
rd_ser_len = ntohs (msg->rd_len);
}
rd_tmp = &name_tmp[name_len];
{
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_tmp, rd_count, rd))
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
+
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize(rd_ser_len, rd_tmp, rd_count, rd))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
/* normal end, call continuation with result */
if (NULL != qe->proc)
- qe->proc (qe->proc_cls,
+ qe->proc (qe->proc_cls,
&msg->zone,
- name_tmp,
- rd_count, rd);
+ name_tmp,
+ rd_count, rd);
/* return is important here: break would call continuation with error! */
return GNUNET_OK;
}
/* error case, call continuation with error */
if (NULL != qe->proc)
qe->proc (qe->proc_cls, NULL, NULL, 0, NULL);
- return GNUNET_OK;
+ return GNUNET_NO;
}
*
* @param qe the respective zone iteration handle
* @param msg the message we received
- * @param type the message type in HBO
+ * @param type the message type in host byte order
* @param size the message size
- * @return GNUNET_OK on success, GNUNET_NO if we notified the client about
- * the error, GNUNET_SYSERR on error and we did NOT notify the client
+ * @return #GNUNET_OK on success, #GNUNET_NO if we notified the client about
+ * the error, #GNUNET_SYSERR on error and we did NOT notify the client
*/
static int
manage_record_operations (struct GNUNET_NAMESTORE_QueueEntry *qe,
const struct GNUNET_MessageHeader *msg,
- uint16_t type,
+ uint16_t type,
size_t size)
{
/* handle different message type */
- switch (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;
* @param ze the respective iterator for this operation
* @param msg the message containing the respoonse
* @param size the message size
- * @return GNUNET_YES on success, 'ze' should be kept, GNUNET_NO on success if 'ze' should
- * not be kept any longer, GNUNET_SYSERR on error (disconnect) and 'ze' should be kept
+ * @return #GNUNET_YES on success, @a ze should be kept, #GNUNET_NO on success if @a ze should
+ * not be kept any longer, #GNUNET_SYSERR on error (disconnect) and @a ze should be kept
*/
static int
handle_zone_iteration_response (struct GNUNET_NAMESTORE_ZoneIterator *ze,
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;
const char *name_tmp;
const char *rd_ser_tmp;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s'\n",
"ZONE_ITERATION_RESPONSE");
msg_len = ntohs (msg->gns_header.header.size);
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if ((0 == name_len) && (0 == (memcmp (&msg->private_key, &priv_dummy, sizeof (priv_dummy)))))
+ if ( (0 == name_len) &&
+ (0 == (memcmp (&msg->private_key,
+ &priv_dummy,
+ sizeof (priv_dummy)))) )
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration is completed!\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration completed!\n");
if (NULL != ze->proc)
ze->proc (ze->proc_cls, NULL, NULL, 0, NULL);
return GNUNET_NO;
}
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, rd_ser_tmp, rd_count, rd))
+ if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (rd_len,
+ rd_ser_tmp,
+ rd_count,
+ rd))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
if (NULL != ze->proc)
- ze->proc (ze->proc_cls, &msg->private_key, name_tmp, rd_count, rd);
+ ze->proc (ze->proc_cls,
+ &msg->private_key,
+ name_tmp,
+ rd_count, rd);
return GNUNET_YES;
}
}
* @param msg the message we received
* @param type the message type in HBO
* @param size the message size
- * @return GNUNET_YES on success, 'ze' should be kept, GNUNET_NO on success if 'ze' should
- * not be kept any longer, GNUNET_SYSERR on error (disconnect) and 'ze' should be kept
+ * @return #GNUNET_YES on success, @a ze should be kept, #GNUNET_NO on success if @a ze should
+ * not be kept any longer, #GNUNET_SYSERR on error (disconnect) and @a ze should be kept
*/
static int
manage_zone_operations (struct GNUNET_NAMESTORE_ZoneIterator *ze,
int type, size_t size)
{
/* handle different message type */
- switch (type)
+ switch (type)
{
case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT:
if (size < sizeof (struct RecordResultMessage))
GNUNET_break (0);
return GNUNET_SYSERR;
}
- return handle_zone_iteration_response (ze, (const struct RecordResultMessage *) msg, size);
+ return handle_zone_iteration_response (ze,
+ (const struct RecordResultMessage *) msg,
+ size);
default:
GNUNET_break (0);
return GNUNET_SYSERR;
* Type of a function to call when we receive a message
* from the service.
*
- * @param cls the 'struct GNUNET_NAMESTORE_SchedulingHandle'
+ * @param cls the `struct GNUNET_NAMESTORE_SchedulingHandle`
* @param msg message received, NULL on timeout or fatal error
*/
static void
-process_namestore_message (void *cls,
+process_namestore_message (void *cls,
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_NAMESTORE_Handle *h = cls;
if (size < sizeof (struct GNUNET_NAMESTORE_Header))
{
GNUNET_break_op (0);
- GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
+ GNUNET_CLIENT_receive (h->client,
+ &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
return;
}
r_id = ntohl (gm->r_id);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received message type %u size %u op %u\n",
+ "Received message type %u size %u op %u\n",
(unsigned int) type,
- (unsigned int) size,
+ (unsigned int) size,
(unsigned int) r_id);
/* Is it a record related operation ? */
if (NULL != qe)
{
ret = manage_record_operations (qe, msg, type, size);
- if (GNUNET_OK != ret)
+ if (GNUNET_SYSERR == ret)
{
/* protocol error, need to reconnect */
h->reconnect = GNUNET_YES;
}
- if (GNUNET_SYSERR != ret)
+ else
{
/* client was notified about success or failure, clean up 'qe' */
GNUNET_CONTAINER_DLL_remove (h->op_head,
GNUNET_free (qe);
}
}
-
- /* Is it a zone iteration operation ? */
+ /* Is it a zone iteration operation? */
for (ze = h->z_head; ze != NULL; ze = ze->next)
if (ze->op_id == r_id)
break;
/**
* We can now transmit a message to NAMESTORE. Do it.
*
- * @param cls the 'struct GNUNET_NAMESTORE_Handle'
+ * @param cls the `struct GNUNET_NAMESTORE_Handle`
* @param size number of bytes we can transmit
* @param buf where to copy the messages
- * @return number of bytes copied into buf
+ * @return number of bytes copied into @a buf
*/
static size_t
-transmit_message_to_namestore (void *cls, size_t size, void *buf)
+transmit_message_to_namestore (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_NAMESTORE_Handle *h = cls;
struct PendingMessage *p;
}
ret = 0;
cbuf = buf;
- while ((NULL != (p = h->pending_head)) && (p->size <= size))
+ while ( (NULL != (p = h->pending_head)) &&
+ (p->size <= size) )
{
memcpy (&cbuf[ret], &p[1], p->size);
ret += p->size;
size -= p->size;
- GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
+ GNUNET_CONTAINER_DLL_remove (h->pending_head,
+ h->pending_tail,
+ p);
if (GNUNET_NO == h->is_receiving)
{
h->is_receiving = GNUNET_YES;
if (NULL == h->client)
return; /* currently reconnecting */
h->th = GNUNET_CLIENT_notify_transmit_ready (h->client, p->size,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO, &transmit_message_to_namestore,
- h);
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO, &transmit_message_to_namestore,
+ h);
+ GNUNET_break (NULL != h->th);
}
* @param tc scheduler context
*/
static void
-reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_NAMESTORE_Handle *h = cls;
static void
force_reconnect (struct GNUNET_NAMESTORE_Handle *h)
{
+ if (NULL != h->th)
+ {
+ GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
+ h->th = NULL;
+ }
h->reconnect = GNUNET_NO;
GNUNET_CLIENT_disconnect (h->client);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reconnecting to namestore\n");
h->is_receiving = GNUNET_NO;
h->client = NULL;
- h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
+ h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay,
&reconnect_task,
h);
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
GNUNET_assert (NULL != h);
+ if (NULL != h->th)
+ {
+ GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
+ h->th = NULL;
+ }
while (NULL != (p = h->pending_head))
{
GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
}
-/**
- * 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);
- 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\n",
- "NAMESTORE_BLOCK_CACHE",
- (unsigned int) msg_size);
- 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;
name_tmp = (char *) &msg[1];
memcpy (name_tmp, label, name_len);
rd_ser = &name_tmp[name_len];
- GNUNET_break (rd_ser_len == GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser));
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for name `%s' with size %u\n",
- "NAMESTORE_RECORD_STORE", label, msg_size);
+ GNUNET_break (rd_ser_len ==
+ GNUNET_GNSRECORD_records_serialize (rd_count, rd,
+ rd_ser_len,
+ rd_ser));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message for name `%s' with size %u and %u records\n",
+ "NAMESTORE_RECORD_STORE", label, msg_size,
+ rd_count);
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
return qe;
}
-
/**
- * Get a result for a particular key from the namestore. The processor
- * will only be called once.
+ * Set the desired nick name for a zone
*
* @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 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_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_HashCode *derived_hash,
- GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls)
+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);
+}
+
+/**
+ * Lookup an item in the namestore.
+ *
+ * @param h handle to the namestore
+ * @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_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);
+ do_transmit (h);
return qe;
}
* @param value_zone public key of the target zone (value), never NULL
* @param proc function to call on the matching records, or with
* NULL (rd_count == 0) if there are no matching records
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
* @return a handle that can be used to
* cancel
*/
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone,
- const struct GNUNET_CRYPTO_EccPublicKey *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;
/* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
return qe;
}
/**
* Starts a new zone iteration (used to periodically PUT all of our
- * records into our DHT). This MUST lock the GNUNET_NAMESTORE_Handle
- * for any other calls than GNUNET_NAMESTORE_zone_iterator_next and
- * GNUNET_NAMESTORE_zone_iteration_stop. "proc" will be called once
+ * records into our DHT). This MUST lock the struct GNUNET_NAMESTORE_Handle
+ * for any other calls than #GNUNET_NAMESTORE_zone_iterator_next and
+ * #GNUNET_NAMESTORE_zone_iteration_stop. @a proc will be called once
* immediately, and then again after
- * "GNUNET_NAMESTORE_zone_iterator_next" is invoked.
+ * #GNUNET_NAMESTORE_zone_iterator_next is invoked.
*
* @param h handle to the namestore
- * @param zone zone to access
+ * @param zone zone to access, NULL for all zones
* @param proc function to call on each name from the zone; it
* will be called repeatedly with a value (if available)
* and always once at the end with a name of NULL.
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
* @return an iterator handle to use for iteration
*/
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)
{
it->proc = proc;
it->proc_cls = proc_cls;
it->op_id = rid;
- it->zone = *zone;
+ if (NULL != zone)
+ it->zone = *zone;
GNUNET_CONTAINER_DLL_insert_tail (h->z_head, h->z_tail, it);
msg_size = sizeof (struct ZoneIterationStartMessage);
msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (rid);
- msg->zone = *zone;
+ if (NULL != zone)
+ msg->zone = *zone;
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
return it;
}
/**
- * Calls the record processor specified in GNUNET_NAMESTORE_zone_iteration_start
+ * Calls the record processor specified in #GNUNET_NAMESTORE_zone_iteration_start
* for the next record.
*
* @param it the iterator
msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (it->op_id);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "ZONE_ITERATION_NEXT");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message\n",
+ "ZONE_ITERATION_NEXT");
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
}
msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (it->op_id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message\n",
"ZONE_ITERATION_STOP");
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
GNUNET_free (it);
}
struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
GNUNET_assert (NULL != qe);
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, qe);
GNUNET_free(qe);
}
projects / oweals / gnunet.git / blobdiff