[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37324 - in gnunet/src: identity include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37324 - in gnunet/src: identity include |
|
Date: |
Wed, 22 Jun 2016 00:27:17 +0200 |
Author: grothoff
Date: 2016-06-22 00:27:17 +0200 (Wed, 22 Jun 2016)
New Revision: 37324
Modified:
gnunet/src/identity/identity_api.c
gnunet/src/identity/test_identity.c
gnunet/src/include/gnunet_identity_service.h
Log:
rework identity API to use new MQ API
Modified: gnunet/src/identity/identity_api.c
===================================================================
--- gnunet/src/identity/identity_api.c 2016-06-21 19:12:01 UTC (rev 37323)
+++ gnunet/src/identity/identity_api.c 2016-06-21 22:27:17 UTC (rev 37324)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2013 GNUnet e.V.
+ Copyright (C) 2013, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public Liceidentity as published
@@ -117,13 +117,13 @@
const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Socket (if available).
+ * Connection to service.
*/
- struct GNUNET_CLIENT_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
* Hash map from the hash of the public key to the
- * respective 'GNUNET_IDENTITY_Ego' handle.
+ * respective `GNUNET_IDENTITY_Ego` handle.
*/
struct GNUNET_CONTAINER_MultiHashMap *egos;
@@ -133,7 +133,7 @@
GNUNET_IDENTITY_Callback cb;
/**
- * Closure for 'cb'.
+ * Closure for @e cb.
*/
void *cb_cls;
@@ -148,14 +148,9 @@
struct GNUNET_IDENTITY_Operation *op_tail;
/**
- * Currently pending transmission request, or NULL for none.
- */
- struct GNUNET_CLIENT_TransmitHandle *th;
-
- /**
* Task doing exponential back-off trying to reconnect.
*/
- struct GNUNET_SCHEDULER_Task * reconnect_task;
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
/**
* Time for next connect retry.
@@ -185,8 +180,10 @@
return &anon;
anon.pk = (struct GNUNET_CRYPTO_EcdsaPrivateKey *)
GNUNET_CRYPTO_ecdsa_key_get_anonymous ();
GNUNET_CRYPTO_ecdsa_key_get_public (anon.pk,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &anon.id);
+ &pub);
+ GNUNET_CRYPTO_hash (&pub,
+ sizeof (pub),
+ &anon.id);
return &anon;
}
@@ -201,6 +198,38 @@
/**
+ * Free ego from hash map.
+ *
+ * @param cls identity service handle
+ * @param key unused
+ * @param value ego to free
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+free_ego (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_IDENTITY_Handle *h = cls;
+ struct GNUNET_IDENTITY_Ego *ego = value;
+
+ if (NULL != h->cb)
+ h->cb (h->cb_cls,
+ ego,
+ &ego->ctx,
+ NULL);
+ GNUNET_free (ego->pk);
+ GNUNET_free (ego->name);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (h->egos,
+ key,
+ value));
+ GNUNET_free (ego);
+ return GNUNET_OK;
+}
+
+
+/**
* Reschedule a connect attempt to the service.
*
* @param h transport service to reconnect
@@ -208,322 +237,310 @@
static void
reschedule_connect (struct GNUNET_IDENTITY_Handle *h)
{
- GNUNET_assert (h->reconnect_task == NULL);
+ struct GNUNET_IDENTITY_Operation *op;
- if (NULL != h->th)
+ GNUNET_assert (NULL == h->reconnect_task);
+
+ if (NULL != h->mq)
{
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
}
- if (NULL != h->client)
+ while (NULL != (op = h->op_head))
{
- GNUNET_CLIENT_disconnect (h->client);
- h->client = NULL;
+ GNUNET_CONTAINER_DLL_remove (h->op_head,
+ h->op_tail,
+ op);
+ if (NULL != op->cont)
+ op->cont (op->cls,
+ "Error in communication with the identity service");
+ else if (NULL != op->cb)
+ op->cb (op->cls,
+ NULL,
+ NULL,
+ NULL);
+ GNUNET_free (op);
}
- h->in_receive = GNUNET_NO;
+ GNUNET_CONTAINER_multihashmap_iterate (h->egos,
+ &free_ego,
+ h);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling task to reconnect to identity service in %s.\n",
- GNUNET_STRINGS_relative_time_to_string (h->reconnect_delay,
GNUNET_YES));
+ GNUNET_STRINGS_relative_time_to_string (h->reconnect_delay,
+ GNUNET_YES));
h->reconnect_task =
- GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+ GNUNET_SCHEDULER_add_delayed (h->reconnect_delay,
+ &reconnect,
+ h);
h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
}
/**
- * Type of a function to call when we receive a message
- * from the service.
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
*
- * @param cls closure
- * @param msg message received, NULL on timeout or fatal error
+ * @param cls closure with the `struct GNUNET_IDENTITY_Handle *`
+ * @param error error code
*/
static void
-message_handler (void *cls,
- const struct GNUNET_MessageHeader *msg)
+mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
struct GNUNET_IDENTITY_Handle *h = cls;
- struct GNUNET_IDENTITY_Operation *op;
- struct GNUNET_IDENTITY_Ego *ego;
- const struct GNUNET_IDENTITY_ResultCodeMessage *rcm;
- const struct GNUNET_IDENTITY_UpdateMessage *um;
- const struct GNUNET_IDENTITY_SetDefaultMessage *sdm;
- struct GNUNET_CRYPTO_EcdsaPublicKey pub;
- struct GNUNET_HashCode id;
- const char *str;
- uint16_t size;
- uint16_t name_len;
- if (NULL == msg)
+ reschedule_connect (h);
+}
+
+
+/**
+ * We received a result code from the service. Check the message
+ * is well-formed.
+ *
+ * @param cls closure
+ * @param rcm result message received
+ * @return #GNUNET_OK if the message is well-formed
+ */
+static int
+check_identity_result_code (void *cls,
+ const struct GNUNET_IDENTITY_ResultCodeMessage
*rcm)
+{
+ uint16_t size = ntohs (rcm->header.size) - sizeof (*rcm);
+ const char *str = (const char *) &rcm[1];
+
+ if (0 == size)
+ return GNUNET_OK;
+ if ('\0' != str[size - sizeof (*rcm) - 1])
{
- reschedule_connect (h);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of type %d from identity service\n",
- ntohs (msg->type));
- size = ntohs (msg->size);
- switch (ntohs (msg->type))
- {
- case GNUNET_MESSAGE_TYPE_IDENTITY_RESULT_CODE:
- if (size < sizeof (struct GNUNET_IDENTITY_ResultCodeMessage))
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- rcm = (const struct GNUNET_IDENTITY_ResultCodeMessage *) msg;
- str = (const char *) &rcm[1];
- if ( (size > sizeof (struct GNUNET_IDENTITY_ResultCodeMessage)) &&
- ('\0' != str[size - sizeof (struct GNUNET_IDENTITY_ResultCodeMessage)
- 1]) )
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- if (size == sizeof (struct GNUNET_IDENTITY_ResultCodeMessage))
- str = NULL;
+ return GNUNET_OK;
+}
- op = h->op_head;
- GNUNET_CONTAINER_DLL_remove (h->op_head,
- h->op_tail,
- op);
- GNUNET_CLIENT_receive (h->client, &message_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
- if (NULL != op->cont)
- op->cont (op->cls,
- str);
- else if (NULL != op->cb)
- op->cb (op->cls, NULL, NULL, NULL);
- GNUNET_free (op);
- break;
- case GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE:
- if (size < sizeof (struct GNUNET_IDENTITY_UpdateMessage))
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- um = (const struct GNUNET_IDENTITY_UpdateMessage *) msg;
- name_len = ntohs (um->name_len);
- str = (const char *) &um[1];
- if ( (size != name_len + sizeof (struct GNUNET_IDENTITY_UpdateMessage)) ||
- ( (0 != name_len) &&
- ('\0' != str[name_len - 1])) )
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- if (GNUNET_YES == ntohs (um->end_of_list))
- {
- /* end of initial list of data */
- GNUNET_CLIENT_receive (h->client, &message_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
- if (NULL != h->cb)
- h->cb (h->cb_cls, NULL, NULL, NULL);
- break;
- }
- GNUNET_CRYPTO_ecdsa_key_get_public (&um->private_key,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &id);
- if (0 == name_len)
- str = NULL;
- else
- str = (const char *) &um[1];
- ego = GNUNET_CONTAINER_multihashmap_get (h->egos,
- &id);
- if (NULL == ego)
- {
- /* ego was created */
- if (NULL == str)
- {
- /* deletion of unknown ego? not allowed */
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- ego = GNUNET_new (struct GNUNET_IDENTITY_Ego);
- ego->pk = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
- *ego->pk = um->private_key;
- ego->name = GNUNET_strdup (str);
- ego->id = id;
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (h->egos,
- &ego->id,
- ego,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- }
- if (NULL == str)
- {
- /* ego was deleted */
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (h->egos,
- &ego->id,
- ego));
- }
- else
- {
- /* ego changed name */
- GNUNET_free (ego->name);
- ego->name = GNUNET_strdup (str);
- }
- GNUNET_CLIENT_receive (h->client, &message_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
- /* inform application about change */
- if (NULL != h->cb)
- h->cb (h->cb_cls,
- ego,
- &ego->ctx,
- str);
- if (NULL == str)
- {
- GNUNET_free (ego->pk);
- GNUNET_free (ego->name);
- GNUNET_free (ego);
- }
- break;
- case GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT:
- if (size < sizeof (struct GNUNET_IDENTITY_SetDefaultMessage))
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- sdm = (const struct GNUNET_IDENTITY_SetDefaultMessage *) msg;
- GNUNET_break (0 == ntohs (sdm->reserved));
- name_len = ntohs (sdm->name_len);
- str = (const char *) &sdm[1];
- if ( (size != name_len + sizeof (struct
GNUNET_IDENTITY_SetDefaultMessage)) ||
- ( (0 != name_len) &&
- ('\0' != str[name_len - 1]) ) )
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- /* Note: we know which service this should be for, so we're not
- really using 'str' henceforth */
- GNUNET_CRYPTO_ecdsa_key_get_public (&sdm->private_key,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &id);
- ego = GNUNET_CONTAINER_multihashmap_get (h->egos,
- &id);
- if (NULL == ego)
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- op = h->op_head;
- if (NULL == op)
- {
- GNUNET_break (0);
- reschedule_connect (h);
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received SET_DEFAULT message from identity service\n");
- GNUNET_CONTAINER_DLL_remove (h->op_head,
- h->op_tail,
- op);
- GNUNET_CLIENT_receive (h->client, &message_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
- if (NULL != op->cb)
- op->cb (op->cls,
- ego,
- &ego->ctx,
- ego->name);
- GNUNET_free (op);
- break;
- default:
+/**
+ * We received a result code from the service.
+ *
+ * @param cls closure
+ * @param rcm result message received
+ */
+static void
+handle_identity_result_code (void *cls,
+ const struct GNUNET_IDENTITY_ResultCodeMessage
*rcm)
+{
+ struct GNUNET_IDENTITY_Handle *h = cls;
+ struct GNUNET_IDENTITY_Operation *op;
+ uint16_t size = ntohs (rcm->header.size) - sizeof (*rcm);
+ const char *str = (0 == size) ? NULL : (const char *) &rcm[1];
+
+ op = h->op_head;
+ if (NULL == op)
+ {
GNUNET_break (0);
reschedule_connect (h);
return;
}
+ GNUNET_CONTAINER_DLL_remove (h->op_head,
+ h->op_tail,
+ op);
+ if (NULL != op->cont)
+ op->cont (op->cls,
+ str);
+ else if (NULL != op->cb)
+ op->cb (op->cls, NULL, NULL, NULL);
+ GNUNET_free (op);
}
/**
- * Schedule transmission of the next message from our queue.
+ * Check validity of identity update message.
*
- * @param h identity handle
+ * @param cls closure
+ * @param um message received
+ * @return #GNUNET_OK if the message is well-formed
*/
-static void
-transmit_next (struct GNUNET_IDENTITY_Handle *h);
+static int
+check_identity_update (void *cls,
+ const struct GNUNET_IDENTITY_UpdateMessage *um)
+{
+ uint16_t size = ntohs (um->header.size);
+ uint16_t name_len = ntohs (um->name_len);
+ const char *str = (const char *) &um[1];
+ if ( (size != name_len + sizeof (struct GNUNET_IDENTITY_UpdateMessage)) ||
+ ( (0 != name_len) &&
+ ('\0' != str[name_len - 1])) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
/**
- * Transmit next message to service.
+ * Handle identity update message.
*
- * @param cls the `struct GNUNET_IDENTITY_Handle`.
- * @param size number of bytes available in @a buf
- * @param buf where to copy the message
- * @return number of bytes copied to buf
+ * @param cls closure
+ * @param um message received
*/
-static size_t
-send_next_message (void *cls,
- size_t size,
- void *buf)
+static void
+handle_identity_update (void *cls,
+ const struct GNUNET_IDENTITY_UpdateMessage *um)
{
struct GNUNET_IDENTITY_Handle *h = cls;
- struct GNUNET_IDENTITY_Operation *op = h->op_head;
- size_t ret;
+ uint16_t name_len = ntohs (um->name_len);
+ const char *str = (0 == name_len) ? NULL : (const char *) &um[1];
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_HashCode id;
+ struct GNUNET_IDENTITY_Ego *ego;
- h->th = NULL;
- if (NULL == op)
- return 0;
- ret = ntohs (op->msg->size);
- if (ret > size)
+ if (GNUNET_YES == ntohs (um->end_of_list))
{
- reschedule_connect (h);
- return 0;
+ /* end of initial list of data */
+ if (NULL != h->cb)
+ h->cb (h->cb_cls,
+ NULL,
+ NULL,
+ NULL);
+ return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message of type %d to identity service\n",
- ntohs (op->msg->type));
- memcpy (buf, op->msg, ret);
- if ( (NULL == op->cont) &&
- (NULL == op->cb) )
+ GNUNET_CRYPTO_ecdsa_key_get_public (&um->private_key,
+ &pub);
+ GNUNET_CRYPTO_hash (&pub,
+ sizeof (pub),
+ &id);
+ ego = GNUNET_CONTAINER_multihashmap_get (h->egos,
+ &id);
+ if (NULL == ego)
{
- GNUNET_CONTAINER_DLL_remove (h->op_head,
- h->op_tail,
- op);
- GNUNET_free (op);
- transmit_next (h);
+ /* ego was created */
+ if (NULL == str)
+ {
+ /* deletion of unknown ego? not allowed */
+ GNUNET_break (0);
+ reschedule_connect (h);
+ return;
+ }
+ ego = GNUNET_new (struct GNUNET_IDENTITY_Ego);
+ ego->pk = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
+ *ego->pk = um->private_key;
+ ego->name = GNUNET_strdup (str);
+ ego->id = id;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (h->egos,
+ &ego->id,
+ ego,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
- if (GNUNET_NO == h->in_receive)
+ if (NULL == str)
{
- h->in_receive = GNUNET_YES;
- GNUNET_CLIENT_receive (h->client,
- &message_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ /* ego was deleted */
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (h->egos,
+ &ego->id,
+ ego));
}
- return ret;
+ else
+ {
+ /* ego changed name */
+ GNUNET_free (ego->name);
+ ego->name = GNUNET_strdup (str);
+ }
+ /* inform application about change */
+ if (NULL != h->cb)
+ h->cb (h->cb_cls,
+ ego,
+ &ego->ctx,
+ str);
+ /* complete deletion */
+ if (NULL == str)
+ {
+ GNUNET_free (ego->pk);
+ GNUNET_free (ego->name);
+ GNUNET_free (ego);
+ }
}
/**
- * Schedule transmission of the next message from our queue.
+ * Function called when we receive a set default message from the
+ * service.
*
- * @param h identity handle
+ * @param cls closure
+ * @param sdm message received
+ * @return #GNUNET_OK if the message is well-formed
*/
+static int
+check_identity_set_default (void *cls,
+ const struct GNUNET_IDENTITY_SetDefaultMessage
*sdm)
+{
+ uint16_t size = ntohs (sdm->header.size);
+ uint16_t name_len = ntohs (sdm->name_len);
+ const char *str = (const char *) &sdm[1];
+
+ if ( (size != name_len + sizeof (struct GNUNET_IDENTITY_SetDefaultMessage))
||
+ ( (0 != name_len) &&
+ ('\0' != str[name_len - 1]) ) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_break (0 == ntohs (sdm->reserved));
+ return GNUNET_OK;
+}
+
+
+/**
+ * Type of a function to call when we receive a message
+ * from the service.
+ *
+ * @param cls closure
+ * @param sdm message received
+ */
static void
-transmit_next (struct GNUNET_IDENTITY_Handle *h)
+handle_identity_set_default (void *cls,
+ const struct GNUNET_IDENTITY_SetDefaultMessage
*sdm)
{
- struct GNUNET_IDENTITY_Operation *op = h->op_head;
+ struct GNUNET_IDENTITY_Handle *h = cls;
+ struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_HashCode id;
+ struct GNUNET_IDENTITY_Ego *ego;
- GNUNET_assert (NULL == h->th);
+ GNUNET_CRYPTO_ecdsa_key_get_public (&sdm->private_key,
+ &pub);
+ GNUNET_CRYPTO_hash (&pub,
+ sizeof (pub),
+ &id);
+ ego = GNUNET_CONTAINER_multihashmap_get (h->egos,
+ &id);
+ if (NULL == ego)
+ {
+ GNUNET_break (0);
+ reschedule_connect (h);
+ return;
+ }
+ op = h->op_head;
if (NULL == op)
+ {
+ GNUNET_break (0);
+ reschedule_connect (h);
return;
- if (NULL == h->client)
- return;
- h->th = GNUNET_CLIENT_notify_transmit_ready (h->client,
- ntohs (op->msg->size),
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO,
- &send_next_message,
- h);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received SET_DEFAULT message from identity service\n");
+ GNUNET_CONTAINER_DLL_remove (h->op_head,
+ h->op_tail,
+ op);
+ if (NULL != op->cb)
+ op->cb (op->cls,
+ ego,
+ &ego->ctx,
+ ego->name);
+ GNUNET_free (op);
}
@@ -535,32 +552,40 @@
static void
reconnect (void *cls)
{
+ GNUNET_MQ_hd_var_size (identity_result_code,
+ GNUNET_MESSAGE_TYPE_IDENTITY_RESULT_CODE,
+ struct GNUNET_IDENTITY_ResultCodeMessage);
+ GNUNET_MQ_hd_var_size (identity_update,
+ GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE,
+ struct GNUNET_IDENTITY_UpdateMessage);
+ GNUNET_MQ_hd_var_size (identity_set_default,
+ GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT,
+ struct GNUNET_IDENTITY_SetDefaultMessage);
struct GNUNET_IDENTITY_Handle *h = cls;
- struct GNUNET_IDENTITY_Operation *op;
- struct GNUNET_MessageHeader msg;
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_identity_result_code_handler (h),
+ make_identity_update_handler (h),
+ make_identity_set_default_handler (h),
+ GNUNET_MQ_handler_end ()
+ };
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
h->reconnect_task = NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Connecting to identity service.\n");
- GNUNET_assert (NULL == h->client);
- h->client = GNUNET_CLIENT_connect ("identity", h->cfg);
- GNUNET_assert (NULL != h->client);
- if ( (NULL == h->op_head) ||
- (GNUNET_MESSAGE_TYPE_IDENTITY_START != ntohs (h->op_head->msg->type)) )
- {
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_MessageHeader));
- op->h = h;
- op->msg = (const struct GNUNET_MessageHeader *) &op[1];
- msg.size = htons (sizeof (msg));
- msg.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_START);
- memcpy (&op[1], &msg, sizeof (msg));
- GNUNET_CONTAINER_DLL_insert (h->op_head,
- h->op_tail,
- op);
- }
- transmit_next (h);
- GNUNET_assert (NULL != h->th);
+ GNUNET_assert (NULL == h->mq);
+ h->mq = GNUNET_CLIENT_connecT (h->cfg,
+ "identity",
+ handlers,
+ &mq_error_handler,
+ h);
+ if (NULL == h->mq)
+ return;
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_IDENTITY_START);
+ GNUNET_MQ_send (h->mq,
+ env);
}
@@ -584,8 +609,12 @@
h->cb = cb;
h->cb_cls = cb_cls;
h->egos = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_YES);
- h->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
- h->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, h);
+ reconnect (h);
+ if (NULL == h->mq)
+ {
+ GNUNET_free (h);
+ return NULL;
+ }
return h;
}
@@ -614,7 +643,7 @@
struct GNUNET_CRYPTO_EcdsaPublicKey *pk)
{
GNUNET_CRYPTO_ecdsa_key_get_public (ego->pk,
- pk);
+ pk);
}
@@ -622,7 +651,7 @@
* Obtain the identity that is currently preferred/default
* for a service.
*
- * @param id identity service to query
+ * @param h identity service to query
* @param service_name for which service is an identity wanted
* @param cb function to call with the result (will only be called once)
* @param cb_cls closure for @a cb
@@ -629,15 +658,18 @@
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id,
+GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *h,
const char *service_name,
GNUNET_IDENTITY_Callback cb,
void *cb_cls)
{
struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_IDENTITY_GetDefaultMessage *gdm;
size_t slen;
+ if (NULL == h->mq)
+ return NULL;
slen = strlen (service_name) + 1;
if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct
GNUNET_IDENTITY_GetDefaultMessage))
{
@@ -644,25 +676,23 @@
GNUNET_break (0);
return NULL;
}
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_IDENTITY_GetDefaultMessage) +
- slen);
- op->h = id;
+ op = GNUNET_new (struct GNUNET_IDENTITY_Operation);
+ op->h = h;
op->cb = cb;
op->cls = cb_cls;
- gdm = (struct GNUNET_IDENTITY_GetDefaultMessage *) &op[1];
- gdm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_GET_DEFAULT);
- gdm->header.size = htons (sizeof (struct GNUNET_IDENTITY_GetDefaultMessage) +
- slen);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+ h->op_tail,
+ op);
+ env = GNUNET_MQ_msg_extra (gdm,
+ slen,
+ GNUNET_MESSAGE_TYPE_IDENTITY_GET_DEFAULT);
gdm->name_len = htons (slen);
gdm->reserved = htons (0);
- memcpy (&gdm[1], service_name, slen);
- op->msg = &gdm->header;
- GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
- id->op_tail,
- op);
- if (NULL == id->th)
- transmit_next (id);
+ memcpy (&gdm[1],
+ service_name,
+ slen);
+ GNUNET_MQ_send (h->mq,
+ env);
return op;
}
@@ -670,7 +700,7 @@
/**
* Set the preferred/default identity for a service.
*
- * @param id identity service to inform
+ * @param h identity service to inform
* @param service_name for which service is an identity set
* @param ego new default identity to be set for this service
* @param cont function to call once the operation finished
@@ -678,7 +708,7 @@
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
+GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *h,
const char *service_name,
struct GNUNET_IDENTITY_Ego *ego,
GNUNET_IDENTITY_Continuation cont,
@@ -685,9 +715,12 @@
void *cont_cls)
{
struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_IDENTITY_SetDefaultMessage *sdm;
size_t slen;
+ if (NULL == h->mq)
+ return NULL;
slen = strlen (service_name) + 1;
if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct
GNUNET_IDENTITY_SetDefaultMessage))
{
@@ -694,26 +727,24 @@
GNUNET_break (0);
return NULL;
}
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_IDENTITY_SetDefaultMessage) +
- slen);
- op->h = id;
+ op = GNUNET_new (struct GNUNET_IDENTITY_Operation);
+ op->h = h;
op->cont = cont;
op->cls = cont_cls;
- sdm = (struct GNUNET_IDENTITY_SetDefaultMessage *) &op[1];
- sdm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT);
- sdm->header.size = htons (sizeof (struct GNUNET_IDENTITY_SetDefaultMessage) +
- slen);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+ h->op_tail,
+ op);
+ env = GNUNET_MQ_msg_extra (sdm,
+ slen,
+ GNUNET_MESSAGE_TYPE_IDENTITY_SET_DEFAULT);
sdm->name_len = htons (slen);
sdm->reserved = htons (0);
sdm->private_key = *ego->pk;
- memcpy (&sdm[1], service_name, slen);
- op->msg = &sdm->header;
- GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
- id->op_tail,
- op);
- if (NULL == id->th)
- transmit_next (id);
+ memcpy (&sdm[1],
+ service_name,
+ slen);
+ GNUNET_MQ_send (h->mq,
+ env);
return op;
}
@@ -721,7 +752,7 @@
/**
* Create a new identity with the given name.
*
- * @param id identity service to use
+ * @param h identity service to use
* @param name desired name
* @param cont function to call with the result (will only be called once)
* @param cont_cls closure for @a cont
@@ -728,46 +759,45 @@
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
+GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *h,
const char *name,
GNUNET_IDENTITY_Continuation cont,
void *cont_cls)
{
struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_IDENTITY_CreateRequestMessage *crm;
struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
size_t slen;
+ if (NULL == h->mq)
+ return NULL;
slen = strlen (name) + 1;
- pk = GNUNET_CRYPTO_ecdsa_key_create ();
-
if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct
GNUNET_IDENTITY_CreateRequestMessage))
{
GNUNET_break (0);
- GNUNET_free (pk);
return NULL;
}
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_IDENTITY_CreateRequestMessage) +
- slen);
- op->h = id;
+ op = GNUNET_new (struct GNUNET_IDENTITY_Operation);
+ op->h = h;
op->cont = cont;
op->cls = cont_cls;
- crm = (struct GNUNET_IDENTITY_CreateRequestMessage *) &op[1];
- crm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_CREATE);
- crm->header.size = htons (sizeof (struct
GNUNET_IDENTITY_CreateRequestMessage) +
- slen);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+ h->op_tail,
+ op);
+ env = GNUNET_MQ_msg_extra (crm,
+ slen,
+ GNUNET_MESSAGE_TYPE_IDENTITY_CREATE);
crm->name_len = htons (slen);
crm->reserved = htons (0);
+ pk = GNUNET_CRYPTO_ecdsa_key_create ();
crm->private_key = *pk;
- memcpy (&crm[1], name, slen);
- op->msg = &crm->header;
- GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
- id->op_tail,
- op);
- if (NULL == id->th)
- transmit_next (id);
GNUNET_free (pk);
+ memcpy (&crm[1],
+ name,
+ slen);
+ GNUNET_MQ_send (h->mq,
+ env);
return op;
}
@@ -775,7 +805,7 @@
/**
* Renames an existing identity.
*
- * @param id identity service to use
+ * @param h identity service to use
* @param old_name old name
* @param new_name desired new name
* @param cb function to call with the result (will only be called once)
@@ -783,7 +813,7 @@
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id,
+GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *h,
const char *old_name,
const char *new_name,
GNUNET_IDENTITY_Continuation cb,
@@ -790,11 +820,14 @@
void *cb_cls)
{
struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_IDENTITY_RenameMessage *grm;
size_t slen_old;
size_t slen_new;
char *dst;
+ if (NULL == h->mq)
+ return NULL;
slen_old = strlen (old_name) + 1;
slen_new = strlen (new_name) + 1;
if ( (slen_old >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
@@ -804,27 +837,27 @@
GNUNET_break (0);
return NULL;
}
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_IDENTITY_RenameMessage) +
- slen_old + slen_new);
- op->h = id;
+ op = GNUNET_new (struct GNUNET_IDENTITY_Operation);
+ op->h = h;
op->cont = cb;
op->cls = cb_cls;
- grm = (struct GNUNET_IDENTITY_RenameMessage *) &op[1];
- grm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_RENAME);
- grm->header.size = htons (sizeof (struct GNUNET_IDENTITY_RenameMessage) +
- slen_old + slen_new);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+ h->op_tail,
+ op);
+ env = GNUNET_MQ_msg_extra (grm,
+ slen_old + slen_new,
+ GNUNET_MESSAGE_TYPE_IDENTITY_RENAME);
grm->old_name_len = htons (slen_old);
grm->new_name_len = htons (slen_new);
dst = (char *) &grm[1];
- memcpy (dst, old_name, slen_old);
- memcpy (&dst[slen_old], new_name, slen_new);
- op->msg = &grm->header;
- GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
- id->op_tail,
- op);
- if (NULL == id->th)
- transmit_next (id);
+ memcpy (dst,
+ old_name,
+ slen_old);
+ memcpy (&dst[slen_old],
+ new_name,
+ slen_new);
+ GNUNET_MQ_send (h->mq,
+ env);
return op;
}
@@ -832,7 +865,7 @@
/**
* Delete an existing identity.
*
- * @param id identity service to use
+ * @param h identity service to use
* @param name name of the identity to delete
* @param cb function to call with the result (will only be called once)
* @param cb_cls closure for @a cb
@@ -839,15 +872,18 @@
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id,
+GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *h,
const char *name,
GNUNET_IDENTITY_Continuation cb,
void *cb_cls)
{
struct GNUNET_IDENTITY_Operation *op;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_IDENTITY_DeleteMessage *gdm;
size_t slen;
+ if (NULL == h->mq)
+ return NULL;
slen = strlen (name) + 1;
if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct
GNUNET_IDENTITY_DeleteMessage))
{
@@ -854,25 +890,23 @@
GNUNET_break (0);
return NULL;
}
- op = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_Operation) +
- sizeof (struct GNUNET_IDENTITY_DeleteMessage) +
- slen);
- op->h = id;
+ op = GNUNET_new (struct GNUNET_IDENTITY_Operation);
+ op->h = h;
op->cont = cb;
op->cls = cb_cls;
- gdm = (struct GNUNET_IDENTITY_DeleteMessage *) &op[1];
- gdm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_DELETE);
- gdm->header.size = htons (sizeof (struct GNUNET_IDENTITY_DeleteMessage) +
- slen);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+ h->op_tail,
+ op);
+ env = GNUNET_MQ_msg_extra (gdm,
+ slen,
+ GNUNET_MESSAGE_TYPE_IDENTITY_DELETE);
gdm->name_len = htons (slen);
gdm->reserved = htons (0);
- memcpy (&gdm[1], name, slen);
- op->msg = &gdm->header;
- GNUNET_CONTAINER_DLL_insert_tail (id->op_head,
- id->op_tail,
- op);
- if (NULL == id->th)
- transmit_next (id);
+ memcpy (&gdm[1],
+ name,
+ slen);
+ GNUNET_MQ_send (h->mq,
+ env);
return op;
}
@@ -888,37 +922,6 @@
void
GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op)
{
- struct GNUNET_IDENTITY_Handle *h = op->h;
-
- if ( (h->op_head != op) ||
- (NULL == h->client) )
- {
- /* request not active, can simply remove */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client aborted non-head operation, simply removing it\n");
- GNUNET_CONTAINER_DLL_remove (h->op_head,
- h->op_tail,
- op);
- GNUNET_free (op);
- return;
- }
- if (NULL != h->th)
- {
- /* request active but not yet with service, can still abort */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client aborted head operation prior to transmission, aborting
it\n");
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
- GNUNET_CONTAINER_DLL_remove (h->op_head,
- h->op_tail,
- op);
- GNUNET_free (op);
- transmit_next (h);
- return;
- }
- /* request active with service, simply ensure continuations are not called */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client aborted active request, NULLing continuation\n");
op->cont = NULL;
op->cb = NULL;
}
@@ -925,34 +928,6 @@
/**
- * Free ego from hash map.
- *
- * @param cls identity service handle
- * @param key unused
- * @param value ego to free
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-free_ego (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
-{
- struct GNUNET_IDENTITY_Handle *h = cls;
- struct GNUNET_IDENTITY_Ego *ego = value;
-
- if (NULL != h->cb)
- h->cb (h->cb_cls,
- ego,
- &ego->ctx,
- NULL);
- GNUNET_free (ego->pk);
- GNUNET_free (ego->name);
- GNUNET_free (ego);
- return GNUNET_OK;
-}
-
-
-/**
* Disconnect from identity service
*
* @param h handle to destroy
@@ -968,11 +943,6 @@
GNUNET_SCHEDULER_cancel (h->reconnect_task);
h->reconnect_task = NULL;
}
- if (NULL != h->th)
- {
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
- }
if (NULL != h->egos)
{
GNUNET_CONTAINER_multihashmap_iterate (h->egos,
@@ -989,10 +959,10 @@
op);
GNUNET_free (op);
}
- if (NULL != h->client)
+ if (NULL != h->mq)
{
- GNUNET_CLIENT_disconnect (h->client);
- h->client = NULL;
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
}
GNUNET_free (h);
}
Modified: gnunet/src/identity/test_identity.c
===================================================================
--- gnunet/src/identity/test_identity.c 2016-06-21 19:12:01 UTC (rev 37323)
+++ gnunet/src/identity/test_identity.c 2016-06-21 22:27:17 UTC (rev 37324)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2013 GNUnet e.V.
+ Copyright (C) 2013, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -50,7 +50,7 @@
/**
* Handle for task for timeout termination.
*/
-static struct GNUNET_SCHEDULER_Task * endbadly_task;
+static struct GNUNET_SCHEDULER_Task *endbadly_task;
/**
@@ -105,12 +105,12 @@
static void
end ()
{
- if (endbadly_task != NULL)
+ if (NULL != endbadly_task)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = NULL;
}
- GNUNET_SCHEDULER_add_now (&end_normally, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
@@ -142,21 +142,38 @@
break;
case 1: /* create */
GNUNET_assert (NULL != ego);
- GNUNET_assert (0 == strcmp (identifier, "test-id"));
+ GNUNET_assert (0 == strcmp (identifier,
+ "test-id"));
my_ego = ego;
*ctx = &round;
break;
case 2: /* rename */
GNUNET_assert (my_ego == ego);
- GNUNET_assert (0 == strcmp (identifier, "test"));
+ GNUNET_assert (0 == strcmp (identifier,
+ "test"));
GNUNET_assert (*ctx == &round);
break;
- case 3: /* delete */
+ case 3: /* reconnect-down */
GNUNET_assert (my_ego == ego);
GNUNET_assert (NULL == identifier);
GNUNET_assert (*ctx == &round);
*ctx = NULL;
break;
+ case 4: /* reconnect-up */
+ GNUNET_assert (0 == strcmp (identifier,
+ "test"));
+ my_ego = ego;
+ *ctx = &round;
+ break;
+ case 5: /* end of iteration after reconnect */
+ GNUNET_assert (NULL == ego);
+ GNUNET_assert (NULL == identifier);
+ break;
+ case 6: /* delete */
+ GNUNET_assert (my_ego == ego);
+ GNUNET_assert (*ctx == &round);
+ *ctx = NULL;
+ break;
default:
GNUNET_break (0);
}
@@ -181,6 +198,21 @@
/**
+ * Continue by deleting the "test" identity.
+ *
+ * @param cls NULL
+ */
+static void
+finally_delete (void *cls)
+{
+ op = GNUNET_IDENTITY_delete (h,
+ "test",
+ &delete_cont,
+ NULL);
+}
+
+
+/**
* Continuation called from expected-to-fail rename operation.
*
* @param cls NULL
@@ -191,11 +223,10 @@
const char *emsg)
{
GNUNET_assert (NULL != emsg);
- op = GNUNET_IDENTITY_delete (h,
- "test",
- &delete_cont,
- NULL);
- end (); /* yepee */
+ op = NULL;
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &finally_delete,
+ NULL);
}
@@ -250,8 +281,13 @@
struct GNUNET_TESTING_Peer *peer)
{
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &endbadly, NULL);
- h = GNUNET_IDENTITY_connect (cfg, ¬ification_cb, NULL);
+ &endbadly,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&end_normally,
+ NULL);
+ h = GNUNET_IDENTITY_connect (cfg,
+ ¬ification_cb,
+ NULL);
GNUNET_assert (NULL != h);
op = GNUNET_IDENTITY_create (h,
"test-id",
Modified: gnunet/src/include/gnunet_identity_service.h
===================================================================
--- gnunet/src/include/gnunet_identity_service.h 2016-06-21 19:12:01 UTC
(rev 37323)
+++ gnunet/src/include/gnunet_identity_service.h 2016-06-21 22:27:17 UTC
(rev 37324)
@@ -105,8 +105,7 @@
/**
- * Method called to inform about the egos of
- * this peer.
+ * Method called to inform about the egos of this peer.
*
* When used with #GNUNET_IDENTITY_connect, this function is
* initially called for all egos and then again whenever a
@@ -161,8 +160,7 @@
/**
- * Obtain the ego that is currently preferred/default
- * for a service.
+ * Obtain the ego that is currently preferred/default for a service.
*
* @param id identity service to query
* @param service_name for which service is an identity wanted
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37324 - in gnunet/src: identity include,
gnunet <=