*/
/**
- * @file gns/namestore_api.c
+ * @file namestore/namestore_api.c
* @brief API to access the NAMESTORE service
* @author Martin Schanzenbach
* @author Matthias Wachs
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_crypto_lib.h"
#include "gnunet_constants.h"
#include "gnunet_arm_service.h"
+#include "gnunet_signatures.h"
#include "gnunet_namestore_service.h"
#include "namestore.h"
+
#define DEBUG_GNS_API GNUNET_EXTRA_LOGGING
#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
struct GNUNET_NAMESTORE_Handle *nsh;
- uint64_t op_id;
+ uint32_t op_id;
GNUNET_NAMESTORE_ContinuationWithStatus cont;
void *cont_cls;
struct GNUNET_NAMESTORE_ZoneIterator *next;
struct GNUNET_NAMESTORE_ZoneIterator *prev;
+ uint32_t op_id;
+
struct GNUNET_NAMESTORE_Handle *h;
GNUNET_NAMESTORE_RecordProcessor proc;
void* proc_cls;
- const GNUNET_HashCode * zone;
+ GNUNET_HashCode zone;
uint32_t no_flags;
uint32_t flags;
};
struct GNUNET_NAMESTORE_QueueEntry * op_head;
struct GNUNET_NAMESTORE_QueueEntry * op_tail;
- uint64_t op_id;
+ uint32_t op_id;
/**
* Pending namestore zone iterator entries
/**
* Disconnect from service and then reconnect.
*
- * @param nsh our handle
+ * @param h our handle
*/
static void
-force_reconnect (struct GNUNET_NAMESTORE_Handle *nsh);
+force_reconnect (struct GNUNET_NAMESTORE_Handle *h);
+
+static void
+handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ struct LookupNameResponseMessage * msg,
+ size_t size)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ "LOOKUP_NAME_RESPONSE");
+
+ struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key;
+ char *name;
+ char * rd_tmp;
+
+ struct GNUNET_CRYPTO_RsaSignature *signature = NULL;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded dummy;
+ struct GNUNET_TIME_Absolute expire;
+ size_t exp_msg_len;
+ size_t msg_len = 0;
+ size_t name_len = 0;
+ size_t rd_len = 0;
+ int contains_sig = GNUNET_NO;
+ int rd_count = 0;
+
+ 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 +
+ contains_sig * sizeof (struct GNUNET_CRYPTO_RsaSignature);
+
+ if (msg_len != exp_msg_len)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message size describes with `%u' bytes but calculated size is %u bytes \n",
+ msg_len, exp_msg_len);
+ GNUNET_break_op (0);
+ return;
+ }
+
+ zone_key = (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) &msg[1];
+ name = (char *) &zone_key[1];
+ rd_tmp = &name[name_len];
+
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ GNUNET_NAMESTORE_records_deserialize(rd_len, rd_tmp, rd_count, rd);
+
+ /* reset values if values not contained */
+ if (contains_sig == GNUNET_NO)
+ signature = NULL;
+ else
+ signature = (struct GNUNET_CRYPTO_RsaSignature *) &rd_tmp[rd_len];
+ if (name_len == 0)
+ name = NULL;
+
+ memset (&dummy, '0', sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ if (0 == memcmp (zone_key, &dummy, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
+ zone_key = NULL;
+
+ if (qe->proc != NULL)
+ {
+ qe->proc (qe->proc_cls, zone_key, expire, name, rd_count, (rd_count > 0) ? rd : NULL, signature);
+ }
+
+ /* Operation done, remove */
+ GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+ GNUNET_free (qe);
+}
+
+
+static void
+handle_record_put_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ struct RecordPutResponseMessage* msg,
+ size_t size)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ "RECORD_PUT_RESPONSE");
+
+ struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
+ int res = GNUNET_OK;
+
+ if (ntohs (msg->op_result) == GNUNET_OK)
+ {
+ res = GNUNET_OK;
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, res, _("Namestore added record successfully"));
+ }
+
+ }
+ else if (ntohs (msg->op_result) == GNUNET_NO)
+ {
+ res = GNUNET_SYSERR;
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, res, _("Namestore failed to add record"));
+ }
+ }
+ else
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+
+ /* Operation done, remove */
+ GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+
+ GNUNET_free (qe);
+}
+
+
+static void
+handle_record_create_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ struct RecordCreateResponseMessage* msg,
+ size_t size)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ "RECORD_CREATE_RESPONSE");
+
+ struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
+ int res = GNUNET_OK;
+
+ if (ntohs (msg->op_result) == GNUNET_OK)
+ {
+ res = GNUNET_OK;
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, res, _("Namestore added record successfully"));
+ }
+
+ }
+ else if (ntohs (msg->op_result) == GNUNET_NO)
+ {
+ res = GNUNET_SYSERR;
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, res, _("Namestore failed to add record"));
+ }
+ }
+ else
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+
+ /* Operation done, remove */
+ GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+
+ GNUNET_free (qe);
+}
+
+
+static void
+handle_record_remove_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ struct RecordRemoveResponseMessage* msg,
+ size_t size)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ "RECORD_REMOVE_RESPONSE");
+
+ struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
+ int res = ntohs (msg->op_result);
+
+ /**
+ * result:
+ * 0 : successful
+ * 1 : No records for entry
+ * 2 : Could not find record to remove
+ * 3 : Failed to create new signature
+ * 4 : Failed to put new set of records in database
+ */
+ switch (res) {
+ case 0:
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, GNUNET_YES, _("Namestore removed record successfully"));
+ }
+
+ break;
+ case 1:
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, GNUNET_NO, _("No records for entry"));
+ }
+
+ break;
+ case 2:
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, GNUNET_NO, _("Could not find record to remove"));
+ }
+
+ break;
+ case 3:
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Failed to create new signature"));
+ }
+
+ break;
+ case 4:
+ if (qe->cont != NULL)
+ {
+ qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Failed to put new set of records in database"));
+ }
+ break;
+ default:
+ GNUNET_break_op (0);
+ break;
+ }
+
+ /* Operation done, remove */
+ GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+
+ GNUNET_free (qe);
+}
+
+
+static void
+manage_record_operations (struct GNUNET_NAMESTORE_QueueEntry *qe,
+ const struct GNUNET_MessageHeader *msg,
+ int type, size_t size)
+{
+
+ /* handle different message type */
+ switch (type) {
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE:
+ if (size < sizeof (struct LookupNameResponseMessage))
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ handle_lookup_name_response (qe, (struct LookupNameResponseMessage *) msg, size);
+ break;
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE:
+ if (size != sizeof (struct RecordPutResponseMessage))
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ handle_record_put_response (qe, (struct RecordPutResponseMessage *) msg, size);
+ break;
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE:
+ if (size != sizeof (struct RecordCreateResponseMessage))
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ handle_record_create_response (qe, (struct RecordCreateResponseMessage *) msg, size);
+ break;
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE:
+ if (size != sizeof (struct RecordRemoveResponseMessage))
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ handle_record_remove_response (qe, (struct RecordRemoveResponseMessage *) msg, size);
+ break;
+ default:
+ GNUNET_break_op (0);
+ break;
+ }
+}
+
+static void
+handle_zone_iteration_response (struct GNUNET_NAMESTORE_ZoneIterator *ze,
+ struct ZoneIterationResponseMessage *msg,
+ size_t size)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ "ZONE_ITERATION_RESPONSE");
+
+
+ if (ze->proc != NULL)
+ {
+ // FIXME
+ ze->proc(ze->proc_cls, NULL, GNUNET_TIME_absolute_get_forever(), "dummy", 0, NULL, NULL);
+ }
+}
+
+
+static void
+manage_zone_operations (struct GNUNET_NAMESTORE_ZoneIterator *ze,
+ const struct GNUNET_MessageHeader *msg,
+ int type, size_t size)
+{
+ /* handle different message type */
+ switch (type) {
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE:
+ if (size < sizeof (struct ZoneIterationResponseMessage))
+ {
+ GNUNET_break_op (0);
+ break;
+ }
+ handle_zone_iteration_response (ze, (struct ZoneIterationResponseMessage *) msg, size);
+ break;
+ default:
+ GNUNET_break_op (0);
+ break;
+ }
+}
/**
* Type of a function to call when we receive a message
static void
process_namestore_message (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_NAMESTORE_Handle *nsh = cls;
+ struct GNUNET_NAMESTORE_Handle *h = cls;
+ struct GNUNET_NAMESTORE_Header * gm;
struct GNUNET_NAMESTORE_QueueEntry *qe;
+ struct GNUNET_NAMESTORE_ZoneIterator *ze;
uint16_t size;
uint16_t type;
- uint64_t op_id = UINT64_MAX;
+ uint32_t r_id = UINT32_MAX;
if (NULL == msg)
{
- force_reconnect (nsh);
+ force_reconnect (h);
return;
}
size = ntohs (msg->size);
type = ntohs (msg->type);
- /* find matching operation */
- if (op_id > nsh->op_id)
+ if (size < sizeof (struct GNUNET_NAMESTORE_Header))
{
GNUNET_break_op (0);
- GNUNET_CLIENT_receive (nsh->client, &process_namestore_message, nsh,
+ GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
return;
}
- for (qe = nsh->op_head; qe != NULL; qe = qe->next)
- {
- if (qe->op_id == op_id)
- break;
- }
- if (qe == NULL)
+
+ gm = (struct GNUNET_NAMESTORE_Header *) msg;
+ r_id = ntohl (gm->r_id);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message type %i size %i op %u\n", type, size, r_id);
+
+ /* Find matching operation */
+ if (r_id > h->op_id)
{
+ /* No matching pending operation found */
GNUNET_break_op (0);
- GNUNET_CLIENT_receive (nsh->client, &process_namestore_message, nsh,
+ GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
return;
}
- switch (type) {
- case GNUNET_MESSAGE_TYPE_TEST:
- /* handle message here */
+ /* Is it a record related operation ? */
+ for (qe = h->op_head; qe != NULL; qe = qe->next)
+ {
+ if (qe->op_id == r_id)
break;
- default:
+ }
+ if (qe != NULL)
+ {
+ manage_record_operations (qe, msg, type, size);
+ }
+
+ /* Is it a zone iteration operation ? */
+ for (ze = h->z_head; ze != NULL; ze = ze->next)
+ {
+ if (ze->op_id == r_id)
break;
}
- size++; // FIXME: just working around compiler warning here...
- GNUNET_CLIENT_receive (nsh->client, &process_namestore_message, nsh,
+ if (ze != NULL)
+ {
+ manage_zone_operations (ze, msg, type, size);
+ }
+
+ GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
- if (GNUNET_YES == nsh->reconnect)
- force_reconnect (nsh);
+ if (GNUNET_YES == h->reconnect)
+ force_reconnect (h);
+
}
* Transmit messages from the message queue to the service
* (if there are any, and if we are not already trying).
*
- * @param nsh handle to use
+ * @param h handle to use
*/
static void
-do_transmit (struct GNUNET_NAMESTORE_Handle *nsh);
+do_transmit (struct GNUNET_NAMESTORE_Handle *h);
/**
static size_t
transmit_message_to_namestore (void *cls, size_t size, void *buf)
{
- struct GNUNET_NAMESTORE_Handle *nsh = cls;
+ struct GNUNET_NAMESTORE_Handle *h = cls;
struct PendingMessage *p;
size_t ret;
char *cbuf;
- nsh->th = NULL;
+ h->th = NULL;
if ((size == 0) || (buf == NULL))
{
- force_reconnect (nsh);
+ force_reconnect (h);
return 0;
}
ret = 0;
cbuf = buf;
- while ((NULL != (p = nsh->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 (nsh->pending_head, nsh->pending_tail, p);
+ GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
if (GNUNET_YES == p->is_init)
- GNUNET_CLIENT_receive (nsh->client, &process_namestore_message, nsh,
+ GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
GNUNET_free (p);
}
- do_transmit (nsh);
+ do_transmit (h);
return ret;
}
* Transmit messages from the message queue to the service
* (if there are any, and if we are not already trying).
*
- * @param nsh handle to use
+ * @param h handle to use
*/
static void
-do_transmit (struct GNUNET_NAMESTORE_Handle *nsh)
+do_transmit (struct GNUNET_NAMESTORE_Handle *h)
{
struct PendingMessage *p;
- if (NULL != nsh->th)
+ if (NULL != h->th)
return;
- if (NULL == (p = nsh->pending_head))
+ if (NULL == (p = h->pending_head))
return;
- if (NULL == nsh->client)
+ if (NULL == h->client)
return; /* currently reconnecting */
- nsh->th = GNUNET_CLIENT_notify_transmit_ready (nsh->client, p->size,
+ h->th = GNUNET_CLIENT_notify_transmit_ready (h->client, p->size,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_NO, &transmit_message_to_namestore,
- nsh);
+ h);
}
/**
- * Try again to connect to namestore service.
+ * Reconnect to namestore service.
*
- * @param cls the handle to the namestore service
- * @param tc scheduler context
+ * @param h the handle to the namestore service
*/
static void
-reconnect (struct GNUNET_NAMESTORE_Handle *nsh)
+reconnect (struct GNUNET_NAMESTORE_Handle *h)
{
struct PendingMessage *p;
struct StartMessage *init;
- GNUNET_assert (NULL == nsh->client);
- nsh->client = GNUNET_CLIENT_connect ("namestore", nsh->cfg);
- GNUNET_assert (NULL != nsh->client);
+ GNUNET_assert (NULL == h->client);
+ h->client = GNUNET_CLIENT_connect ("namestore", h->cfg);
+ GNUNET_assert (NULL != h->client);
- if ((NULL == (p = nsh->pending_head)) || (GNUNET_YES != p->is_init))
+ if ((NULL == (p = h->pending_head)) || (GNUNET_YES != p->is_init))
{
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct StartMessage));
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 (nsh->pending_head, nsh->pending_tail, p);
+ GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, p);
}
- do_transmit (nsh);
+ do_transmit (h);
}
/**
static void
reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_NAMESTORE_Handle *nsh = cls;
+ struct GNUNET_NAMESTORE_Handle *h = cls;
- nsh->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- reconnect (nsh);
+ h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect (h);
}
/**
* Disconnect from service and then reconnect.
*
- * @param nsh our handle
+ * @param h our handle
*/
static void
-force_reconnect (struct GNUNET_NAMESTORE_Handle *nsh)
+force_reconnect (struct GNUNET_NAMESTORE_Handle *h)
{
- nsh->reconnect = GNUNET_NO;
- GNUNET_CLIENT_disconnect (nsh->client, GNUNET_NO);
- nsh->client = NULL;
- nsh->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ h->reconnect = GNUNET_NO;
+ GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+ h->client = NULL;
+ h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&reconnect_task,
- nsh);
+ h);
}
-static void
-enqeue_namestore_operation (struct GNUNET_NAMESTORE_Handle *nsh, struct GNUNET_NAMESTORE_QueueEntry *qe)
+static uint32_t
+get_op_id (struct GNUNET_NAMESTORE_Handle *h)
{
- qe->op_id = nsh->op_id;
- nsh->op_id ++;
- GNUNET_CONTAINER_DLL_insert(nsh->op_head, nsh->op_tail, qe);
+ uint32_t op_id = h->op_id;
+ h->op_id ++;
+ return op_id;
}
/**
struct GNUNET_NAMESTORE_Handle *
GNUNET_NAMESTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_NAMESTORE_Handle *nsh;
+ struct GNUNET_NAMESTORE_Handle *h;
- nsh = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Handle));
- nsh->cfg = cfg;
- nsh->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect_task, nsh);
- nsh->op_id = 0;
- return nsh;
+ h = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Handle));
+ h->cfg = cfg;
+ h->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect_task, h);
+ h->op_id = 0;
+ return h;
}
+
/**
- * Shutdown connection with the NAMESTORE service.
+ * Disconnect from the namestore service (and free associated
+ * resources).
*
- * @param handle handle of the NAMESTORE connection to stop
+ * @param h handle to the namestore
+ * @param drop set to GNUNET_YES to delete all data in namestore (!)
*/
void
-GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *nsh, int drop)
+GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h, int drop)
{
struct PendingMessage *p;
struct GNUNET_NAMESTORE_QueueEntry *q;
struct GNUNET_NAMESTORE_ZoneIterator *z;
- GNUNET_assert (nsh != NULL);
+ GNUNET_assert (h != NULL);
- while (NULL != (p = nsh->pending_head))
+ while (NULL != (p = h->pending_head))
{
- GNUNET_CONTAINER_DLL_remove (nsh->pending_head, nsh->pending_tail, p);
+ GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
GNUNET_free (p);
}
- while (NULL != (q = nsh->op_head))
+ while (NULL != (q = h->op_head))
{
- GNUNET_CONTAINER_DLL_remove (nsh->op_head, nsh->op_tail, q);
+ GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, q);
GNUNET_free (q);
}
- while (NULL != (z = nsh->z_head))
+ while (NULL != (z = h->z_head))
{
- GNUNET_CONTAINER_DLL_remove (nsh->z_head, nsh->z_tail, z);
+ GNUNET_CONTAINER_DLL_remove (h->z_head, h->z_tail, z);
GNUNET_free (z);
}
- if (NULL != nsh->client)
+ if (NULL != h->client)
{
- GNUNET_CLIENT_disconnect (nsh->client, GNUNET_NO);
- nsh->client = NULL;
+ GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+ h->client = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != nsh->reconnect_task)
+ if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task)
{
- GNUNET_SCHEDULER_cancel (nsh->reconnect_task);
- nsh->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (h->reconnect_task);
+ h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_free(nsh);
- nsh = NULL;
+ GNUNET_free(h);
+ h = NULL;
}
* authorities.
*
* @param h handle to the namestore
- * @param zone hash of the public key of the zone
+ * @param zone_key public key of the zone
* @param name name that is being mapped (at most 255 characters long)
* @param expire when does the corresponding block in the DHT expire (until
* when should we never do a DHT lookup for the same name again)?
*/
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
- const GNUNET_HashCode *zone,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
const char *name,
struct GNUNET_TIME_Absolute expire,
unsigned int rd_count,
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
+
+ /* pointer to elements */
+ char * zone_key_tmp;
+ char * rd_tmp;
+ char * name_tmp;
+
size_t msg_size = 0;
+ size_t name_len = 0;
+ size_t rd_ser_len = 0;
+ size_t pubkey_len = 0;
+ uint32_t rid = 0;
GNUNET_assert (NULL != h);
+ GNUNET_assert (NULL != zone_key);
+ GNUNET_assert (NULL != name);
+ GNUNET_assert (NULL != rd);
+ GNUNET_assert (NULL != signature);
+ name_len = strlen(name) + 1;
+ if (name_len > 256)
+ {
+ 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;
- enqeue_namestore_operation(h, qe);
+ qe->op_id = rid;
+ GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
/* set msg_size*/
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
- /* create msg here */
+ pubkey_len = sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded);
+ struct RecordPutMessage * msg;
+ msg_size = sizeof (struct RecordPutMessage) + pubkey_len + name_len + rd_ser_len;
- GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, pe);
+ /* create msg here */
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe->size = msg_size;
+ pe->is_init = GNUNET_NO;
+ msg = (struct RecordPutMessage *) &pe[1];
+ zone_key_tmp = (char *) &msg[1];
+ name_tmp = (char *) &zone_key_tmp[pubkey_len];
+ rd_tmp = &name_tmp[name_len];
+
+ msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT);
+ msg->gns_header.header.size = htons (msg_size);
+ msg->gns_header.r_id = htonl (rid);
+ msg->key_len = htons (pubkey_len);
+ memcpy (zone_key_tmp, zone_key, pubkey_len);
+ msg->signature = *signature;
+ msg->name_len = htons (name_len);
+ memcpy (name_tmp, name, name_len);
+ msg->expire = GNUNET_TIME_absolute_hton (expire);
+ msg->rd_len = htons (rd_ser_len);
+ msg->rd_count = htons (rd_count);
+
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for name `%s' with size %u\n", "NAMESTORE_RECORD_PUT", name, msg_size);
+
+ GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
-#if 0
- struct GNUNET_NAMESTORE_SimpleRecord *sr;
- sr = GNUNET_malloc(sizeof(struct GNUNET_NAMESTORE_SimpleRecord));
- sr->name = name;
- sr->record_type = record_type;
- sr->expiration = expiration;
- sr->flags = flags;
- sr->data_size = data_size;
- sr->data = data;
- GNUNET_CONTAINER_DLL_insert(h->records_head, h->records_tail, sr);
-#endif
return qe;
}
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- return GNUNET_SYSERR;
+ int res = GNUNET_SYSERR;
+ size_t rd_ser_len = 0;
+ size_t name_len = 0;
+ char * name_tmp;
+ char * rd_tmp;
+ struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose;
+
+ GNUNET_assert (public_key != NULL);
+ GNUNET_assert (name != NULL);
+ GNUNET_assert (signature != NULL);
+
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
+
+ name_len = strlen (name) + 1;
+
+ sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len + name_len);
+ sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len + name_len);
+ sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
+ name_tmp = (char *) &sig_purpose[1];
+ rd_tmp = &name_tmp[name_len];
+ memcpy (name_tmp, name, name_len);
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
+
+ res = GNUNET_CRYPTO_rsa_verify(GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN, sig_purpose, signature, public_key);
+
+ GNUNET_free (sig_purpose);
+
+ return res;
}
/**
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
+ char * name_tmp;
+ char * pkey_tmp;
+ char * rd_tmp;
+ size_t rd_ser_len = 0;
size_t msg_size = 0;
+ size_t name_len = 0;
+ size_t key_len = 0;
+ uint32_t rid = 0;
GNUNET_assert (NULL != h);
+ GNUNET_assert (NULL != pkey);
+ GNUNET_assert (NULL != name);
+ GNUNET_assert (NULL != rd);
+
+ name_len = strlen(name) + 1;
+ if (name_len > 256)
+ {
+ 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;
- enqeue_namestore_operation(h, qe);
+ qe->op_id = rid;
+ GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
/* set msg_size*/
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
+ GNUNET_assert (pkey_enc != NULL);
+ key_len = ntohs (pkey_enc->len);
- /* create msg here */
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(1, rd, rd_ser_len, rd_ser);
+
+ struct RecordCreateMessage * msg;
+ msg_size = sizeof (struct RecordCreateMessage) + key_len + name_len + rd_ser_len;
- GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, pe);
+ /* create msg here */
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe->size = msg_size;
+ pe->is_init = GNUNET_NO;
+ msg = (struct RecordCreateMessage *) &pe[1];
+
+ pkey_tmp = (char *) &msg[1];
+ name_tmp = &pkey_tmp[key_len];
+ rd_tmp = &name_tmp[name_len];
+
+ 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);
+ memcpy (pkey_tmp, pkey_enc, key_len);
+ memcpy (name_tmp, name, name_len);
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
+ GNUNET_free (pkey_enc);
+
+ GNUNET_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_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
+ char *pkey_tmp;
+ char *rd_tmp;
+ char *name_tmp;
+ size_t rd_ser_len = 0;
size_t msg_size = 0;
+ size_t name_len = 0;
+ size_t key_len = 0;
+ uint32_t rid = 0;
GNUNET_assert (NULL != h);
+ rid = get_op_id(h);
qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
qe->nsh = h;
qe->cont = cont;
qe->cont_cls = cont_cls;
- enqeue_namestore_operation(h, qe);
+ qe->op_id = rid;
+ GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
/* set msg_size*/
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
+ GNUNET_assert (pkey_enc != NULL);
+ key_len = ntohs (pkey_enc->len);
+
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(1, rd, rd_ser_len, rd_ser);
+
+ name_len = strlen (name) + 1;
+
+ struct RecordRemoveMessage * msg;
+ msg_size = sizeof (struct RecordRemoveMessage) + key_len + name_len + rd_ser_len;
/* create msg here */
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ pe->size = msg_size;
+ pe->is_init = GNUNET_NO;
+ msg = (struct RecordRemoveMessage *) &pe[1];
- GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, pe);
- do_transmit(h);
+ pkey_tmp = (char *) &msg[1];
+ name_tmp = &pkey_tmp[key_len];
+ rd_tmp = &name_tmp[name_len];
-#if 0
- struct GNUNET_NAMESTORE_SimpleRecord *iter;
- for (iter=h->records_head; iter != NULL; iter=iter->next)
- {
- if (strcmp ( iter->name, name ) &&
- iter->record_type == record_type &&
- GNUNET_CRYPTO_hash_cmp (iter->zone, zone))
- break;
- }
- if (iter)
- GNUNET_CONTAINER_DLL_remove(h->records_head,
- h->records_tail,
- iter);
-#endif
+ 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 (1);
+ msg->key_len = htons (key_len);
+ memcpy (pkey_tmp, pkey_enc, key_len);
+ memcpy (name_tmp, name, name_len);
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
+
+ GNUNET_free (pkey_enc);
+
+ GNUNET_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;
}
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
size_t msg_size = 0;
+ size_t name_len = 0;
+ uint32_t rid = 0;
GNUNET_assert (NULL != h);
+ GNUNET_assert (NULL != zone);
+ GNUNET_assert (NULL != name);
+ name_len = strlen (name) + 1;
+ if ((name_len == 0) || (name_len > 256))
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+
+ rid = get_op_id(h);
qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
qe->nsh = h;
qe->proc = proc;
qe->proc_cls = proc_cls;
- enqeue_namestore_operation(h, qe);
+ qe->op_id = rid;
+ GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
/* set msg_size*/
- msg_size = sizeof (struct LookupNameMessage);
+ msg_size = sizeof (struct LookupNameMessage) + name_len;
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
/* create msg here */
-
struct LookupNameMessage * msg;
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct LookupNameMessage *) &pe[1];
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME);
- msg->header.size = htons (msg_size);
-
- /* create msg done */
-
- GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, pe);
+ msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME);
+ msg->gns_header.header.size = htons (msg_size);
+ msg->gns_header.r_id = htonl (rid);
+ msg->record_type = htonl (record_type);
+ msg->zone = *zone;
+ msg->name_len = htonl (name_len);
+ memcpy (&msg[1], name, name_len);
+
+ GNUNET_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);
-#if 0
- struct GNUNET_NAMESTORE_SimpleRecord *iter;
- for (iter=h->records_head; iter != NULL; iter=iter->next)
- {
- proc(proc_cls, iter->zone, iter->name, iter->record_type,
- iter->expiration,
- iter->flags,
- NULL /*sig loc*/,
- iter->data_size /*size*/,
- iter->data /* data */);
- }
- proc(proc_cls, zone, name, record_type,
- GNUNET_TIME_absolute_get_forever(), 0, NULL, 0, NULL); /*TERMINATE*/
-#endif
-
-
-
return qe;
}
void *proc_cls)
{
struct GNUNET_NAMESTORE_ZoneIterator *it;
+ struct PendingMessage *pe;
+ size_t msg_size = 0;
+ uint32_t rid = 0;
- GNUNET_assert (h != NULL);
+ GNUNET_assert (NULL != h);
+ GNUNET_assert (NULL != zone);
+ rid = get_op_id(h);
it = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_ZoneIterator));
it->h = h;
it->proc = proc;
it->proc_cls = proc;
- GNUNET_CONTAINER_DLL_insert(h->z_head, h->z_tail, it);
+ it->op_id = rid;
+ it->zone = *zone;
+ GNUNET_CONTAINER_DLL_insert_tail(h->z_head, h->z_tail, it);
+
+ /* set msg_size*/
+ msg_size = sizeof (struct ZoneIterationStartMessage);
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+
+ /* create msg here */
+ struct ZoneIterationStartMessage * msg;
+ 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);
+ msg->zone = *zone;
+ msg->must_have_flags = ntohs (must_have_flags);
+ msg->must_not_have_flags = ntohs (must_not_have_flags);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for zone `%s'\n", "ZONE_ITERATION_START", GNUNET_h2s(zone));
+
+ /* transmit message */
+ GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
+ do_transmit(h);
return it;
}
void
GNUNET_NAMESTORE_zone_iterator_next (struct GNUNET_NAMESTORE_ZoneIterator *it)
{
+ struct GNUNET_NAMESTORE_Handle *h;
+ struct PendingMessage *pe;
+ size_t msg_size = 0;
+ GNUNET_assert (NULL != it);
+ h = it->h;
+
+ /* set msg_size*/
+ msg_size = sizeof (struct ZoneIterationNextMessage);
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+
+ /* create msg here */
+ struct ZoneIterationNextMessage * msg;
+ 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);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for name `%s'\n", "ZONE_ITERATION_NEXT", GNUNET_h2s(&it->zone));
+
+ /* transmit message */
+ GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
+ do_transmit(h);
}
void
GNUNET_NAMESTORE_zone_iteration_stop (struct GNUNET_NAMESTORE_ZoneIterator *it)
{
- struct GNUNET_NAMESTORE_Handle * nsh;
- GNUNET_assert (it != NULL);
+ GNUNET_assert (NULL != it);
+ struct PendingMessage *pe;
+ size_t msg_size = 0;
+ struct GNUNET_NAMESTORE_Handle *h = it->h;
- nsh = it->h;
- GNUNET_CONTAINER_DLL_remove (nsh->z_head, nsh->z_tail, it);
- GNUNET_free (it);
+ /* set msg_size*/
+ msg_size = sizeof (struct ZoneIterationStopMessage);
+ pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+ /* create msg here */
+ struct ZoneIterationStopMessage * msg;
+ 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);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for name `%s'\n", "ZONE_ITERATION_STOP", GNUNET_h2s(&it->zone));
+
+ /* transmit message */
+ GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
+ do_transmit(h);
}
void
GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe)
{
- struct GNUNET_NAMESTORE_Handle *nsh = qe->nsh;
+ struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
GNUNET_assert (qe != NULL);
- GNUNET_CONTAINER_DLL_remove(nsh->op_head, nsh->op_tail, qe);
+ GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
GNUNET_free(qe);
}
projects / oweals / gnunet.git / blobdiff