/*
This file is part of GNUnet.
- (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2010-2013 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 "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"
/**
* Function to call with the records we get back; or NULL.
*/
- GNUNET_NAMESTORE_RecordProcessor proc;
+ GNUNET_NAMESTORE_RecordMonitor proc;
/**
- * Closure for 'proc'.
+ * Closure for @e proc.
*/
void *proc_cls;
/**
* The continuation to call with the results
*/
- GNUNET_NAMESTORE_RecordProcessor proc;
+ GNUNET_NAMESTORE_RecordMonitor proc;
/**
- * Closure for 'proc'.
+ * Closure for @e proc.
*/
void* proc_cls;
/**
- * If this iterator iterates over a specific zone this value contains the
- * short hash of the zone
+ * Private key of the zone.
*/
- struct GNUNET_CRYPTO_ShortHashCode zone;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/**
* The operation id this zone iteration operation has
*/
uint32_t op_id;
- /**
- * GNUNET_YES if this iterator iterates over a specific zone
- * GNUNET_NO if this iterator iterates over all zones
- *
- * Zone is stored GNUNET_CRYPTO_ShortHashCode 'zone';
- */
- int has_zone;
};
*/
size_t size;
- /**
- * Is this the 'START' message?
- */
- int is_init;
};
/**
* 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?
*/
int reconnect;
+ /**
+ * Did we start to receive yet?
+ */
+ int is_receiving;
+
/**
* The last operation id used for a NAMESTORE operation
*/
/**
- * Handle an incoming message of type 'GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_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_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct LookupNameResponseMessage * msg,
- size_t size)
+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' 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
+ 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_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
+ */
+static int
+handle_lookup_result (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ const struct LabelLookupResponseMessage *msg,
+ size_t size)
{
const char *name;
- const char * rd_tmp;
- const struct GNUNET_CRYPTO_RsaSignature *signature;
- struct GNUNET_TIME_Absolute expire;
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key_tmp;
+ const char *rd_tmp;
size_t exp_msg_len;
size_t msg_len;
size_t name_len;
size_t rd_len;
- int contains_sig;
- int rd_count;
+ unsigned int rd_count;
+ int found;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s'\n",
+ "RECORD_LOOKUP_RESULT");
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n", "LOOKUP_NAME_RESPONSE");
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);
- contains_sig = ntohs (msg->contains_sig);
- expire = GNUNET_TIME_absolute_ntoh (msg->expire);
- exp_msg_len = sizeof (struct LookupNameResponseMessage) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
- name_len + rd_len;
+ found = ntohs (msg->found);
+ exp_msg_len = sizeof (struct LabelLookupResponseMessage) + name_len + rd_len;
if (msg_len != exp_msg_len)
{
GNUNET_break (0);
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_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 (GNUNET_NO == contains_sig)
- signature = NULL;
- else
- signature = &msg->signature;
if (0 == name_len)
name = NULL;
- if (NULL != name)
- public_key_tmp = &msg->public_key;
- else
- public_key_tmp = NULL;
if (NULL != qe->proc)
- qe->proc (qe->proc_cls, public_key_tmp, expire, name, rd_count, (rd_count > 0) ? rd : NULL, signature);
+ 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_PUT_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_put_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct RecordPutResponseMessage* msg,
- size_t size)
-{
- int res;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
- "RECORD_PUT_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 add record"));
- return GNUNET_OK;
-}
-
-
-/**
- * Handle an incoming message of type 'GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_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_create_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct RecordCreateResponseMessage* msg,
- size_t size)
-{
- int res;
- const char *emsg;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
- "RECORD_CREATE_RESPONSE");
- /* TODO: add actual error message from namestore to response... */
- res = ntohl (msg->op_result);
- if (GNUNET_SYSERR == res)
- emsg = _("Namestore failed to add record\n");
- else
- 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_RECORD_REMOVE_RESPONSE'
+ * 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_remove_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- const struct RecordRemoveResponseMessage* msg,
- size_t size)
+handle_record_result (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ const struct RecordResultMessage *msg,
+ size_t size)
{
- int ret;
- const char *emsg;
+ 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;
- /* Operation done, remove */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
- "RECORD_REMOVE_RESPONSE");
- switch (ntohl (msg->op_result))
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s'\n",
+ "RECORD_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);
+ GNUNET_break (0 == ntohs (msg->reserved));
+ exp_msg_len = sizeof (struct RecordResultMessage) + name_len + rd_len;
+ if (msg_len != exp_msg_len)
{
- case RECORD_REMOVE_RESULT_SUCCESS:
- ret = GNUNET_OK;
- emsg = NULL;
- break;
- case RECORD_REMOVE_RESULT_NO_RECORDS:
- ret = GNUNET_NO;
- emsg = NULL;
- break;
- case RECORD_REMOVE_RESULT_RECORD_NOT_FOUND:
- ret = GNUNET_NO;
- emsg = NULL;
- break;
- case RECORD_REMOVE_RESULT_FAILED_TO_SIGN:
- ret = GNUNET_SYSERR;
- emsg = _("Failed to create new signature");
- break;
- case RECORD_REMOVE_RESULT_FAILED_TO_PUT_UPDATE:
- ret = GNUNET_SYSERR;
- emsg = _("Failed to put new set of records in database");
- break;
- case RECORD_REMOVE_RESULT_FAILED_TO_REMOVE:
- ret = GNUNET_SYSERR;
- emsg = _("Failed to remove records from database");
- break;
- case RECORD_REMOVE_RESULT_FAILED_ACCESS_DATABASE:
- ret = GNUNET_SYSERR;
- emsg = _("Failed to access database");
- break;
- case RECORD_REMOVE_RESULT_FAILED_INTERNAL_ERROR:
- ret = GNUNET_SYSERR;
- emsg = _("unknown internal error in namestore");
- break;
- default:
GNUNET_break (0);
- if (NULL != qe->cont)
- qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Protocol error"));
- return GNUNET_NO;
+ return GNUNET_SYSERR;
+ }
+ name = (const char *) &msg[1];
+ if ( (name_len > 0) &&
+ ('\0' != name[name_len -1]) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ rd_tmp = &name[name_len];
+ {
+ struct GNUNET_GNSRECORD_Data rd[rd_count];
+
+ 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);
}
- if (NULL != qe->cont)
- qe->cont (qe->cont_cls, ret, emsg);
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 struct ZoneToNameResponseMessage* msg,
+ const struct ZoneToNameResponseMessage *msg,
size_t size)
{
int res;
- struct GNUNET_TIME_Absolute expire;
size_t name_len;
size_t rd_ser_len;
unsigned int rd_count;
- const char * name_tmp;
- const char * rd_tmp;
+ 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);
- expire = GNUNET_TIME_absolute_ntoh(msg->expire);
name_tmp = (const char *) &msg[1];
if ( (name_len > 0) &&
('\0' != name_tmp[name_len -1]) )
}
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, &msg->zone_key, expire, name_tmp, rd_count, rd, &msg->signature);
+ qe->proc (qe->proc_cls,
+ &msg->zone,
+ 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, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL, NULL);
- return GNUNET_OK;
+ qe->proc (qe->proc_cls, NULL, NULL, 0, NULL);
+ 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_NAME_RESPONSE:
- if (size < sizeof (struct LookupNameResponseMessage))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- return handle_lookup_name_response (qe, (const struct LookupNameResponseMessage *) msg, size);
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE:
- if (size != sizeof (struct RecordPutResponseMessage))
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE:
+ if (size != sizeof (struct RecordStoreResponseMessage))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- return handle_record_put_response (qe, (const struct RecordPutResponseMessage *) msg, size);
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE:
- if (size != sizeof (struct RecordCreateResponseMessage))
+ return handle_record_store_response (qe, (const struct RecordStoreResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE:
+ if (size < sizeof (struct ZoneToNameResponseMessage))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- return handle_record_create_response (qe, (const struct RecordCreateResponseMessage *) msg, size);
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE:
- if (size != sizeof (struct RecordRemoveResponseMessage))
+ return handle_zone_to_name_response (qe, (const struct ZoneToNameResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT:
+ if (size < sizeof (struct RecordResultMessage))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- return handle_record_remove_response (qe, (const struct RecordRemoveResponseMessage *) msg, size);
- case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE:
- if (size < sizeof (struct ZoneToNameResponseMessage))
+ 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_zone_to_name_response (qe, (const struct ZoneToNameResponseMessage *) msg, size);
+ 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 ZoneIterationResponseMessage *msg,
+ const struct RecordResultMessage *msg,
size_t size)
{
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubdummy;
+ static struct GNUNET_CRYPTO_EcdsaPrivateKey priv_dummy;
size_t msg_len;
size_t exp_msg_len;
size_t name_len;
unsigned rd_count;
const char *name_tmp;
const char *rd_ser_tmp;
- struct GNUNET_TIME_Absolute expire;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s'\n",
"ZONE_ITERATION_RESPONSE");
msg_len = ntohs (msg->gns_header.header.size);
rd_len = ntohs (msg->rd_len);
rd_count = ntohs (msg->rd_count);
name_len = ntohs (msg->name_len);
- expire = GNUNET_TIME_absolute_ntoh (msg->expire);
- exp_msg_len = sizeof (struct ZoneIterationResponseMessage) + name_len + rd_len;
+ exp_msg_len = sizeof (struct RecordResultMessage) + name_len + rd_len;
if (msg_len != exp_msg_len)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- GNUNET_break (0 == ntohs (msg->reserved));
- memset (&pubdummy, '\0', sizeof (pubdummy));
- if ((0 == name_len) && (0 == (memcmp (&msg->public_key, &pubdummy, sizeof (pubdummy)))))
+ 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, GNUNET_TIME_UNIT_ZERO_ABS, NULL , 0, NULL, NULL);
+ ze->proc (ze->proc_cls, NULL, NULL, 0, NULL);
return GNUNET_NO;
}
name_tmp = (const char *) &msg[1];
}
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->public_key, expire, name_tmp, rd_count, rd, &msg->signature);
+ 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_ZONE_ITERATION_RESPONSE:
- if (size < sizeof (struct ZoneIterationResponseMessage))
+ 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 ZoneIterationResponseMessage *) 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, const struct GNUNET_MessageHeader *msg)
+process_namestore_message (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_NAMESTORE_Handle *h = cls;
const struct GNUNET_NAMESTORE_Header *gm;
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;
}
gm = (const struct GNUNET_NAMESTORE_Header *) msg;
r_id = ntohl (gm->r_id);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message type %u size %u op %u\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "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);
- if (GNUNET_YES == p->is_init)
- GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
+ GNUNET_CONTAINER_DLL_remove (h->pending_head,
+ h->pending_tail,
+ p);
+ if (GNUNET_NO == h->is_receiving)
+ {
+ h->is_receiving = GNUNET_YES;
+ GNUNET_CLIENT_receive (h->client,
+ &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
+ }
GNUNET_free (p);
}
do_transmit (h);
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);
}
static void
reconnect (struct GNUNET_NAMESTORE_Handle *h)
{
- struct PendingMessage *p;
- struct StartMessage *init;
-
GNUNET_assert (NULL == h->client);
h->client = GNUNET_CLIENT_connect ("namestore", h->cfg);
GNUNET_assert (NULL != h->client);
- if ((NULL == (p = h->pending_head)) || (GNUNET_YES != p->is_init))
- {
- p = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct StartMessage));
- p->size = sizeof (struct StartMessage);
- p->is_init = GNUNET_YES;
- init = (struct StartMessage *) &p[1];
- init->header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_START);
- init->header.size = htons (sizeof (struct StartMessage));
- GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, p);
- }
do_transmit (h);
}
* @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);
}
{
struct GNUNET_NAMESTORE_Handle *h;
- h = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Handle));
+ h = GNUNET_new (struct GNUNET_NAMESTORE_Handle);
h->cfg = cfg;
h->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect_task, h);
h->last_op_id_used = 0;
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,
- * the expiration time is updated to the max of the existing time and
- * the new time. This API is used when we cache signatures from other
- * authorities.
+ * it is replaced with the new record. Use an empty array to
+ * remove all records under the given name.
*
* @param h handle to the namestore
- * @param zone_key public key of the zone
- * @param name name that is being mapped (at most 255 characters long)
- * @param freshness when does the corresponding block in the DHT expire (until
- * when should we never do a DHT lookup for the same name again)?
- * @param rd_count number of entries in 'rd' array
+ * @param pkey private key of the zone
+ * @param label name that is being mapped (at most 255 characters long)
+ * @param rd_count number of records in the 'rd' array
* @param rd array of records with data to store
- * @param signature signature for all the records in the zone under the given name
* @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_record_put (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- const char *name,
- struct GNUNET_TIME_Absolute freshness,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature,
- GNUNET_NAMESTORE_ContinuationWithStatus cont,
- void *cont_cls)
+GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd,
+ GNUNET_NAMESTORE_ContinuationWithStatus cont,
+ void *cont_cls)
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
- struct RecordPutMessage * msg;
- char * rd_ser;
- char * name_tmp;
+ char *name_tmp;
+ char *rd_ser;
+ size_t rd_ser_len;
size_t msg_size;
size_t name_len;
- size_t rd_ser_len;
uint32_t rid;
+ struct RecordStoreMessage *msg;
GNUNET_assert (NULL != h);
- GNUNET_assert (NULL != zone_key);
- GNUNET_assert (NULL != name);
- GNUNET_assert (NULL != rd);
- GNUNET_assert (NULL != signature);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Storing %u records under name `%s'\n",
- rd_count,
- name);
- name_len = strlen(name) + 1;
+ GNUNET_assert (NULL != pkey);
+ GNUNET_assert (NULL != label);
+ name_len = strlen (label) + 1;
if (name_len > MAX_NAME_LEN)
{
GNUNET_break (0);
return NULL;
}
rid = get_op_id (h);
- qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
+ qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
qe->nsh = h;
qe->cont = cont;
qe->cont_cls = 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);
- msg_size = sizeof (struct RecordPutMessage) + name_len + rd_ser_len;
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ 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;
- pe->is_init = GNUNET_NO;
- msg = (struct RecordPutMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT);
+ msg = (struct RecordStoreMessage *) &pe[1];
+ msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (rid);
- msg->signature = *signature;
msg->name_len = htons (name_len);
- msg->expire = GNUNET_TIME_absolute_hton (freshness);
- msg->rd_len = htons (rd_ser_len);
msg->rd_count = htons (rd_count);
- msg->public_key = *zone_key;
+ msg->rd_len = htons (rd_ser_len);
+ msg->reserved = htons (0);
+ msg->private_key = *pkey;
+
name_tmp = (char *) &msg[1];
- memcpy (name_tmp, name, name_len);
+ memcpy (name_tmp, label, name_len);
rd_ser = &name_tmp[name_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_PUT",
- name, 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;
}
-
-/**
- * Check if a signature is valid. This API is used by the GNS Block
- * to validate signatures received from the network.
- *
- * @param public_key public key of the zone
- * @param freshness block expiration
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd_count number of entries in 'rd' array
- * @param rd array of records with data to store
- * @param signature signature for all the records in the zone under the given name
- * @return GNUNET_OK if the signature is valid
- */
-int
-GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key,
- const struct GNUNET_TIME_Absolute freshness,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- size_t rd_ser_len;
- size_t name_len;
- char * name_tmp;
- char * rd_ser;
- struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose;
- struct GNUNET_TIME_AbsoluteNBO *expire_tmp;
- struct GNUNET_TIME_AbsoluteNBO expire_nbo = GNUNET_TIME_absolute_hton (freshness);
- uint32_t sig_len;
-
- GNUNET_assert (NULL != public_key);
- GNUNET_assert (NULL != name);
- GNUNET_assert (NULL != rd);
- GNUNET_assert (NULL != signature);
- name_len = strlen (name) + 1;
- if (name_len > MAX_NAME_LEN)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- sig_len = sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + sizeof (struct GNUNET_TIME_AbsoluteNBO) + rd_ser_len + name_len;
- {
- char sig_buf[sig_len] GNUNET_ALIGN;
-
- sig_purpose = (struct GNUNET_CRYPTO_RsaSignaturePurpose *) sig_buf;
- sig_purpose->size = htonl (sig_len);
- sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
- expire_tmp = (struct GNUNET_TIME_AbsoluteNBO *) &sig_purpose[1];
- memcpy (expire_tmp, &expire_nbo, sizeof (struct GNUNET_TIME_AbsoluteNBO));
- name_tmp = (char *) &expire_tmp[1];
- memcpy (name_tmp, name, name_len);
- rd_ser = &name_tmp[name_len];
- GNUNET_assert (rd_ser_len ==
- GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser));
- return GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN, sig_purpose, signature, public_key);
- }
-}
-
-
/**
- * Store an item in the namestore. If the item is already present,
- * the expiration time is updated to the max of the existing time and
- * the new time. This API is used by the authority of a zone.
+ * Set the desired nick name for a zone
*
* @param h handle to the namestore
* @param pkey private key of the zone
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd record data to store
+ * @param nick the nick name to set
* @param cont continuation to call when done
- * @param cont_cls closure for cont
+ * @param cont_cls closure for 'cont'
* @return handle to abort the request
*/
struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
- const char *name,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- GNUNET_NAMESTORE_ContinuationWithStatus cont,
- void *cont_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_NAMESTORE_QueueEntry *qe;
- struct PendingMessage *pe;
- char * name_tmp;
- char * pkey_tmp;
- char * rd_ser;
- size_t rd_ser_len;
- size_t msg_size;
- size_t name_len;
- size_t key_len;
- uint32_t rid;
- struct RecordCreateMessage * msg;
- struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc;
-
- GNUNET_assert (NULL != h);
- GNUNET_assert (NULL != pkey);
- GNUNET_assert (NULL != name);
- GNUNET_assert (NULL != rd);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Creating record of type %u under name `%s'\n",
- rd->record_type,
- name);
- name_len = strlen(name) + 1;
- if (name_len > MAX_NAME_LEN)
- {
- GNUNET_break (0);
- return NULL;
- }
- rid = get_op_id(h);
- qe = GNUNET_malloc(sizeof (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);
-
- pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
- GNUNET_assert (NULL != pkey_enc);
-
- /* setup msg */
- key_len = ntohs (pkey_enc->len);
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, rd);
- msg_size = sizeof (struct RecordCreateMessage) + key_len + name_len + rd_ser_len;
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
- pe->size = msg_size;
- pe->is_init = GNUNET_NO;
- msg = (struct RecordCreateMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE);
- msg->gns_header.header.size = htons (msg_size);
- msg->gns_header.r_id = htonl (rid);
- msg->name_len = htons (name_len);
- msg->rd_count = htons (1);
- msg->rd_len = htons (rd_ser_len);
- msg->pkey_len = htons (key_len);
- msg->expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_UNIT_FOREVER_ABS);
- pkey_tmp = (char *) &msg[1];
- memcpy (pkey_tmp, pkey_enc, key_len);
- name_tmp = &pkey_tmp[key_len];
- memcpy (name_tmp, name, name_len);
- rd_ser = &name_tmp[name_len];
- GNUNET_NAMESTORE_records_serialize(1, rd, rd_ser_len, rd_ser);
-
- GNUNET_free (pkey_enc);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for name `%s' with size %u\n",
- "NAMESTORE_RECORD_CREATE", name, msg_size);
- GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
- return qe;
+ 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);
}
/**
- * Explicitly remove some content from the database. The
- * "cont"inuation will be called with status "GNUNET_OK" if content
- * was removed, "GNUNET_NO" if no matching entry was found and
- * "GNUNET_SYSERR" on all other types of errors.
- * This API is used by the authority of a zone.
+ * Lookup an item in the namestore.
*
* @param h handle to the namestore
* @param pkey private key of the zone
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd record data, remove specific record, NULL to remove the name and all records
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
+ * @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_record_remove (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
- const char *name,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- GNUNET_NAMESTORE_ContinuationWithStatus cont,
- void *cont_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 GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc;
struct PendingMessage *pe;
- struct RecordRemoveMessage * msg;
- char *pkey_tmp;
- char *rd_ser;
- char *name_tmp;
- size_t rd_ser_len;
+ struct LabelLookupMessage * msg;
size_t msg_size;
- size_t name_len;
- size_t key_len;
- uint32_t rid;
- uint16_t rd_count;
+ size_t label_len;
GNUNET_assert (NULL != h);
- if (NULL != rd)
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Removing record of type %u under name `%s'\n",
- rd->record_type,
- name);
- else
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Removing all records under name `%s'\n",
- name);
- rid = get_op_id(h);
- qe = GNUNET_malloc(sizeof (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);
-
- pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
- GNUNET_assert (NULL != pkey_enc);
- key_len = ntohs (pkey_enc->len);
-
- rd_count = (NULL == rd) ? 0 : 1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- name_len = strlen (name) + 1;
- msg_size = sizeof (struct RecordRemoveMessage) + key_len + name_len + rd_ser_len;
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
- pe->size = msg_size;
- pe->is_init = GNUNET_NO;
- msg = (struct RecordRemoveMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE);
- msg->gns_header.header.size = htons (msg_size);
- msg->gns_header.r_id = htonl (rid);
- msg->name_len = htons (name_len);
- msg->rd_len = htons (rd_ser_len);
- msg->rd_count = htons (rd_count);
- msg->pkey_len = htons (key_len);
- pkey_tmp = (char *) &msg[1];
- memcpy (pkey_tmp, pkey_enc, key_len);
- name_tmp = &pkey_tmp[key_len];
- memcpy (name_tmp, name, name_len);
- rd_ser = &name_tmp[name_len];
- GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
-
- GNUNET_free (pkey_enc);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for name `%s' with size %u\n",
- "NAMESTORE_RECORD_REMOVE", name, msg_size);
- GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
- return qe;
-}
-
-
-/**
- * Get a result for a particular key from the namestore. The processor
- * will only be called once.
- *
- * @param h handle to the namestore
- * @param zone zone to look up a record from
- * @param name name to look up
- * @param record_type desired record type, 0 for all
- * @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
- * @return a handle that can be used to
- * cancel
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_record (struct GNUNET_NAMESTORE_Handle *h,
- const struct GNUNET_CRYPTO_ShortHashCode *zone,
- const char *name,
- uint32_t record_type,
- GNUNET_NAMESTORE_RecordProcessor proc, void *proc_cls)
-{
- struct GNUNET_NAMESTORE_QueueEntry *qe;
- struct PendingMessage *pe;
- struct LookupNameMessage * msg;
- size_t msg_size;
- size_t name_len;
- uint32_t rid;
+ GNUNET_assert (NULL != pkey);
+ GNUNET_assert (NULL != label);
- GNUNET_assert (NULL != h);
- GNUNET_assert (NULL != zone);
- GNUNET_assert (NULL != name);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Looking for record of type %u under name `%s'\n",
- record_type,
- name);
- name_len = strlen (name) + 1;
- if ((name_len == 0) || (name_len > MAX_NAME_LEN))
- {
- GNUNET_break (0);
+ if (1 == (label_len = strlen (label) + 1))
return NULL;
- }
- rid = get_op_id(h);
- qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
+ qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
qe->nsh = h;
- qe->proc = proc;
- qe->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 LookupNameMessage) + name_len;
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ msg_size = sizeof (struct LabelLookupMessage) + label_len;
+ pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- pe->is_init = GNUNET_NO;
- msg = (struct LookupNameMessage *) &pe[1];
- msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME);
+ 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->record_type = htonl (record_type);
- msg->name_len = htonl (name_len);
- msg->zone = *zone;
- memcpy (&msg[1], name, name_len);
+ msg->gns_header.r_id = htonl (qe->op_id);
+ msg->zone = *pkey;
+ msg->label_len = htonl(label_len);
+ memcpy (&msg[1], label, label_len);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for name `%s'\n", "NAMESTORE_LOOKUP_NAME", name);
+ /* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ do_transmit (h);
return qe;
}
* Returns at most one result to the processor.
*
* @param h handle to the namestore
- * @param zone hash of public key of the zone to look up in, never NULL
- * @param value_zone hash of the public key of the target zone (value), never NULL
+ * @param zone public key of the zone to look up in, never NULL
+ * @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_ShortHashCode *zone,
- const struct GNUNET_CRYPTO_ShortHashCode *value_zone,
- GNUNET_NAMESTORE_RecordProcessor proc, void *proc_cls)
+ 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 PendingMessage *pe;
GNUNET_assert (NULL != zone);
GNUNET_assert (NULL != value_zone);
rid = get_op_id(h);
- qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
+ qe = GNUNET_new (struct GNUNET_NAMESTORE_QueueEntry);
qe->nsh = h;
qe->proc = proc;
qe->proc_cls = proc_cls;
GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
msg_size = sizeof (struct ZoneToNameMessage);
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- pe->is_init = GNUNET_NO;
msg = (struct ZoneToNameMessage *) &pe[1];
msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME);
msg->gns_header.header.size = htons (msg_size);
/* 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, NULL for all zones
- * @param must_have_flags flags that must be set for the record to be returned
- * @param must_not_have_flags flags that must NOT be set for the record to be returned
* @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_ShortHashCode *zone,
- enum GNUNET_NAMESTORE_RecordFlags must_have_flags,
- enum GNUNET_NAMESTORE_RecordFlags must_not_have_flags,
- GNUNET_NAMESTORE_RecordProcessor proc,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ GNUNET_NAMESTORE_RecordMonitor proc,
void *proc_cls)
{
struct GNUNET_NAMESTORE_ZoneIterator *it;
GNUNET_assert (NULL != h);
rid = get_op_id(h);
- it = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_ZoneIterator));
+ it = GNUNET_new (struct GNUNET_NAMESTORE_ZoneIterator);
it->h = h;
it->proc = proc;
it->proc_cls = proc_cls;
it->op_id = rid;
if (NULL != zone)
- {
it->zone = *zone;
- it->has_zone = GNUNET_YES;
- }
- else
- {
- memset (&it->zone, '\0', sizeof (it->zone));
- it->has_zone = GNUNET_NO;
- }
GNUNET_CONTAINER_DLL_insert_tail (h->z_head, h->z_tail, it);
msg_size = sizeof (struct ZoneIterationStartMessage);
pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationStartMessage *) &pe[1];
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);
if (NULL != zone)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for zone `%s'\n",
- "ZONE_ITERATION_START", GNUNET_short_h2s(zone));
msg->zone = *zone;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for all zones\n", "ZONE_ITERATION_START");
- memset (&msg->zone, '\0', sizeof (msg->zone));
- }
- msg->must_have_flags = ntohs (must_have_flags);
- msg->must_not_have_flags = ntohs (must_not_have_flags);
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
GNUNET_assert (NULL != it);
h = it->h;
msg_size = sizeof (struct ZoneIterationNextMessage);
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationNextMessage *) &pe[1];
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);
}
h->z_tail,
it);
msg_size = sizeof (struct ZoneIterationStopMessage);
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
- pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationStopMessage *) &pe[1];
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);
- if (GNUNET_YES == it->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for zone `%s'\n", "ZONE_ITERATION_STOP", GNUNET_short_h2s(&it->zone));
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for all zones\n", "ZONE_ITERATION_STOP");
+ 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);
}
+
/* end of namestore_api.c */
projects / oweals / gnunet.git / blobdiff