/*
This file is part of GNUnet
- Copyright (C) 2013, 2014, 2017 GNUnet e.V.
+ Copyright (C) 2013-2017 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
*/
#define INCOMING_CHANNEL_TIMEOUT GNUNET_TIME_UNIT_MINUTES
+
+/**
+ * Lazy copy requests made by a client.
+ */
+struct LazyCopyRequest
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct LazyCopyRequest *prev;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct LazyCopyRequest *next;
+
+ /**
+ * Which set are we supposed to copy?
+ */
+ struct Set *source_set;
+
+ /**
+ * Cookie identifying the request.
+ */
+ uint32_t cookie;
+
+};
+
+
/**
* A listener is inhabited by a client, and waits for evaluation
* requests from remote peers.
struct Listener *prev;
/**
- * Client that owns the listener.
- * Only one client may own a listener.
+ * Head of DLL of operations this listener is responsible for.
+ * Once the client has accepted/declined the operation, the
+ * operation is moved to the respective set's operation DLLS.
*/
- struct GNUNET_SERVICE_Client *client;
+ struct Operation *op_head;
/**
- * Message queue for the client
+ * Tail of DLL of operations this listener is responsible for.
+ * Once the client has accepted/declined the operation, the
+ * operation is moved to the respective set's operation DLLS.
*/
- struct GNUNET_MQ_Handle *client_mq;
+ struct Operation *op_tail;
/**
- * Application ID for the operation, used to distinguish
- * multiple operations of the same type with the same peer.
+ * Client that owns the listener.
+ * Only one client may own a listener.
*/
- struct GNUNET_HashCode app_id;
+ struct ClientState *cs;
/**
* The port we are listening on with CADET.
*/
struct GNUNET_CADET_Port *open_port;
+ /**
+ * Application ID for the operation, used to distinguish
+ * multiple operations of the same type with the same peer.
+ */
+ struct GNUNET_HashCode app_id;
+
/**
* The type of the operation.
*/
};
-struct LazyCopyRequest
-{
- struct Set *source_set;
- uint32_t cookie;
-
- struct LazyCopyRequest *prev;
- struct LazyCopyRequest *next;
-};
-
-
-/**
- * Configuration of our local peer.
- */
-static const struct GNUNET_CONFIGURATION_Handle *configuration;
-
/**
* Handle to the cadet service, used to listen for and connect to
* remote peers.
static struct GNUNET_CADET_Handle *cadet;
/**
- * Sets are held in a doubly linked list.
- */
-static struct Set *sets_head;
-
-/**
- * Sets are held in a doubly linked list.
+ * DLL of lazy copy requests by this client.
*/
-static struct Set *sets_tail;
+static struct LazyCopyRequest *lazy_copy_head;
/**
- * Listeners are held in a doubly linked list.
+ * DLL of lazy copy requests by this client.
*/
-static struct Listener *listeners_head;
+static struct LazyCopyRequest *lazy_copy_tail;
/**
- * Listeners are held in a doubly linked list.
+ * Generator for unique cookie we set per lazy copy request.
*/
-static struct Listener *listeners_tail;
+static uint32_t lazy_copy_cookie;
/**
- * Incoming sockets from remote peers are held in a doubly linked
- * list.
+ * Statistics handle.
*/
-static struct Operation *incoming_head;
+struct GNUNET_STATISTICS_Handle *_GSS_statistics;
/**
- * Incoming sockets from remote peers are held in a doubly linked
- * list.
+ * Listeners are held in a doubly linked list.
*/
-static struct Operation *incoming_tail;
-
-static struct LazyCopyRequest *lazy_copy_head;
-static struct LazyCopyRequest *lazy_copy_tail;
-
-static uint32_t lazy_copy_cookie = 1;
+static struct Listener *listener_head;
/**
- * Counter for allocating unique IDs for clients, used to identify
- * incoming operation requests from remote peers, that the client can
- * choose to accept or refuse.
+ * Listeners are held in a doubly linked list.
*/
-static uint32_t suggest_id = 1;
+static struct Listener *listener_tail;
/**
- * Statistics handle.
+ * Number of active clients.
*/
-struct GNUNET_STATISTICS_Handle *_GSS_statistics;
-
+static unsigned int num_clients;
/**
- * Get set that is owned by the given client, if any.
- *
- * @param client client to look for
- * @return set that the client owns, NULL if the client
- * does not own a set
+ * Are we in shutdown? if #GNUNET_YES and the number of clients
+ * drops to zero, disconnect from CADET.
*/
-static struct Set *
-set_get (struct GNUNET_SERVICE_Client *client)
-{
- for (struct Set *set = sets_head; NULL != set; set = set->next)
- if (set->client == client)
- return set;
- return NULL;
-}
-
+static int in_shutdown;
/**
- * Get the listener associated with the given client, if any.
- *
- * @param client the client
- * @return listener associated with the client, NULL
- * if there isn't any
+ * Counter for allocating unique IDs for clients, used to identify
+ * incoming operation requests from remote peers, that the client can
+ * choose to accept or refuse. 0 must not be used (reserved for
+ * uninitialized).
*/
-static struct Listener *
-listener_get (struct GNUNET_SERVICE_Client *client)
-{
- for (struct Listener *listener = listeners_head;
- NULL != listener;
- listener = listener->next)
- if (listener->client == client)
- return listener;
- return NULL;
-}
+static uint32_t suggest_id;
/**
* Get the incoming socket associated with the given id.
*
+ * @param listener the listener to look in
* @param id id to look for
* @return the incoming socket associated with the id,
* or NULL if there is none
static struct Operation *
get_incoming (uint32_t id)
{
- for (struct Operation *op = incoming_head; NULL != op; op = op->next)
- if (op->suggest_id == id)
- {
- GNUNET_assert (GNUNET_YES == op->is_incoming);
- return op;
- }
+ for (struct Listener *listener = listener_head;
+ NULL != listener;
+ listener = listener->next)
+ {
+ for (struct Operation *op = listener->op_head; NULL != op; op = op->next)
+ if (op->suggest_id == id)
+ return op;
+ }
return NULL;
}
/**
- * Destroy a listener, free all resources associated with it.
+ * Destroy an incoming request from a remote peer
*
- * @param listener listener to destroy
+ * @param op remote request to destroy
*/
static void
-listener_destroy (struct Listener *listener)
+incoming_destroy (struct Operation *op)
{
- /* If the client is not dead yet, destroy it.
- * The client's destroy callback will destroy the listener again. */
- if (NULL != listener->client)
- {
- struct GNUNET_SERVICE_Client *client = listener->client;
-
- GNUNET_MQ_destroy (listener->client_mq);
- listener->client_mq = NULL;
+ struct Listener *listener;
+ struct GNUNET_CADET_Channel *channel;
- listener->client = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting listener client\n");
- GNUNET_SERVICE_client_drop (client);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying incoming operation %p\n",
+ op);
+ if (NULL != (listener = op->listener))
+ {
+ GNUNET_CONTAINER_DLL_remove (listener->op_head,
+ listener->op_tail,
+ op);
+ op->listener = NULL;
+ }
+ if (NULL != op->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (op->timeout_task);
+ op->timeout_task = NULL;
+ }
+ if (NULL != (channel = op->channel))
+ {
+ op->channel = NULL;
+ GNUNET_CADET_channel_destroy (channel);
}
- GNUNET_CADET_close_port (listener->open_port);
- GNUNET_CONTAINER_DLL_remove (listeners_head,
- listeners_tail,
- listener);
- GNUNET_free (listener);
}
static void
collect_generation_garbage (struct Set *set)
{
- struct Operation *op;
struct GarbageContext gc;
gc.min_op_generation = UINT_MAX;
gc.max_op_generation = 0;
- for (op = set->ops_head; NULL != op; op = op->next)
+ for (struct Operation *op = set->ops_head; NULL != op; op = op->next)
{
gc.min_op_generation = GNUNET_MIN (gc.min_op_generation,
op->generation_created);
}
+/**
+ * Is @a generation in the range of exclusions?
+ *
+ * @param generation generation to query
+ * @param excluded array of generations where the element is excluded
+ * @param excluded_size length of the @a excluded array
+ * @return #GNUNET_YES if @a generation is in any of the ranges
+ */
static int
is_excluded_generation (unsigned int generation,
struct GenerationRange *excluded,
unsigned int excluded_size)
{
- unsigned int i;
-
- for (i = 0; i < excluded_size; i++)
- {
- if ( (generation >= excluded[i].start) && (generation < excluded[i].end) )
+ for (unsigned int i = 0; i < excluded_size; i++)
+ if ( (generation >= excluded[i].start) &&
+ (generation < excluded[i].end) )
return GNUNET_YES;
- }
-
return GNUNET_NO;
}
+/**
+ * Is element @a ee part of the set during @a query_generation?
+ *
+ * @param ee element to test
+ * @param query_generation generation to query
+ * @param excluded array of generations where the element is excluded
+ * @param excluded_size length of the @a excluded array
+ * @return #GNUNET_YES if the element is in the set, #GNUNET_NO if not
+ */
static int
is_element_of_generation (struct ElementEntry *ee,
unsigned int query_generation,
{
struct MutationEvent *mut;
int is_present;
- unsigned int i;
GNUNET_assert (NULL != ee->mutations);
-
- if (GNUNET_YES == is_excluded_generation (query_generation, excluded, excluded_size))
+ if (GNUNET_YES ==
+ is_excluded_generation (query_generation,
+ excluded,
+ excluded_size))
{
GNUNET_break (0);
return GNUNET_NO;
/* Could be made faster with binary search, but lists
are small, so why bother. */
- for (i = 0; i < ee->mutations_size; i++)
+ for (unsigned int i = 0; i < ee->mutations_size; i++)
{
mut = &ee->mutations[i];
continue;
}
- if (GNUNET_YES == is_excluded_generation (mut->generation, excluded, excluded_size))
+ if (GNUNET_YES ==
+ is_excluded_generation (mut->generation,
+ excluded,
+ excluded_size))
{
/* The generation is excluded (because it belongs to another
fork via a lazy copy) and thus mutations aren't considered
}
/* This would be an inconsistency in how we manage mutations. */
- if ( (GNUNET_YES == is_present) && (GNUNET_YES == mut->added) )
+ if ( (GNUNET_YES == is_present) &&
+ (GNUNET_YES == mut->added) )
GNUNET_assert (0);
-
/* Likewise. */
- if ( (GNUNET_NO == is_present) && (GNUNET_NO == mut->added) )
+ if ( (GNUNET_NO == is_present) &&
+ (GNUNET_NO == mut->added) )
GNUNET_assert (0);
is_present = mut->added;
}
-int
-_GSS_is_element_of_set (struct ElementEntry *ee,
- struct Set *set)
-{
- return is_element_of_generation (ee,
- set->current_generation,
- set->excluded_generations,
- set->excluded_generations_size);
-}
-
-
-static int
-is_element_of_iteration (struct ElementEntry *ee,
- struct Set *set)
-{
- return is_element_of_generation (ee,
- set->iter_generation,
- set->excluded_generations,
- set->excluded_generations_size);
-}
-
-
+/**
+ * Is element @a ee part of the set used by @a op?
+ *
+ * @param ee element to test
+ * @param op operation the defines the set and its generation
+ * @return #GNUNET_YES if the element is in the set, #GNUNET_NO if not
+ */
int
_GSS_is_element_of_operation (struct ElementEntry *ee,
struct Operation *op)
{
return is_element_of_generation (ee,
op->generation_created,
- op->spec->set->excluded_generations,
- op->spec->set->excluded_generations_size);
+ op->set->excluded_generations,
+ op->set->excluded_generations_size);
}
/**
- * Destroy the given operation. Call the implementation-specific
- * cancel function of the operation. Disconnects from the remote
- * peer. Does not disconnect the client, as there may be multiple
- * operations per set.
+ * Destroy the given operation. Used for any operation where both
+ * peers were known and that thus actually had a vt and channel. Must
+ * not be used for operations where 'listener' is still set and we do
+ * not know the other peer.
+ *
+ * Call the implementation-specific cancel function of the operation.
+ * Disconnects from the remote peer. Does not disconnect the client,
+ * as there may be multiple operations per set.
*
* @param op operation to destroy
* @param gc #GNUNET_YES to perform garbage collection on the set
_GSS_operation_destroy (struct Operation *op,
int gc)
{
- struct Set *set;
+ struct Set *set = op->set;
struct GNUNET_CADET_Channel *channel;
- if (NULL == op->vt)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying operation %p\n",
+ op);
+ GNUNET_assert (NULL == op->listener);
+ if (NULL != op->state)
{
- /* already in #_GSS_operation_destroy() */
- return;
+ set->vt->cancel (op);
+ op->state = NULL;
}
- GNUNET_assert (GNUNET_NO == op->is_incoming);
- GNUNET_assert (NULL != op->spec);
- set = op->spec->set;
- GNUNET_CONTAINER_DLL_remove (set->ops_head,
- set->ops_tail,
- op);
- op->vt->cancel (op);
- op->vt = NULL;
- if (NULL != op->spec)
+ if (NULL != set)
{
- if (NULL != op->spec->context_msg)
- {
- GNUNET_free (op->spec->context_msg);
- op->spec->context_msg = NULL;
- }
- GNUNET_free (op->spec);
- op->spec = NULL;
+ GNUNET_CONTAINER_DLL_remove (set->ops_head,
+ set->ops_tail,
+ op);
+ op->set = NULL;
+ }
+ if (NULL != op->context_msg)
+ {
+ GNUNET_free (op->context_msg);
+ op->context_msg = NULL;
}
if (NULL != (channel = op->channel))
{
+ /* This will free op; called conditionally as this helper function
+ is also called from within the channel disconnect handler. */
op->channel = NULL;
GNUNET_CADET_channel_destroy (channel);
}
-
- if (GNUNET_YES == gc)
+ if ( (NULL != set) &&
+ (GNUNET_YES == gc) )
collect_generation_garbage (set);
/* We rely on the channel end handler to free 'op'. When 'op->channel' was NULL,
* there was a channel end handler that will free 'op' on the call stack. */
}
+/**
+ * Callback called when a client connects to the service.
+ *
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a `struct ClientState`
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
+{
+ struct ClientState *cs;
+
+ num_clients++;
+ cs = GNUNET_new (struct ClientState);
+ cs->client = c;
+ cs->mq = mq;
+ return cs;
+}
+
+
/**
* Iterator over hash map entries to free element entries.
*
struct ElementEntry *ee = value;
GNUNET_free_non_null (ee->mutations);
-
GNUNET_free (ee);
return GNUNET_YES;
}
/**
- * Destroy a set, and free all resources and operations associated with it.
+ * Clean up after a client has disconnected
*
- * @param set the set to destroy
+ * @param cls closure, unused
+ * @param client the client to clean up after
+ * @param internal_cls the `struct ClientState`
*/
static void
-set_destroy (struct Set *set)
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *internal_cls)
{
- if (NULL != set->client)
- {
- /* If the client is not dead yet, destroy it. The client's destroy
- * callback will call `set_destroy()` again in this case. We do
- * this so that the channel end handler still has a valid set handle
- * to destroy. */
- struct GNUNET_SERVICE_Client *client = set->client;
-
- set->client = NULL;
- GNUNET_SERVICE_client_drop (client);
- return;
- }
- GNUNET_assert (NULL != set->state);
- while (NULL != set->ops_head)
- _GSS_operation_destroy (set->ops_head, GNUNET_NO);
- set->vt->destroy_set (set->state);
- set->state = NULL;
- if (NULL != set->iter)
- {
- GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
- set->iter = NULL;
- set->iteration_id++;
- }
+ struct ClientState *cs = internal_cls;
+ struct Operation *op;
+ struct Listener *listener;
+ struct Set *set;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client disconnected, cleaning up\n");
+ if (NULL != (set = cs->set))
{
- struct SetContent *content;
+ struct SetContent *content = set->content;
struct PendingMutation *pm;
struct PendingMutation *pm_current;
+ struct LazyCopyRequest *lcr;
- content = set->content;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying client's set\n");
+ /* Destroy pending set operations */
+ while (NULL != set->ops_head)
+ _GSS_operation_destroy (set->ops_head,
+ GNUNET_NO);
+
+ /* Destroy operation-specific state */
+ GNUNET_assert (NULL != set->state);
+ set->vt->destroy_set (set->state);
+ set->state = NULL;
+
+ /* Clean up ongoing iterations */
+ if (NULL != set->iter)
+ {
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
+ set->iter = NULL;
+ set->iteration_id++;
+ }
- // discard any pending mutations that reference this set
+ /* discard any pending mutations that reference this set */
pm = content->pending_mutations_head;
while (NULL != pm)
{
pm_current = pm;
pm = pm->next;
- if (pm_current-> set == set)
+ if (pm_current->set == set)
+ {
GNUNET_CONTAINER_DLL_remove (content->pending_mutations_head,
content->pending_mutations_tail,
pm_current);
-
+ GNUNET_free (pm_current);
+ }
}
+ /* free set content (or at least decrement RC) */
set->content = NULL;
GNUNET_assert (0 != content->refcount);
- content->refcount -= 1;
+ content->refcount--;
if (0 == content->refcount)
{
GNUNET_assert (NULL != content->elements);
content->elements = NULL;
GNUNET_free (content);
}
- }
- GNUNET_free_non_null (set->excluded_generations);
- set->excluded_generations = NULL;
- GNUNET_CONTAINER_DLL_remove (sets_head,
- sets_tail,
- set);
+ GNUNET_free_non_null (set->excluded_generations);
+ set->excluded_generations = NULL;
- // remove set from pending copy requests
- {
- struct LazyCopyRequest *lcr;
+ /* remove set from pending copy requests */
lcr = lazy_copy_head;
while (NULL != lcr)
{
- struct LazyCopyRequest *lcr_current;
- lcr_current = lcr;
+ struct LazyCopyRequest *lcr_current = lcr;
+
lcr = lcr->next;
if (lcr_current->source_set == set)
+ {
GNUNET_CONTAINER_DLL_remove (lazy_copy_head,
lazy_copy_tail,
lcr_current);
+ GNUNET_free (lcr_current);
+ }
}
+ GNUNET_free (set);
}
- GNUNET_free (set);
-}
-
-
-/**
- * Callback called when a client connects to the service.
- *
- * @param cls closure for the service
- * @param c the new client that connected to the service
- * @param mq the message queue used to send messages to the client
- * @return @a c
- */
-static void *
-client_connect_cb (void *cls,
- struct GNUNET_SERVICE_Client *c,
- struct GNUNET_MQ_Handle *mq)
-{
- return c;
-}
-
-
-/**
- * Destroy an incoming request from a remote peer
- *
- * @param incoming remote request to destroy
- */
-static void
-incoming_destroy (struct Operation *incoming)
-{
- struct GNUNET_CADET_Channel *channel;
-
- GNUNET_assert (GNUNET_YES == incoming->is_incoming);
- GNUNET_CONTAINER_DLL_remove (incoming_head,
- incoming_tail,
- incoming);
- if (NULL != incoming->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (incoming->timeout_task);
- incoming->timeout_task = NULL;
- }
- /* make sure that the tunnel end handler will not destroy us again */
- incoming->vt = NULL;
- if (NULL != incoming->spec)
- {
- GNUNET_free (incoming->spec);
- incoming->spec = NULL;
- }
- if (NULL != (channel = incoming->channel))
- {
- incoming->channel = NULL;
- GNUNET_CADET_channel_destroy (channel);
- }
-}
-
-
-/**
- * Clean up after a client has disconnected
- *
- * @param cls closure, unused
- * @param client the client to clean up after
- * @param internal_cls our client-specific internal data structure
- */
-static void
-client_disconnect_cb (void *cls,
- struct GNUNET_SERVICE_Client *client,
- void *internal_cls)
-{
- struct Set *set;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client disconnected, cleaning up\n");
- set = set_get (client);
- if (NULL != set)
+ if (NULL != (listener = cs->listener))
{
- set->client = NULL;
- set_destroy (set);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client's set destroyed\n");
+ "Destroying client's listener\n");
+ GNUNET_CADET_close_port (listener->open_port);
+ listener->open_port = NULL;
+ while (NULL != (op = listener->op_head))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Destroying incoming operation `%u' from peer `%s'\n",
+ (unsigned int) op->client_request_id,
+ GNUNET_i2s (&op->peer));
+ incoming_destroy (op);
+ }
+ GNUNET_CONTAINER_DLL_remove (listener_head,
+ listener_tail,
+ listener);
+ GNUNET_free (listener);
}
- struct Listener *listener = listener_get (client);
- if (NULL != listener)
+ GNUNET_free (cs);
+ num_clients--;
+ if ( (GNUNET_YES == in_shutdown) &&
+ (0 == num_clients) )
{
- /* destroy all incoming operations whose client just
- * got destroyed */
- //struct Operation *op = incoming_head;
- /*
- while (NULL != op)
+ if (NULL != cadet)
{
- struct Operation *curr = op;
- op = op->next;
- if ( (GNUNET_YES == curr->is_incoming) &&
- (curr->listener == listener) )
- incoming_destroy (curr);
+ GNUNET_CADET_disconnect (cadet);
+ cadet = NULL;
}
- */
- listener->client = NULL;
- listener_destroy (listener);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client's listener destroyed\n");
}
}
-/**
- * Suggest the given request to the listener. The listening client can
- * then accept or reject the remote request.
- *
- * @param incoming the incoming peer with the request to suggest
- * @param listener the listener to suggest the request to
- */
-static void
-incoming_suggest (struct Operation *incoming,
- struct Listener *listener)
-{
- struct GNUNET_MQ_Envelope *mqm;
- struct GNUNET_SET_RequestMessage *cmsg;
-
- GNUNET_assert (GNUNET_YES == incoming->is_incoming);
- GNUNET_assert (NULL != incoming->spec);
- GNUNET_assert (0 == incoming->suggest_id);
- incoming->suggest_id = suggest_id++;
- if (0 == suggest_id)
- suggest_id++;
- GNUNET_assert (NULL != incoming->timeout_task);
- GNUNET_SCHEDULER_cancel (incoming->timeout_task);
- incoming->timeout_task = NULL;
- mqm = GNUNET_MQ_msg_nested_mh (cmsg,
- GNUNET_MESSAGE_TYPE_SET_REQUEST,
- incoming->spec->context_msg);
- GNUNET_assert (NULL != mqm);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Suggesting incoming request with accept id %u to listener\n",
- incoming->suggest_id);
- cmsg->accept_id = htonl (incoming->suggest_id);
- cmsg->peer_id = incoming->spec->peer;
- GNUNET_MQ_send (listener->client_mq,
- mqm);
-}
-
-
/**
* Check a request for a set operation from another peer.
*
const struct OperationRequestMessage *msg)
{
struct Operation *op = cls;
+ struct Listener *listener = op->listener;
const struct GNUNET_MessageHeader *nested_context;
/* double operation request */
- if (NULL != op->spec)
+ if (0 != op->suggest_id)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ /* This should be equivalent to the previous condition, but can't hurt to check twice */
+ if (NULL == op->listener)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (listener->operation != (enum GNUNET_SET_OperationType) ntohl (msg->operation))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
{
struct Operation *op = cls;
struct Listener *listener = op->listener;
- struct OperationSpecification *spec;
const struct GNUNET_MessageHeader *nested_context;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_SET_RequestMessage *cmsg;
- GNUNET_assert (GNUNET_YES == op->is_incoming);
- spec = GNUNET_new (struct OperationSpecification);
nested_context = GNUNET_MQ_extract_nested_mh (msg);
/* Make a copy of the nested_context (application-specific context
information that is opaque to set) so we can pass it to the
listener later on */
if (NULL != nested_context)
- spec->context_msg = GNUNET_copy_message (nested_context);
- spec->operation = ntohl (msg->operation);
- spec->app_id = listener->app_id;
- spec->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
- UINT32_MAX);
- spec->peer = op->peer;
- spec->remote_element_count = ntohl (msg->element_count);
- op->spec = spec;
- listener = op->listener;
+ op->context_msg = GNUNET_copy_message (nested_context);
+ op->remote_element_count = ntohl (msg->element_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received P2P operation request (op %u, port %s) for active listener\n",
(uint32_t) ntohl (msg->operation),
- GNUNET_h2s (&listener->app_id));
- incoming_suggest (op,
- listener);
+ GNUNET_h2s (&op->listener->app_id));
+ GNUNET_assert (0 == op->suggest_id);
+ if (0 == suggest_id)
+ suggest_id++;
+ op->suggest_id = suggest_id++;
+ GNUNET_assert (NULL != op->timeout_task);
+ GNUNET_SCHEDULER_cancel (op->timeout_task);
+ op->timeout_task = NULL;
+ env = GNUNET_MQ_msg_nested_mh (cmsg,
+ GNUNET_MESSAGE_TYPE_SET_REQUEST,
+ op->context_msg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Suggesting incoming request with accept id %u to listener %p of client %p\n",
+ op->suggest_id,
+ listener,
+ listener->cs);
+ cmsg->accept_id = htonl (op->suggest_id);
+ cmsg->peer_id = op->peer;
+ GNUNET_MQ_send (listener->cs->mq,
+ env);
+ /* NOTE: GNUNET_CADET_receive_done() will be called in
+ #handle_client_accept() */
}
+/**
+ * Add an element to @a set as specified by @a msg
+ *
+ * @param set set to manipulate
+ * @param msg message specifying the change
+ */
static void
execute_add (struct Set *set,
- const struct GNUNET_MessageHeader *m)
+ const struct GNUNET_SET_ElementMessage *msg)
{
- const struct GNUNET_SET_ElementMessage *msg;
struct GNUNET_SET_Element el;
struct ElementEntry *ee;
struct GNUNET_HashCode hash;
- GNUNET_assert (GNUNET_MESSAGE_TYPE_SET_ADD == ntohs (m->type));
-
- msg = (const struct GNUNET_SET_ElementMessage *) m;
- el.size = ntohs (m->size) - sizeof *msg;
+ GNUNET_assert (GNUNET_MESSAGE_TYPE_SET_ADD == ntohs (msg->header.type));
+ el.size = ntohs (msg->header.size) - sizeof (*msg);
el.data = &msg[1];
el.element_type = ntohs (msg->element_type);
- GNUNET_SET_element_hash (&el, &hash);
-
+ GNUNET_SET_element_hash (&el,
+ &hash);
ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements,
&hash);
-
if (NULL == ee)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client inserts element %s of size %u\n",
GNUNET_h2s (&hash),
el.size);
- ee = GNUNET_malloc (el.size + sizeof *ee);
+ ee = GNUNET_malloc (el.size + sizeof (*ee));
ee->element.size = el.size;
GNUNET_memcpy (&ee[1],
el.data,
ee,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
- else if (GNUNET_YES == _GSS_is_element_of_set (ee, set))
+ else if (GNUNET_YES ==
+ is_element_of_generation (ee,
+ set->current_generation,
+ set->excluded_generations,
+ set->excluded_generations_size))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client inserted element %s of size %u twice (ignored)\n",
ee->mutations_size,
mut);
}
-
- set->vt->add (set->state, ee);
+ set->vt->add (set->state,
+ ee);
}
+/**
+ * Remove an element from @a set as specified by @a msg
+ *
+ * @param set set to manipulate
+ * @param msg message specifying the change
+ */
static void
execute_remove (struct Set *set,
- const struct GNUNET_MessageHeader *m)
+ const struct GNUNET_SET_ElementMessage *msg)
{
- const struct GNUNET_SET_ElementMessage *msg;
struct GNUNET_SET_Element el;
struct ElementEntry *ee;
struct GNUNET_HashCode hash;
- GNUNET_assert (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type));
-
- msg = (const struct GNUNET_SET_ElementMessage *) m;
- el.size = ntohs (m->size) - sizeof *msg;
+ GNUNET_assert (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (msg->header.type));
+ el.size = ntohs (msg->header.size) - sizeof (*msg);
el.data = &msg[1];
el.element_type = ntohs (msg->element_type);
GNUNET_SET_element_hash (&el, &hash);
el.size);
return;
}
- if (GNUNET_NO == _GSS_is_element_of_set (ee, set))
+ if (GNUNET_NO ==
+ is_element_of_generation (ee,
+ set->current_generation,
+ set->excluded_generations,
+ set->excluded_generations_size))
{
/* Client tried to remove element twice */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
ee->mutations_size,
mut);
}
- set->vt->remove (set->state, ee);
+ set->vt->remove (set->state,
+ ee);
}
-
+/**
+ * Perform a mutation on a set as specified by the @a msg
+ *
+ * @param set the set to mutate
+ * @param msg specification of what to change
+ */
static void
execute_mutation (struct Set *set,
- const struct GNUNET_MessageHeader *m)
+ const struct GNUNET_SET_ElementMessage *msg)
{
- switch (ntohs (m->type))
+ switch (ntohs (msg->header.type))
{
case GNUNET_MESSAGE_TYPE_SET_ADD:
- execute_add (set, m);
+ execute_add (set, msg);
break;
case GNUNET_MESSAGE_TYPE_SET_REMOVE:
- execute_remove (set, m);
+ execute_remove (set, msg);
break;
default:
GNUNET_break (0);
}
+/**
+ * Execute mutations that were delayed on a set because of
+ * pending operations.
+ *
+ * @param set the set to execute mutations on
+ */
+static void
+execute_delayed_mutations (struct Set *set)
+{
+ struct PendingMutation *pm;
+
+ if (0 != set->content->iterator_count)
+ return; /* still cannot do this */
+ while (NULL != (pm = set->content->pending_mutations_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (set->content->pending_mutations_head,
+ set->content->pending_mutations_tail,
+ pm);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing pending mutation on %p.\n",
+ pm->set);
+ execute_mutation (pm->set,
+ pm->msg);
+ GNUNET_free (pm->msg);
+ GNUNET_free (pm);
+ }
+}
+
/**
* Send the next element of a set to the set's client. The next element is given by
struct GNUNET_SET_IterResponseMessage *msg;
GNUNET_assert (NULL != set->iter);
-
-again:
-
- ret = GNUNET_CONTAINER_multihashmap_iterator_next (set->iter,
- NULL,
- (const void **) &ee);
- if (GNUNET_NO == ret)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Iteration on %p done.\n",
- (void *) set);
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_ITER_DONE);
- GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
- set->iter = NULL;
- set->iteration_id++;
-
- GNUNET_assert (set->content->iterator_count > 0);
- set->content->iterator_count -= 1;
-
- if (0 == set->content->iterator_count)
+ do {
+ ret = GNUNET_CONTAINER_multihashmap_iterator_next (set->iter,
+ NULL,
+ (const void **) &ee);
+ if (GNUNET_NO == ret)
{
- while (NULL != set->content->pending_mutations_head)
- {
- struct PendingMutation *pm;
-
- pm = set->content->pending_mutations_head;
- GNUNET_CONTAINER_DLL_remove (set->content->pending_mutations_head,
- set->content->pending_mutations_tail,
- pm);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Executing pending mutation on %p.\n",
- (void *) pm->set);
- execute_mutation (pm->set, pm->mutation_message);
- GNUNET_free (pm->mutation_message);
- GNUNET_free (pm);
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Iteration on %p done.\n",
+ set);
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_ITER_DONE);
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
+ set->iter = NULL;
+ set->iteration_id++;
+ GNUNET_assert (set->content->iterator_count > 0);
+ set->content->iterator_count--;
+ execute_delayed_mutations (set);
+ GNUNET_MQ_send (set->cs->mq,
+ ev);
+ return;
}
-
- }
- else
- {
GNUNET_assert (NULL != ee);
-
- if (GNUNET_NO == is_element_of_iteration (ee, set))
- goto again;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending iteration element on %p.\n",
- (void *) set);
- ev = GNUNET_MQ_msg_extra (msg,
- ee->element.size,
- GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT);
- GNUNET_memcpy (&msg[1],
- ee->element.data,
- ee->element.size);
- msg->element_type = htons (ee->element.element_type);
- msg->iteration_id = htons (set->iteration_id);
- }
- GNUNET_MQ_send (set->client_mq, ev);
+ } while (GNUNET_NO ==
+ is_element_of_generation (ee,
+ set->iter_generation,
+ set->excluded_generations,
+ set->excluded_generations_size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending iteration element on %p.\n",
+ set);
+ ev = GNUNET_MQ_msg_extra (msg,
+ ee->element.size,
+ GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT);
+ GNUNET_memcpy (&msg[1],
+ ee->element.data,
+ ee->element.size);
+ msg->element_type = htons (ee->element.element_type);
+ msg->iteration_id = htons (set->iteration_id);
+ GNUNET_MQ_send (set->cs->mq,
+ ev);
}
handle_client_iterate (void *cls,
const struct GNUNET_MessageHeader *m)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* attempt to iterate over a non existing set */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
if (NULL != set->iter)
{
/* Only one concurrent iterate-action allowed per set */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
(void *) set,
set->current_generation,
GNUNET_CONTAINER_multihashmap_size (set->content->elements));
- GNUNET_SERVICE_client_continue (client);
- set->content->iterator_count += 1;
+ GNUNET_SERVICE_client_continue (cs->client);
+ set->content->iterator_count++;
set->iter = GNUNET_CONTAINER_multihashmap_iterator_create (set->content->elements);
set->iter_generation = set->current_generation;
send_client_element (set);
handle_client_create_set (void *cls,
const struct GNUNET_SET_CreateMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client created new set (operation %u)\n",
(uint32_t) ntohl (msg->operation));
- if (NULL != set_get (client))
+ if (NULL != cs->set)
{
/* There can only be one set per client */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
set = GNUNET_new (struct Set);
default:
GNUNET_free (set);
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
set->operation = (enum GNUNET_SET_OperationType) ntohl (msg->operation);
{
/* initialization failed (i.e. out of memory) */
GNUNET_free (set);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
set->content = GNUNET_new (struct SetContent);
set->content->refcount = 1;
- set->content->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
- set->client = client;
- set->client_mq = GNUNET_SERVICE_client_get_mq (client);
- GNUNET_CONTAINER_DLL_insert (sets_head,
- sets_tail,
- set);
- GNUNET_SERVICE_client_continue (client);
+ set->content->elements = GNUNET_CONTAINER_multihashmap_create (1,
+ GNUNET_YES);
+ set->cs = cs;
+ cs->set = set;
+ GNUNET_SERVICE_client_continue (cs->client);
}
static void
incoming_timeout_cb (void *cls)
{
- struct Operation *incoming = cls;
+ struct Operation *op = cls;
- incoming->timeout_task = NULL;
- GNUNET_assert (GNUNET_YES == incoming->is_incoming);
+ op->timeout_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Remote peer's incoming request timed out\n");
- incoming_destroy (incoming);
-}
-
-
-/**
- * Terminates an incoming operation in case we have not yet received an
- * operation request. Called by the channel destruction handler.
- *
- * @param op the channel context
- */
-static void
-handle_incoming_disconnect (struct Operation *op)
-{
- GNUNET_assert (GNUNET_YES == op->is_incoming);
- /* channel is already dead, incoming_destroy must not
- * destroy it ... */
- op->channel = NULL;
incoming_destroy (op);
- op->vt = NULL;
}
struct GNUNET_CADET_Channel *channel,
const struct GNUNET_PeerIdentity *source)
{
- static const struct SetVT incoming_vt = {
- .peer_disconnect = &handle_incoming_disconnect
- };
struct Listener *listener = cls;
- struct Operation *incoming;
+ struct Operation *op;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"New incoming channel\n");
- incoming = GNUNET_new (struct Operation);
- incoming->listener = listener;
- incoming->is_incoming = GNUNET_YES;
- incoming->peer = *source;
- incoming->channel = channel;
- incoming->mq = GNUNET_CADET_get_mq (incoming->channel);
- incoming->vt = &incoming_vt;
- incoming->timeout_task
+ op = GNUNET_new (struct Operation);
+ op->listener = listener;
+ op->peer = *source;
+ op->channel = channel;
+ op->mq = GNUNET_CADET_get_mq (op->channel);
+ op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
+ op->timeout_task
= GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT,
&incoming_timeout_cb,
- incoming);
- GNUNET_CONTAINER_DLL_insert_tail (incoming_head,
- incoming_tail,
- incoming);
- // incoming_suggest (incoming,
- // listener);
- return incoming;
+ op);
+ GNUNET_CONTAINER_DLL_insert (listener->op_head,
+ listener->op_tail,
+ op);
+ return op;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"channel_end_cb called\n");
op->channel = NULL;
- op->keep++;
- /* the vt can be null if a client already requested canceling op. */
- if (NULL != op->vt)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "calling peer disconnect due to channel end\n");
- op->vt->peer_disconnect (op);
- }
- op->keep--;
- if (0 == op->keep)
- {
- /* cadet will never call us with the context again! */
- GNUNET_free (op);
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "channel_end_cb finished\n");
+ if (NULL != op->listener)
+ incoming_destroy (op);
+ else if (NULL != op->set)
+ op->set->vt->channel_death (op);
+ else
+ _GSS_operation_destroy (op,
+ GNUNET_YES);
+ GNUNET_free (op);
}
handle_client_listen (void *cls,
const struct GNUNET_SET_ListenMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct GNUNET_MQ_MessageHandler cadet_handlers[] = {
GNUNET_MQ_hd_var_size (incoming_msg,
GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE,
struct GNUNET_MessageHeader,
NULL),
+ GNUNET_MQ_hd_fixed_size (union_p2p_over,
+ GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER,
+ struct GNUNET_MessageHeader,
+ NULL),
GNUNET_MQ_hd_fixed_size (union_p2p_full_done,
GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE,
struct GNUNET_MessageHeader,
};
struct Listener *listener;
- if (NULL != listener_get (client))
+ if (NULL != cs->listener)
{
/* max. one active listener per client! */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
listener = GNUNET_new (struct Listener);
- listener->client = client;
- listener->client_mq = GNUNET_SERVICE_client_get_mq (client);
+ listener->cs = cs;
+ cs->listener = listener;
listener->app_id = msg->app_id;
- listener->operation = ntohl (msg->operation);
- GNUNET_CONTAINER_DLL_insert_tail (listeners_head,
- listeners_tail,
- listener);
+ listener->operation = (enum GNUNET_SET_OperationType) ntohl (msg->operation);
+ GNUNET_CONTAINER_DLL_insert (listener_head,
+ listener_tail,
+ listener);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"New listener created (op %u, port %s)\n",
listener->operation,
GNUNET_h2s (&listener->app_id));
- listener->open_port = GNUNET_CADET_open_porT (cadet,
- &msg->app_id,
- &channel_new_cb,
- listener,
- &channel_window_cb,
- &channel_end_cb,
- cadet_handlers);
- /* check for existing incoming requests the listener might be interested in */
- for (struct Operation *op = incoming_head; NULL != op; op = op->next)
- {
- if (NULL == op->spec)
- continue; /* no details available yet */
- if (0 != op->suggest_id)
- continue; /* this one has been already suggested to a listener */
- if (listener->operation != op->spec->operation)
- continue; /* incompatible operation */
- if (0 != GNUNET_CRYPTO_hash_cmp (&listener->app_id,
- &op->spec->app_id))
- continue; /* incompatible appliation */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found matching existing request\n");
- incoming_suggest (op,
- listener);
- }
- GNUNET_SERVICE_client_continue (client);
+ listener->open_port
+ = GNUNET_CADET_open_port (cadet,
+ &msg->app_id,
+ &channel_new_cb,
+ listener,
+ &channel_window_cb,
+ &channel_end_cb,
+ cadet_handlers);
+ GNUNET_SERVICE_client_continue (cs->client);
}
handle_client_reject (void *cls,
const struct GNUNET_SET_RejectMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
- struct Operation *incoming;
+ struct ClientState *cs = cls;
+ struct Operation *op;
- incoming = get_incoming (ntohl (msg->accept_reject_id));
- if (NULL == incoming)
+ op = get_incoming (ntohl (msg->accept_reject_id));
+ if (NULL == op)
{
/* no matching incoming operation for this reject;
could be that the other peer already disconnected... */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Client rejected unknown operation %u\n",
(unsigned int) ntohl (msg->accept_reject_id));
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_SERVICE_client_continue (cs->client);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer request (op %u, app %s) rejected by client\n",
- incoming->spec->operation,
- GNUNET_h2s (&incoming->spec->app_id));
- GNUNET_CADET_channel_destroy (incoming->channel);
- GNUNET_SERVICE_client_continue (client);
+ op->listener->operation,
+ GNUNET_h2s (&cs->listener->app_id));
+ GNUNET_CADET_channel_destroy (op->channel);
+ GNUNET_SERVICE_client_continue (cs->client);
}
* Called when a client wants to add or remove an element to a set it inhabits.
*
* @param cls client that sent the message
- * @param m message sent by the client
+ * @param msg message sent by the client
*/
static int
check_client_mutation (void *cls,
- const struct GNUNET_MessageHeader *m)
+ const struct GNUNET_SET_ElementMessage *msg)
{
- /* FIXME: any check we might want to do here? */
+ /* NOTE: Technically, we should probably check with the
+ block library whether the element we are given is well-formed */
return GNUNET_OK;
}
* Called when a client wants to add or remove an element to a set it inhabits.
*
* @param cls client that sent the message
- * @param m message sent by the client
+ * @param msg message sent by the client
*/
static void
handle_client_mutation (void *cls,
- const struct GNUNET_MessageHeader *m)
+ const struct GNUNET_SET_ElementMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* client without a set requested an operation */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_SERVICE_client_continue (cs->client);
if (0 != set->content->iterator_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling mutation on set\n");
pm = GNUNET_new (struct PendingMutation);
- pm->mutation_message = GNUNET_copy_message (m);
+ pm->msg = (struct GNUNET_SET_ElementMessage *) GNUNET_copy_message (&msg->header);
pm->set = set;
GNUNET_CONTAINER_DLL_insert_tail (set->content->pending_mutations_head,
set->content->pending_mutations_tail,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Executing mutation on set\n");
execute_mutation (set,
- m);
+ msg);
}
handle_client_evaluate (void *cls,
const struct GNUNET_SET_EvaluateMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Operation *op = GNUNET_new (struct Operation);
const struct GNUNET_MQ_MessageHandler cadet_handlers[] = {
GNUNET_MQ_hd_var_size (incoming_msg,
GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE,
struct GNUNET_MessageHeader,
op),
+ GNUNET_MQ_hd_fixed_size (union_p2p_over,
+ GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER,
+ struct GNUNET_MessageHeader,
+ op),
GNUNET_MQ_hd_fixed_size (union_p2p_full_done,
GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE,
struct GNUNET_MessageHeader,
GNUNET_MQ_handler_end ()
};
struct Set *set;
- struct OperationSpecification *spec;
const struct GNUNET_MessageHeader *context;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
GNUNET_break (0);
GNUNET_free (op);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
- spec = GNUNET_new (struct OperationSpecification);
- spec->operation = set->operation;
- spec->app_id = msg->app_id;
- spec->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
- UINT32_MAX);
- spec->peer = msg->target_peer;
- spec->set = set;
- spec->result_mode = ntohl (msg->result_mode);
- spec->client_request_id = ntohl (msg->request_id);
- spec->byzantine = msg->byzantine;
- spec->byzantine_lower_bound = msg->byzantine_lower_bound;
- spec->force_full = msg->force_full;
- spec->force_delta = msg->force_delta;
+ op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
+ op->peer = msg->target_peer;
+ op->result_mode = ntohl (msg->result_mode);
+ op->client_request_id = ntohl (msg->request_id);
+ op->byzantine = msg->byzantine;
+ op->byzantine_lower_bound = msg->byzantine_lower_bound;
+ op->force_full = msg->force_full;
+ op->force_delta = msg->force_delta;
context = GNUNET_MQ_extract_nested_mh (msg);
- op->spec = spec;
- // Advance generation values, so that
- // mutations won't interfer with the running operation.
+ /* Advance generation values, so that
+ mutations won't interfer with the running operation. */
+ op->set = set;
op->generation_created = set->current_generation;
advance_generation (set);
- op->operation = set->operation;
- op->vt = set->vt;
GNUNET_CONTAINER_DLL_insert (set->ops_head,
set->ops_tail,
op);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating new CADET channel to port %s\n",
- GNUNET_h2s (&msg->app_id));
- op->channel = GNUNET_CADET_channel_creatE (cadet,
+ "Creating new CADET channel to port %s for set operation type %u\n",
+ GNUNET_h2s (&msg->app_id),
+ set->operation);
+ op->channel = GNUNET_CADET_channel_create (cadet,
op,
&msg->target_peer,
&msg->app_id,
&channel_end_cb,
cadet_handlers);
op->mq = GNUNET_CADET_get_mq (op->channel);
- set->vt->evaluate (op,
- context);
- GNUNET_SERVICE_client_continue (client);
+ op->state = set->vt->evaluate (op,
+ context);
+ if (NULL == op->state)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (cs->client);
+ return;
+ }
+ GNUNET_SERVICE_client_continue (cs->client);
}
handle_client_iter_ack (void *cls,
const struct GNUNET_SET_IterAckMessage *ack)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* client without a set acknowledged receiving a value */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
if (NULL == set->iter)
/* client sent an ack, but we were not expecting one (as
set iteration has finished) */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_SERVICE_client_continue (cs->client);
if (ntohl (ack->send_more))
{
send_client_element (set);
handle_client_copy_lazy_prepare (void *cls,
const struct GNUNET_MessageHeader *mh)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
struct LazyCopyRequest *cr;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_CopyLazyResponseMessage *resp_msg;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* client without a set requested an operation */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client requested creation of lazy copy\n");
cr = GNUNET_new (struct LazyCopyRequest);
-
- cr->cookie = lazy_copy_cookie;
- lazy_copy_cookie += 1;
+ cr->cookie = ++lazy_copy_cookie;
cr->source_set = set;
-
GNUNET_CONTAINER_DLL_insert (lazy_copy_head,
lazy_copy_tail,
cr);
-
-
ev = GNUNET_MQ_msg (resp_msg,
GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_RESPONSE);
resp_msg->cookie = cr->cookie;
- GNUNET_MQ_send (set->client_mq, ev);
-
-
- GNUNET_SERVICE_client_continue (client);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client requested lazy copy\n");
+ GNUNET_MQ_send (set->cs->mq,
+ ev);
+ GNUNET_SERVICE_client_continue (cs->client);
}
handle_client_copy_lazy_connect (void *cls,
const struct GNUNET_SET_CopyLazyConnectMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct LazyCopyRequest *cr;
struct Set *set;
int found;
- if (NULL != set_get (client))
+ if (NULL != cs->set)
{
/* There can only be one set per client */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
-
found = GNUNET_NO;
-
for (cr = lazy_copy_head; NULL != cr; cr = cr->next)
{
if (cr->cookie == msg->cookie)
break;
}
}
-
if (GNUNET_NO == found)
{
/* client asked for copy with cookie we don't know */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
-
GNUNET_CONTAINER_DLL_remove (lazy_copy_head,
lazy_copy_tail,
cr);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p requested use of lazy copy\n",
+ cs);
set = GNUNET_new (struct Set);
-
switch (cr->source_set->operation)
{
case GNUNET_SET_OPERATION_INTERSECTION:
GNUNET_break (0);
GNUNET_free (set);
GNUNET_free (cr);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
set->operation = cr->source_set->operation;
- set->state = set->vt->copy_state (cr->source_set);
+ set->state = set->vt->copy_state (cr->source_set->state);
set->content = cr->source_set->content;
- set->content->refcount += 1;
+ set->content->refcount++;
set->current_generation = cr->source_set->current_generation;
set->excluded_generations_size = cr->source_set->excluded_generations_size;
- set->excluded_generations = GNUNET_memdup (cr->source_set->excluded_generations,
- set->excluded_generations_size * sizeof (struct GenerationRange));
+ set->excluded_generations
+ = GNUNET_memdup (cr->source_set->excluded_generations,
+ set->excluded_generations_size * sizeof (struct GenerationRange));
/* Advance the generation of the new set, so that mutations to the
of the cloned set and the source set are independent. */
advance_generation (set);
-
-
- set->client = client;
- set->client_mq = GNUNET_SERVICE_client_get_mq (client);
- GNUNET_CONTAINER_DLL_insert (sets_head,
- sets_tail,
- set);
-
+ set->cs = cs;
+ cs->set = set;
GNUNET_free (cr);
-
- GNUNET_SERVICE_client_continue (client);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client connected to lazy set\n");
+ GNUNET_SERVICE_client_continue (cs->client);
}
handle_client_cancel (void *cls,
const struct GNUNET_SET_CancelMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
struct Operation *op;
int found;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* client without a set requested an operation */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client requested cancel for op %u\n",
- (uint32_t) ntohl (msg->request_id));
found = GNUNET_NO;
for (op = set->ops_head; NULL != op; op = op->next)
{
- if (op->spec->client_request_id == ntohl (msg->request_id))
+ if (op->client_request_id == ntohl (msg->request_id))
{
found = GNUNET_YES;
break;
* yet and try to cancel the (just barely non-existent) operation.
* So this is not a hard error.
*/
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client canceled non-existent op\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Client canceled non-existent op %u\n",
+ (uint32_t) ntohl (msg->request_id));
}
else
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client requested cancel for op %u\n",
+ (uint32_t) ntohl (msg->request_id));
_GSS_operation_destroy (op,
GNUNET_YES);
}
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_SERVICE_client_continue (cs->client);
}
handle_client_accept (void *cls,
const struct GNUNET_SET_AcceptMessage *msg)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ struct ClientState *cs = cls;
struct Set *set;
struct Operation *op;
struct GNUNET_SET_ResultMessage *result_message;
struct GNUNET_MQ_Envelope *ev;
+ struct Listener *listener;
- set = set_get (client);
- if (NULL == set)
+ if (NULL == (set = cs->set))
{
/* client without a set requested to accept */
GNUNET_break (0);
- GNUNET_SERVICE_client_drop (client);
+ GNUNET_SERVICE_client_drop (cs->client);
return;
}
op = get_incoming (ntohl (msg->accept_reject_id));
{
/* It is not an error if the set op does not exist -- it may
* have been destroyed when the partner peer disconnected. */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client accepted request that is no longer active\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Client %p accepted request %u of listener %p that is no longer active\n",
+ cs,
+ ntohl (msg->accept_reject_id),
+ cs->listener);
ev = GNUNET_MQ_msg (result_message,
GNUNET_MESSAGE_TYPE_SET_RESULT);
result_message->request_id = msg->request_id;
- result_message->element_type = 0;
result_message->result_status = htons (GNUNET_SET_STATUS_FAILURE);
- GNUNET_MQ_send (set->client_mq, ev);
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_MQ_send (set->cs->mq,
+ ev);
+ GNUNET_SERVICE_client_continue (cs->client);
return;
}
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client accepting request %u\n",
(uint32_t) ntohl (msg->accept_reject_id));
- GNUNET_assert (GNUNET_YES == op->is_incoming);
- op->is_incoming = GNUNET_NO;
- GNUNET_CONTAINER_DLL_remove (incoming_head,
- incoming_tail,
+ listener = op->listener;
+ op->listener = NULL;
+ GNUNET_CONTAINER_DLL_remove (listener->op_head,
+ listener->op_tail,
op);
- op->spec->set = set;
+ op->set = set;
GNUNET_CONTAINER_DLL_insert (set->ops_head,
set->ops_tail,
op);
- op->spec->client_request_id = ntohl (msg->request_id);
- op->spec->result_mode = ntohl (msg->result_mode);
- op->spec->byzantine = msg->byzantine;
- op->spec->byzantine_lower_bound = msg->byzantine_lower_bound;
- op->spec->force_full = msg->force_full;
- op->spec->force_delta = msg->force_delta;
-
- // Advance generation values, so that
- // mutations won't interfer with the running operation.
+ op->client_request_id = ntohl (msg->request_id);
+ op->result_mode = ntohl (msg->result_mode);
+ op->byzantine = msg->byzantine;
+ op->byzantine_lower_bound = msg->byzantine_lower_bound;
+ op->force_full = msg->force_full;
+ op->force_delta = msg->force_delta;
+
+ /* Advance generation values, so that future mutations do not
+ interfer with the running operation. */
op->generation_created = set->current_generation;
advance_generation (set);
-
- op->vt = set->vt;
- op->operation = set->operation;
- op->vt->accept (op);
- GNUNET_SERVICE_client_continue (client);
+ GNUNET_assert (NULL == op->state);
+ op->state = set->vt->accept (op);
+ if (NULL == op->state)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (cs->client);
+ return;
+ }
+ /* Now allow CADET to continue, as we did not do this in
+ #handle_incoming_msg (as we wanted to first see if the
+ local client would accept the request). */
+ GNUNET_CADET_receive_done (op->channel);
+ GNUNET_SERVICE_client_continue (cs->client);
}
/**
* Called to clean up, after a shutdown has been requested.
*
- * @param cls closure
+ * @param cls closure, NULL
*/
static void
shutdown_task (void *cls)
{
- while (NULL != incoming_head)
- incoming_destroy (incoming_head);
- while (NULL != listeners_head)
- listener_destroy (listeners_head);
- while (NULL != sets_head)
- set_destroy (sets_head);
-
- /* it's important to destroy cadet at the end, as all channels
- * must be destroyed before the cadet handle! */
- if (NULL != cadet)
+ /* Delay actual shutdown to allow service to disconnect clients */
+ in_shutdown = GNUNET_YES;
+ if (0 == num_clients)
{
- GNUNET_CADET_disconnect (cadet);
- cadet = NULL;
+ if (NULL != cadet)
+ {
+ GNUNET_CADET_disconnect (cadet);
+ cadet = NULL;
+ }
}
- GNUNET_STATISTICS_destroy (_GSS_statistics, GNUNET_YES);
+ GNUNET_STATISTICS_destroy (_GSS_statistics,
+ GNUNET_YES);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"handled shutdown request\n");
}
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_SERVICE_Handle *service)
{
- configuration = cfg;
+ /* FIXME: need to modify SERVICE (!) API to allow
+ us to run a shutdown task *after* clients were
+ forcefully disconnected! */
GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
NULL);
- _GSS_statistics = GNUNET_STATISTICS_create ("set", cfg);
- cadet = GNUNET_CADET_connecT (cfg);
+ _GSS_statistics = GNUNET_STATISTICS_create ("set",
+ cfg);
+ cadet = GNUNET_CADET_connect (cfg);
if (NULL == cadet)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not connect to CADET service\n"));
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
NULL),
GNUNET_MQ_hd_var_size (client_mutation,
GNUNET_MESSAGE_TYPE_SET_ADD,
- struct GNUNET_MessageHeader,
+ struct GNUNET_SET_ElementMessage,
NULL),
GNUNET_MQ_hd_fixed_size (client_create_set,
GNUNET_MESSAGE_TYPE_SET_CREATE,
NULL),
GNUNET_MQ_hd_var_size (client_mutation,
GNUNET_MESSAGE_TYPE_SET_REMOVE,
- struct GNUNET_MessageHeader,
+ struct GNUNET_SET_ElementMessage,
NULL),
GNUNET_MQ_hd_fixed_size (client_cancel,
GNUNET_MESSAGE_TYPE_SET_CANCEL,