/*
This file is part of GNUnet
- (C) 2013 Christian Grothoff (and other contributing authors)
+ (C) 2013, 2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @file set/gnunet-service-set.c
* @brief two-peer set operations
* @author Florian Dold
+ * @author Christian Grothoff
*/
#include "gnunet-service-set.h"
-#include "set_protocol.h"
-
+#include "gnunet-service-set_protocol.h"
/**
- * Peer that has connected to us, but is not yet evaluating a set operation.
- * Once the peer has sent a request, and the client has
- * accepted or rejected it, this information will be deleted.
+ * How long do we hold on to an incoming channel if there is
+ * no local listener before giving up?
*/
-struct Incoming
-{
- /**
- * Incoming peers are held in a linked list
- */
- struct Incoming *next;
-
- /**
- * Incoming peers are held in a linked list
- */
- struct Incoming *prev;
-
- /**
- * Detail information about the operation.
- * NULL as long as we did not receive the operation
- * request from the remote peer.
- */
- struct OperationSpecification *spec;
-
- /**
- * The identity of the requesting peer. Needs to
- * be stored here as the op spec might not have been created yet.
- */
- struct GNUNET_PeerIdentity peer;
-
- /**
- * Tunnel to the peer.
- */
- struct GNUNET_MESH_Tunnel *tunnel;
-
- /**
- * Unique request id for the request from
- * a remote peer, sent to the client, which will
- * accept or reject the request.
- * Set to '0' iff the request has not been
- * suggested yet.
- */
- uint32_t suggest_id;
-
- /**
- * Timeout task, if the incoming peer has not been accepted
- * after the timeout, it will be disconnected.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * Tunnel context, needs to be stored here as a client's accept will change
- * the tunnel context.
- */
- struct TunnelContext *tc;
-};
-
+#define INCOMING_CHANNEL_TIMEOUT GNUNET_TIME_UNIT_MINUTES
/**
- * A listener is inhabited by a client, and
- * waits for evaluation requests from remote peers.
+ * A listener is inhabited by a client, and waits for evaluation
+ * requests from remote peers.
*/
struct Listener
{
*/
struct GNUNET_MQ_Handle *client_mq;
- /**
- * The type of the operation.
- */
- enum GNUNET_SET_OperationType operation;
-
/**
* 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.
+ */
+ enum GNUNET_SET_OperationType operation;
};
static const struct GNUNET_CONFIGURATION_Handle *configuration;
/**
- * Handle to the mesh service, used
- * to listen for and connect to remote peers.
+ * Handle to the cadet service, used to listen for and connect to
+ * remote peers.
*/
-static struct GNUNET_MESH_Handle *mesh;
+static struct GNUNET_CADET_Handle *cadet;
/**
* Sets are held in a doubly linked list.
static struct Listener *listeners_tail;
/**
- * Incoming sockets from remote peers are
- * held in a doubly linked list.
+ * Incoming sockets from remote peers are held in a doubly linked
+ * list.
*/
-static struct Incoming *incoming_head;
+static struct Operation *incoming_head;
/**
- * Incoming sockets from remote peers are
- * held in a doubly linked list.
+ * Incoming sockets from remote peers are held in a doubly linked
+ * list.
*/
-static struct Incoming *incoming_tail;
+static struct Operation *incoming_tail;
/**
- * 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.
+ * 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.
*/
static uint32_t suggest_id = 1;
* @return the incoming socket associated with the id,
* or NULL if there is none
*/
-static struct Incoming *
+static struct Operation *
get_incoming (uint32_t id)
{
- struct Incoming *incoming;
+ struct Operation *op;
- for (incoming = incoming_head; NULL != incoming; incoming = incoming->next)
- if (incoming->suggest_id == id)
- return incoming;
+ for (op = incoming_head; NULL != op; op = op->next)
+ if (op->suggest_id == id)
+ {
+ GNUNET_assert (GNUNET_YES == op->is_incoming);
+ return op;
+ }
return NULL;
}
if (NULL != listener->client)
{
struct GNUNET_SERVER_Client *client = listener->client;
+
listener->client = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting listener client\n");
GNUNET_SERVER_client_disconnect (client);
return;
}
GNUNET_MQ_destroy (listener->client_mq);
listener->client_mq = NULL;
}
- GNUNET_CONTAINER_DLL_remove (listeners_head, listeners_tail, listener);
+ GNUNET_CONTAINER_DLL_remove (listeners_head,
+ listeners_tail,
+ listener);
GNUNET_free (listener);
}
/**
- * Iterator over hash map entries.
+ * Context for the #garbage_collect_cb().
+ */
+struct GarbageContext
+{
+
+ /**
+ * Map for which we are garbage collecting removed elements.
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *map;
+
+ /**
+ * Lowest generation for which an operation is still pending.
+ */
+ unsigned int min_op_generation;
+
+ /**
+ * Largest generation for which an operation is still pending.
+ */
+ unsigned int max_op_generation;
+
+};
+
+
+/**
+ * Function invoked to check if an element can be removed from
+ * the set's history because it is no longer needed.
+ *
+ * @param cls the `struct GarbageContext *`
+ * @param key key of the element in the map
+ * @param value the `struct ElementEntry *`
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+garbage_collect_cb (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GarbageContext *gc = cls;
+ struct ElementEntry *ee = value;
+
+ if (GNUNET_YES != ee->removed)
+ return GNUNET_OK;
+ if ( (gc->max_op_generation < ee->generation_added) ||
+ (ee->generation_removed > gc->min_op_generation) )
+ {
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (gc->map,
+ key,
+ ee));
+ GNUNET_free (ee);
+ }
+ return GNUNET_OK;
+}
+
+
+/**
+ * Collect and destroy elements that are not needed anymore, because
+ * their lifetime (as determined by their generation) does not overlap
+ * with any active set operation.
+ *
+ * @param set set to garbage collect
+ */
+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)
+ {
+ gc.min_op_generation = GNUNET_MIN (gc.min_op_generation,
+ op->generation_created);
+ gc.max_op_generation = GNUNET_MAX (gc.max_op_generation,
+ op->generation_created);
+ }
+ gc.map = set->elements;
+ GNUNET_CONTAINER_multihashmap_iterate (set->elements,
+ &garbage_collect_cb,
+ &gc);
+}
+
+
+/**
+ * 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.
+ *
+ * @param op operation to destroy
+ * @param gc #GNUNET_YES to perform garbage collection on the set
+ */
+void
+_GSS_operation_destroy (struct Operation *op,
+ int gc)
+{
+ struct Set *set;
+ struct GNUNET_CADET_Channel *channel;
+
+ if (NULL == op->vt)
+ {
+ /* already in #_GSS_operation_destroy() */
+ return;
+ }
+ 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 != op->spec->context_msg)
+ {
+ GNUNET_free (op->spec->context_msg);
+ op->spec->context_msg = NULL;
+ }
+ GNUNET_free (op->spec);
+ op->spec = NULL;
+ }
+ if (NULL != op->mq)
+ {
+ GNUNET_MQ_destroy (op->mq);
+ op->mq = NULL;
+ }
+ if (NULL != (channel = op->channel))
+ {
+ op->channel = NULL;
+ GNUNET_CADET_channel_destroy (channel);
+ }
+ if (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. */
+}
+
+
+/**
+ * Iterator over hash map entries to free element entries.
*
* @param cls closure
* @param key current key code
- * @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- * iterate,
- * GNUNET_NO if not.
+ * @param value a `struct ElementEntry *` to be free'd
+ * @return #GNUNET_YES (continue to iterate)
*/
static int
destroy_elements_iterator (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_HashCode *key,
void *value)
{
struct ElementEntry *ee = value;
/**
- * Destroy a set, and free all resources associated with it.
+ * Destroy a set, and free all resources and operations associated with it.
*
* @param set the set to destroy
*/
static void
set_destroy (struct Set *set)
{
- /* If the client is not dead yet, destroy it.
- * The client's destroy callback will destroy the set again.
- * We do this so that the tunnel end handler still has a valid set handle
- * to destroy. */
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_SERVER_Client *client = set->client;
+
set->client = NULL;
GNUNET_SERVER_client_disconnect (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->client_mq)
{
GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
set->iter = NULL;
+ set->iteration_id++;
}
- GNUNET_CONTAINER_DLL_remove (sets_head, sets_tail, set);
if (NULL != set->elements)
{
GNUNET_CONTAINER_multihashmap_iterate (set->elements,
- destroy_elements_iterator, NULL);
+ &destroy_elements_iterator,
+ NULL);
GNUNET_CONTAINER_multihashmap_destroy (set->elements);
set->elements = NULL;
}
+ GNUNET_CONTAINER_DLL_remove (sets_head,
+ sets_tail,
+ set);
GNUNET_free (set);
}
/**
- * Clean up after a client after it is
- * disconnected (either by us or by itself)
+ * Clean up after a client has disconnected
*
* @param cls closure, unused
* @param client the client to clean up after
*/
static void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
+handle_client_disconnect (void *cls,
+ struct GNUNET_SERVER_Client *client)
{
struct Set *set;
struct Listener *listener;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, cleaning up\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "client disconnected, cleaning up\n");
set = set_get (client);
if (NULL != set)
{
set->client = NULL;
set_destroy (set);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(client's set destroyed)\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client's set destroyed\n");
}
listener = listener_get (client);
if (NULL != listener)
{
listener->client = NULL;
listener_destroy (listener);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(client's listener destroyed)\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client's listener destroyed\n");
}
}
* @param incoming remote request to destroy
*/
static void
-incoming_destroy (struct Incoming *incoming)
+incoming_destroy (struct Operation *incoming)
{
- GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
+ GNUNET_assert (GNUNET_YES == incoming->is_incoming);
+ GNUNET_CONTAINER_DLL_remove (incoming_head,
+ incoming_tail,
+ incoming);
if (GNUNET_SCHEDULER_NO_TASK != incoming->timeout_task)
{
GNUNET_SCHEDULER_cancel (incoming->timeout_task);
incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (NULL != incoming->tunnel)
+ /* make sure that the tunnel end handler will not destroy us again */
+ incoming->vt = NULL;
+ if (NULL != incoming->spec)
{
- struct GNUNET_MESH_Tunnel *t = incoming->tunnel;
- incoming->tunnel = NULL;
- GNUNET_MESH_tunnel_destroy (t);
- return;
+ GNUNET_free (incoming->spec);
+ incoming->spec = NULL;
+ }
+ if (NULL != incoming->mq)
+ {
+ GNUNET_MQ_destroy (incoming->mq);
+ incoming->mq = NULL;
+ }
+ if (NULL != incoming->channel)
+ {
+ GNUNET_CADET_channel_destroy (incoming->channel);
+ incoming->channel = NULL;
}
- GNUNET_free (incoming);
}
+/**
+ * Find a listener that is interested in the given operation type
+ * and application id.
+ *
+ * @param op operation type to look for
+ * @param app_id application id to look for
+ * @return a matching listener, or NULL if no listener matches the
+ * given operation and application id
+ */
static struct Listener *
listener_get_by_target (enum GNUNET_SET_OperationType op,
const struct GNUNET_HashCode *app_id)
{
- struct Listener *l;
+ struct Listener *listener;
- for (l = listeners_head; NULL != l; l = l->next)
- {
- if (l->operation != op)
- continue;
- if (0 != GNUNET_CRYPTO_hash_cmp (app_id, &l->app_id))
- continue;
- return l;
- }
+ for (listener = listeners_head; NULL != listener; listener = listener->next)
+ if ( (listener->operation == op) &&
+ (0 == GNUNET_CRYPTO_hash_cmp (app_id, &listener->app_id)) )
+ return listener;
return NULL;
}
/**
- * Suggest the given request to the listener,
- * who can accept or reject the request.
+ * 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 Incoming *incoming, struct Listener *listener)
+incoming_suggest (struct Operation *incoming,
+ struct Listener *listener)
{
struct GNUNET_MQ_Envelope *mqm;
struct GNUNET_SET_RequestMessage *cmsg;
- GNUNET_assert (0 == incoming->suggest_id);
+ 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 (GNUNET_SCHEDULER_NO_TASK != incoming->timeout_task);
GNUNET_SCHEDULER_cancel (incoming->timeout_task);
incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- mqm = GNUNET_MQ_msg_nested_mh (cmsg, GNUNET_MESSAGE_TYPE_SET_REQUEST,
+ 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 request with accept id %u\n",
+ 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;
/**
- * Handle a request for a set operation from
- * another peer.
+ * Handle a request for a set operation from another peer. Checks if we
+ * have a listener waiting for such a request (and in that case initiates
+ * asking the listener about accepting the connection). If no listener
+ * is waiting, we queue the operation request in hope that a listener
+ * shows up soon (before timeout).
+ *
+ * This msg is expected as the first and only msg handled through the
+ * non-operation bound virtual table, acceptance of this operation replaces
+ * our virtual table and subsequent msgs would be routed differently (as
+ * we then know what type of operation this is).
*
* @param op the operation state
* @param mh the received message
- * @return GNUNET_OK if the tunnel should be kept alive,
- * GNUNET_SYSERR to destroy the tunnel
+ * @return #GNUNET_OK if the channel should be kept alive,
+ * #GNUNET_SYSERR to destroy the channel
*/
static int
-handle_incoming_msg (struct OperationState *op,
+handle_incoming_msg (struct Operation *op,
const struct GNUNET_MessageHeader *mh)
{
- struct Incoming *incoming = (struct Incoming *) op;
- const struct OperationRequestMessage *msg = (const struct OperationRequestMessage *) mh;
+ const struct OperationRequestMessage *msg;
struct Listener *listener;
struct OperationSpecification *spec;
+ const struct GNUNET_MessageHeader *nested_context;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got op request\n");
-
+ msg = (const struct OperationRequestMessage *) mh;
+ GNUNET_assert (GNUNET_YES == op->is_incoming);
if (GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST != ntohs (mh->type))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
-
- if (NULL != incoming->spec)
+ /* double operation request */
+ if (NULL != op->spec)
{
- /* double operation request */
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
-
spec = GNUNET_new (struct OperationSpecification);
- spec->context_msg = GNUNET_MQ_extract_nested_mh (msg);
- if (NULL != spec->context_msg)
- spec->context_msg = GNUNET_copy_message (spec->context_msg);
- spec->operation = ntohl (msg->operation);
- spec->app_id = msg->app_id;
- spec->salt = ntohl (msg->salt);
- spec->peer = incoming->peer;
-
- incoming->spec = spec;
-
- if ( (NULL != spec->context_msg) &&
- (ntohs (spec->context_msg->size) > GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE) )
+ nested_context = GNUNET_MQ_extract_nested_mh (msg);
+ if ( (NULL != nested_context) &&
+ (ntohs (nested_context->size) > GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE) )
{
GNUNET_break_op (0);
+ GNUNET_free (spec);
return GNUNET_SYSERR;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received P2P operation request (op %u, app %s)\n",
- ntohl (msg->operation), GNUNET_h2s (&msg->app_id));
- listener = listener_get_by_target (ntohl (msg->operation), &msg->app_id);
+ /* 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 != spec->context_msg)
+ spec->context_msg = GNUNET_copy_message (nested_context);
+ spec->operation = ntohl (msg->operation);
+ spec->app_id = msg->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 = listener_get_by_target (ntohl (msg->operation),
+ &msg->app_id);
if (NULL == listener)
{
+ GNUNET_break (GNUNET_SCHEDULER_NO_TASK != op->timeout_task);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "no listener matches incoming request, waiting with timeout\n");
+ "No matching listener for incoming request (op %u, app %s), waiting with timeout\n",
+ ntohl (msg->operation),
+ GNUNET_h2s (&msg->app_id));
return GNUNET_OK;
}
- incoming_suggest (incoming, listener);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received P2P operation request (op %u, app %s) for active listener\n",
+ ntohl (msg->operation),
+ GNUNET_h2s (&msg->app_id));
+ incoming_suggest (op, listener);
return GNUNET_OK;
}
+/**
+ * Send the next element of a set to the set's client. The next element is given by
+ * the set's current hashmap iterator. The set's iterator will be set to NULL if there
+ * are no more elements in the set. The caller must ensure that the set's iterator is
+ * valid.
+ *
+ * The client will acknowledge each received element with a
+ * #GNUNET_MESSAGE_TYPE_SET_ITER_ACK message. Our
+ * #handle_client_iter_ack() will then trigger the next transmission.
+ * Note that the #GNUNET_MESSAGE_TYPE_SET_ITER_DONE is not acknowledged.
+ *
+ * @param set set that should send its next element to its client
+ */
static void
send_client_element (struct Set *set)
{
int ret;
struct ElementEntry *ee;
struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_IterResponseMessage *msg;
GNUNET_assert (NULL != set->iter);
- ret = GNUNET_CONTAINER_multihashmap_iterator_next (set->iter, NULL, (const void **) &ee);
+ ret = GNUNET_CONTAINER_multihashmap_iterator_next (set->iter,
+ NULL,
+ (const void **) &ee);
if (GNUNET_NO == ret)
{
ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_ITER_DONE);
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
+ set->iter = NULL;
+ set->iteration_id++;
}
else
{
- struct GNUNET_SET_IterResponseMessage *msg;
-
GNUNET_assert (NULL != ee);
- ev = GNUNET_MQ_msg_extra (msg, ee->element.size, GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT);
- memcpy (&msg[1], ee->element.data, ee->element.size);
- msg->element_type = ee->element.type;
+ ev = GNUNET_MQ_msg_extra (msg,
+ ee->element.size,
+ GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT);
+ memcpy (&msg[1],
+ ee->element.data,
+ ee->element.size);
+ msg->element_type = ee->element.element_type;
+ msg->iteration_id = htons (set->iteration_id);
}
GNUNET_MQ_send (set->client_mq, ev);
}
/**
* Called when a client wants to iterate the elements of a set.
+ * Checks if we have a set associated with the client and if we
+ * can right now start an iteration. If all checks out, starts
+ * sending the elements of the set to the client.
*
* @param cls unused
* @param client client that sent the message
set = set_get (client);
if (NULL == set)
{
+ /* attempt to iterate over a non existing set */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
if (NULL != set->iter)
{
+ /* Only one concurrent iterate-action allowed per set */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "iterating union set with %u elements\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Iterating union set with %u elements\n",
GNUNET_CONTAINER_multihashmap_size (set->elements));
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
set->iter = GNUNET_CONTAINER_multihashmap_iterator_create (set->elements);
send_client_element (set);
}
/**
- * Called when a client wants to create a new set.
+ * Called when a client wants to create a new set. This is typically
+ * the first request from a client, and includes the type of set
+ * operation to be performed.
*
* @param cls unused
* @param client client that sent the message
* @param m message sent by the client
*/
static void
-handle_client_create (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+handle_client_create_set (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *m)
{
- struct GNUNET_SET_CreateMessage *msg = (struct GNUNET_SET_CreateMessage *) m;
+ const struct GNUNET_SET_CreateMessage *msg;
struct Set *set;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client created new set (operation %u)\n",
+ msg = (const struct GNUNET_SET_CreateMessage *) m;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client created new set (operation %u)\n",
ntohs (msg->operation));
-
if (NULL != set_get (client))
{
+ /* There can only be one set per client */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
set = GNUNET_new (struct Set);
-
- switch (ntohs (msg->operation))
+ switch (ntohl (msg->operation))
{
- case GNUNET_SET_OPERATION_INTERSECTION:
-// set->vt = _GSS_intersection_vt ();
- break;
- case GNUNET_SET_OPERATION_UNION:
- set->vt = _GSS_union_vt ();
- break;
- default:
- GNUNET_free (set);
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
+ case GNUNET_SET_OPERATION_INTERSECTION:
+ set->vt = _GSS_intersection_vt ();
+ break;
+ case GNUNET_SET_OPERATION_UNION:
+ set->vt = _GSS_union_vt ();
+ break;
+ default:
+ GNUNET_free (set);
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
}
-
set->state = set->vt->create ();
set->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
set->client = client;
set->client_mq = GNUNET_MQ_queue_for_server_client (client);
- GNUNET_CONTAINER_DLL_insert (sets_head, sets_tail, set);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_CONTAINER_DLL_insert (sets_head,
+ sets_tail,
+ set);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *m)
{
- struct GNUNET_SET_ListenMessage *msg = (struct GNUNET_SET_ListenMessage *) m;
+ const struct GNUNET_SET_ListenMessage *msg;
struct Listener *listener;
- struct Incoming *incoming;
+ struct Operation *op;
+ msg = (const struct GNUNET_SET_ListenMessage *) m;
if (NULL != listener_get (client))
{
+ /* max. one active listener per client! */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
listener->client_mq = GNUNET_MQ_queue_for_server_client (client);
listener->app_id = msg->app_id;
listener->operation = ntohl (msg->operation);
- GNUNET_CONTAINER_DLL_insert_tail (listeners_head, listeners_tail, listener);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "new listener created (op %u, app %s)\n",
- listener->operation, GNUNET_h2s (&listener->app_id));
- for (incoming = incoming_head; NULL != incoming; incoming = incoming->next)
+ GNUNET_CONTAINER_DLL_insert_tail (listeners_head,
+ listeners_tail,
+ listener);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "New listener created (op %u, app %s)\n",
+ listener->operation,
+ GNUNET_h2s (&listener->app_id));
+
+ /* check for existing incoming requests the listener might be interested in */
+ for (op = incoming_head; NULL != op; op = op->next)
{
- if (NULL == incoming->spec)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "request has no spec yet\n");
- continue;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "considering (op: %u, app: %s, suggest: %u)\n",
- incoming->spec->operation, GNUNET_h2s (&incoming->spec->app_id), incoming->suggest_id);
-
- if (0 != incoming->suggest_id)
- continue;
- if (listener->operation != incoming->spec->operation)
- continue;
- if (0 != GNUNET_CRYPTO_hash_cmp (&listener->app_id, &incoming->spec->app_id))
- continue;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "request suggested\n");
- incoming_suggest (incoming, listener);
+ 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_log (GNUNET_ERROR_TYPE_DEBUG, "considered all incoming requests\n");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Called when the client wants to reject an operation
- * request from another peer.
+ * Called when the listening client rejects an operation
+ * request by another peer.
*
* @param cls unused
* @param client client that sent the message
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *m)
{
- struct Incoming *incoming;
- const struct GNUNET_SET_AcceptRejectMessage *msg;
-
- msg = (const struct GNUNET_SET_AcceptRejectMessage *) m;
- GNUNET_break (0 == ntohl (msg->request_id));
+ struct Operation *incoming;
+ const struct GNUNET_SET_RejectMessage *msg;
+ msg = (const struct GNUNET_SET_RejectMessage *) m;
incoming = get_incoming (ntohl (msg->accept_reject_id));
if (NULL == incoming)
{
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ /* no matching incoming operation for this reject */
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer request rejected by client\n");
- GNUNET_MESH_tunnel_destroy (incoming->tunnel);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ 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_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * Called when a client wants to add an element to a
- * set it inhabits.
+ * Called when a client wants to add an element to a set it inhabits.
*
* @param cls unused
* @param client client that sent the message
* @param m message sent by the client
*/
static void
-handle_client_add_remove (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+handle_client_add (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *m)
{
struct Set *set;
const struct GNUNET_SET_ElementMessage *msg;
struct GNUNET_SET_Element el;
struct ElementEntry *ee;
+ struct ElementEntry *ee_dup;
set = set_get (client);
if (NULL == set)
{
+ /* client without a set requested an operation */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
msg = (const struct GNUNET_SET_ElementMessage *) m;
el.size = ntohs (m->size) - sizeof *msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client ins/rem element of size %u\n", el.size);
+ "Client inserts element of size %u\n",
+ el.size);
el.data = &msg[1];
- if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type))
+ ee = GNUNET_malloc (el.size + sizeof *ee);
+ ee->element.size = el.size;
+ memcpy (&ee[1],
+ el.data,
+ el.size);
+ ee->element.data = &ee[1];
+ ee->generation_added = set->current_generation;
+ ee->remote = GNUNET_NO;
+ GNUNET_CRYPTO_hash (ee->element.data,
+ el.size,
+ &ee->element_hash);
+ ee_dup = GNUNET_CONTAINER_multihashmap_get (set->elements,
+ &ee->element_hash);
+ if (NULL != ee_dup)
{
- struct GNUNET_HashCode hash;
+ /* same element inserted twice */
+ GNUNET_break (0);
+ GNUNET_free (ee);
+ return;
+ }
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (set->elements,
+ &ee->element_hash,
+ ee,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ set->vt->add (set->state, ee);
+}
- GNUNET_CRYPTO_hash (el.data, el.size, &hash);
- ee = GNUNET_CONTAINER_multihashmap_get (set->elements, &hash);
- if (NULL == ee)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "client tried to remove non-existing element\n");
- return;
- }
- if (GNUNET_YES == ee->removed)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "client tried to remove element twice\n");
- return;
- }
- ee->removed = GNUNET_YES;
- ee->generation_removed = set->current_generation;
- set->vt->remove (set->state, ee);
+
+/**
+ * Called when a client wants to remove an element from a set it
+ * inhabits.
+ *
+ * @param cls unused
+ * @param client client that sent the message
+ * @param m message sent by the client
+ */
+static void
+handle_client_remove (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *m)
+{
+ struct Set *set;
+ const struct GNUNET_SET_ElementMessage *msg;
+ struct GNUNET_SET_Element el;
+ struct ElementEntry *ee;
+ struct GNUNET_HashCode hash;
+
+ set = set_get (client);
+ if (NULL == set)
+ {
+ /* client without a set requested an operation */
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
}
- else
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+ msg = (const struct GNUNET_SET_ElementMessage *) m;
+ el.size = ntohs (m->size) - sizeof *msg;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client removes element of size %u\n",
+ el.size);
+ el.data = &msg[1];
+ GNUNET_CRYPTO_hash (el.data,
+ el.size,
+ &hash);
+ ee = GNUNET_CONTAINER_multihashmap_get (set->elements,
+ &hash);
+ if (NULL == ee)
{
- struct ElementEntry *ee_dup;
-
- ee = GNUNET_malloc (el.size + sizeof *ee);
- ee->element.size = el.size;
- memcpy (&ee[1], el.data, el.size);
- ee->element.data = &ee[1];
- ee->generation_added = set->current_generation;
- ee->remote = GNUNET_NO;
- GNUNET_CRYPTO_hash (ee->element.data, el.size, &ee->element_hash);
- ee_dup = GNUNET_CONTAINER_multihashmap_get (set->elements,
- &ee->element_hash);
- if (NULL != ee_dup)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "element inserted twice, ignoring\n");
- GNUNET_free (ee);
- return;
- }
- GNUNET_CONTAINER_multihashmap_put (set->elements, &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- set->vt->add (set->state, ee);
+ /* Client tried to remove non-existing element */
+ GNUNET_break (0);
+ return;
}
+ if (GNUNET_YES == ee->removed)
+ {
+ /* Client tried to remove element twice */
+ GNUNET_break (0);
+ return;
+ }
+ ee->removed = GNUNET_YES;
+ ee->generation_removed = set->current_generation;
+ set->vt->remove (set->state, ee);
}
/**
- * Called when a client wants to evaluate a set operation with another peer.
+ * Called when a client wants to initiate a set operation with another
+ * peer. Initiates the CADET connection to the listener and sends the
+ * request.
*
* @param cls unused
* @param client client that sent the message
const struct GNUNET_MessageHeader *m)
{
struct Set *set;
- struct TunnelContext *tc;
- struct GNUNET_MESH_Tunnel *tunnel;
- struct GNUNET_SET_EvaluateMessage *msg;
+ const struct GNUNET_SET_EvaluateMessage *msg;
struct OperationSpecification *spec;
+ struct Operation *op;
+ const struct GNUNET_MessageHeader *context;
set = set_get (client);
if (NULL == set)
GNUNET_SERVER_client_disconnect (client);
return;
}
-
- msg = (struct GNUNET_SET_EvaluateMessage *) m;
- tc = GNUNET_new (struct TunnelContext);
+ msg = (const struct GNUNET_SET_EvaluateMessage *) m;
spec = GNUNET_new (struct OperationSpecification);
spec->operation = set->operation;
spec->app_id = msg->app_id;
- spec->salt = ntohl (msg->salt);
+ spec->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
spec->peer = msg->target_peer;
spec->set = set;
spec->result_mode = ntohs (msg->result_mode);
spec->client_request_id = ntohl (msg->request_id);
- spec->context_msg = GNUNET_MQ_extract_nested_mh (msg);
- if (NULL != spec->context_msg)
- spec->context_msg = GNUNET_copy_message (spec->context_msg);
-
- tunnel = GNUNET_MESH_tunnel_create (mesh, tc, &msg->target_peer,
- GNUNET_APPLICATION_TYPE_SET,
- GNUNET_YES,
- GNUNET_YES);
-
- set->vt->evaluate (spec, tunnel, tc);
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ context = GNUNET_MQ_extract_nested_mh (msg);
+ op = GNUNET_new (struct Operation);
+ op->spec = spec;
+ op->generation_created = set->current_generation++;
+ op->vt = set->vt;
+ GNUNET_CONTAINER_DLL_insert (set->ops_head,
+ set->ops_tail,
+ op);
+ op->channel = GNUNET_CADET_channel_create (cadet,
+ op,
+ &msg->target_peer,
+ GNUNET_APPLICATION_TYPE_SET,
+ GNUNET_CADET_OPTION_RELIABLE);
+ op->mq = GNUNET_CADET_mq_create (op->channel);
+ set->vt->evaluate (op,
+ context);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * Handle an ack from a client.
+ * Handle an ack from a client, and send the next element. Note
+ * that we only expect acks for set elements, not after the
+ * #GNUNET_MESSAGE_TYPE_SET_ITER_DONE message.
*
* @param cls unused
* @param client the client
*/
static void
handle_client_iter_ack (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *m)
{
+ const struct GNUNET_SET_IterAckMessage *ack;
struct Set *set;
set = set_get (client);
if (NULL == set)
{
+ /* client without a set acknowledged receiving a value */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (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_SERVER_client_disconnect (client);
return;
}
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- send_client_element (set);
+ ack = (const struct GNUNET_SET_IterAckMessage *) m;
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+ if (ntohl (ack->send_more))
+ {
+ send_client_element (set);
+ }
+ else
+ {
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
+ set->iter = NULL;
+ set->iteration_id++;
+ }
}
/**
- * Handle a request from the client to accept
- * a set operation that came from a remote peer.
+ * Handle a request from the client to
+ * cancel a running set operation.
*
* @param cls unused
* @param client the client
const struct GNUNET_SET_CancelMessage *msg =
(const struct GNUNET_SET_CancelMessage *) mh;
struct Set *set;
+ struct Operation *op;
+ int found;
set = set_get (client);
if (NULL == set)
{
+ /* client without a set requested an operation */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
- /* FIXME: maybe cancel should return success/error code? */
- set->vt->cancel (set->state, ntohl (msg->request_id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client requested cancel for op %u\n",
+ 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))
+ {
+ found = GNUNET_YES;
+ break;
+ }
+ }
+ if (GNUNET_NO == found)
+ {
+ /* It may happen that the operation was already destroyed due to
+ * the other peer disconnecting. The client may not know about this
+ * 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");
+ }
+ else
+ {
+ _GSS_operation_destroy (op,
+ GNUNET_YES);
+ }
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * Handle a request from the client to accept
- * a set operation that came from a remote peer.
+ * Handle a request from the client to accept a set operation that
+ * came from a remote peer. We forward the accept to the associated
+ * operation for handling
*
* @param cls unused
* @param client the client
const struct GNUNET_MessageHeader *mh)
{
struct Set *set;
- struct Incoming *incoming;
- struct GNUNET_SET_AcceptRejectMessage *msg = (struct GNUNET_SET_AcceptRejectMessage *) mh;
-
- incoming = get_incoming (ntohl (msg->accept_reject_id));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client accepting %u\n", ntohl (msg->accept_reject_id));
+ const struct GNUNET_SET_AcceptMessage *msg;
+ struct Operation *op;
+ struct GNUNET_SET_ResultMessage *result_message;
+ struct GNUNET_MQ_Envelope *ev;
- if (NULL == incoming)
+ msg = (const struct GNUNET_SET_AcceptMessage *) mh;
+ set = set_get (client);
+ if (NULL == set)
{
+ /* client without a set requested to accept */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
- set = set_get (client);
-
- if (NULL == set)
+ op = get_incoming (ntohl (msg->accept_reject_id));
+ if (NULL == op)
{
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
+ /* 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");
+ 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_SERVER_receive_done (client, GNUNET_OK);
return;
}
- incoming->spec->set = set;
- incoming->spec->client_request_id = ntohl (msg->request_id);
- incoming->spec->result_mode = ntohs (msg->result_mode);
- set->vt->accept (incoming->spec, incoming->tunnel, incoming->tc);
- /* tunnel ownership goes to operation */
- incoming->tunnel = NULL;
- incoming_destroy (incoming);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client accepting request %u\n",
+ 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,
+ op);
+ op->spec->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->generation_created = set->current_generation++;
+ op->vt = set->vt;
+ op->vt->accept (op);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
{
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 mesh at the end, as tunnels
- * must be destroyed first! */
- if (NULL != mesh)
+ /* it's important to destroy cadet at the end, as all channels
+ * must be destroyed before the cadet handle! */
+ if (NULL != cadet)
{
- GNUNET_MESH_disconnect (mesh);
- mesh = NULL;
+ GNUNET_CADET_disconnect (cadet);
+ cadet = NULL;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled shutdown request\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "handled shutdown request\n");
}
/**
- * Signature of the main function of a task.
+ * Timeout happens iff:
+ * - we suggested an operation to our listener,
+ * but did not receive a response in time
+ * - we got the channel from a peer but no #GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST
+ * - shutdown (obviously)
*
- * @param cls closure
+ * @param cls channel context
* @param tc context information (why was this task triggered now)
*/
static void
incoming_timeout_cb (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct Incoming *incoming = cls;
+ struct Operation *incoming = cls;
+ incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_assert (GNUNET_YES == incoming->is_incoming);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "remote peer timed out\n");
+ 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 OperationState *op_state)
+handle_incoming_disconnect (struct Operation *op)
{
- struct Incoming *incoming = (struct Incoming *) op_state;
- if (NULL == incoming->tunnel)
- return;
-
- incoming_destroy (incoming);
+ 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;
}
/**
- * Method called whenever another peer has added us to a tunnel
- * the other peer initiated.
- * Only called (once) upon reception of data with a message type which was
- * subscribed to in GNUNET_MESH_connect. A call to GNUNET_MESH_tunnel_destroy
- * causes te tunnel to be ignored and no further notifications are sent about
- * the same tunnel.
+ * Method called whenever another peer has added us to a channel the
+ * other peer initiated. Only called (once) upon reception of data
+ * with a message type which was subscribed to in
+ * GNUNET_CADET_connect().
+ *
+ * The channel context represents the operation itself and gets added to a DLL,
+ * from where it gets looked up when our local listener client responds
+ * to a proposed/suggested operation or connects and associates with this operation.
*
* @param cls closure
- * @param tunnel new handle to the tunnel
- * @param initiator peer that started the tunnel
- * @param port Port this tunnel is for.
- * @return initial tunnel context for the tunnel
- * (can be NULL -- that's not an error)
+ * @param channel new handle to the channel
+ * @param initiator peer that started the channel
+ * @param port Port this channel is for.
+ * @param options Unused.
+ * @return initial channel context for the channel
+ * returns NULL on error
*/
static void *
-tunnel_new_cb (void *cls,
- struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *initiator,
- uint32_t port)
+channel_new_cb (void *cls,
+ struct GNUNET_CADET_Channel *channel,
+ const struct GNUNET_PeerIdentity *initiator,
+ uint32_t port,
+ enum GNUNET_CADET_ChannelOption options)
{
- struct Incoming *incoming;
static const struct SetVT incoming_vt = {
- .msg_handler = handle_incoming_msg,
- .peer_disconnect = handle_incoming_disconnect
+ .msg_handler = &handle_incoming_msg,
+ .peer_disconnect = &handle_incoming_disconnect
};
+ struct Operation *incoming;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "new incoming tunnel\n");
-
- GNUNET_assert (port == GNUNET_APPLICATION_TYPE_SET);
- incoming = GNUNET_new (struct Incoming);
+ if (GNUNET_APPLICATION_TYPE_SET != port)
+ {
+ GNUNET_break (0);
+ GNUNET_CADET_channel_destroy (channel);
+ return NULL;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "New incoming channel\n");
+ incoming = GNUNET_new (struct Operation);
+ incoming->is_incoming = GNUNET_YES;
incoming->peer = *initiator;
- incoming->tunnel = tunnel;
- incoming->tc = GNUNET_new (struct TunnelContext);;
- incoming->tc->vt = &incoming_vt;
- incoming->tc->op = (struct OperationState *) incoming;
- incoming->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, incoming_timeout_cb, incoming);
- GNUNET_CONTAINER_DLL_insert_tail (incoming_head, incoming_tail, incoming);
-
- return incoming->tc;
+ incoming->channel = channel;
+ incoming->mq = GNUNET_CADET_mq_create (incoming->channel);
+ incoming->vt = &incoming_vt;
+ incoming->timeout_task
+ = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT,
+ &incoming_timeout_cb,
+ incoming);
+ GNUNET_CONTAINER_DLL_insert_tail (incoming_head,
+ incoming_tail,
+ incoming);
+ return incoming;
}
/**
- * Function called whenever a tunnel is destroyed. Should clean up
- * any associated state.
- * GNUNET_MESH_tunnel_destroy. It must NOT call GNUNET_MESH_tunnel_destroy on
- * the tunnel.
+ * Function called whenever a channel is destroyed. Should clean up
+ * any associated state. It must NOT call
+ * GNUNET_CADET_channel_destroy() on the channel.
+ *
+ * The peer_disconnect function is part of a a virtual table set initially either
+ * when a peer creates a new channel with us (#channel_new_cb()), or once we create
+ * a new channel ourselves (evaluate).
*
- * @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- * with the tunnel is stored
+ * Once we know the exact type of operation (union/intersection), the vt is
+ * replaced with an operation specific instance (_GSS_[op]_vt).
+ *
+ * @param cls closure (set from GNUNET_CADET_connect())
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ * with the channel is stored
*/
static void
-tunnel_end_cb (void *cls,
- const struct GNUNET_MESH_Tunnel *tunnel, void *tunnel_ctx)
+channel_end_cb (void *cls,
+ const struct GNUNET_CADET_Channel *channel,
+ void *channel_ctx)
{
- struct TunnelContext *ctx = tunnel_ctx;
+ struct Operation *op = channel_ctx;
- ctx->vt->peer_disconnect (ctx->op);
- /* mesh will never call us with the context again! */
- GNUNET_free (tunnel_ctx);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "channel_end_cb called\n");
+ op->channel = NULL;
+ /* 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);
+ }
+ if (GNUNET_YES != 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");
}
/**
* Functions with this signature are called whenever a message is
- * received.
+ * received via a cadet channel.
*
- * Each time the function must call GNUNET_MESH_receive_done on the tunnel
- * in order to receive the next message. This doesn't need to be immediate:
- * can be delayed if some processing is done on the message.
+ * The msg_handler is a virtual table set in initially either when a peer
+ * creates a new channel with us (channel_new_cb), or once we create a new channel
+ * ourselves (evaluate).
*
- * @param cls Closure (set from GNUNET_MESH_connect).
- * @param tunnel Connection to the other end.
- * @param tunnel_ctx Place to store local state associated with the tunnel.
- * @param message The actual message.
+ * Once we know the exact type of operation (union/intersection), the vt is
+ * replaced with an operation specific instance (_GSS_[op]_vt).
*
- * @return GNUNET_OK to keep the tunnel open,
- * GNUNET_SYSERR to close it (signal serious error).
+ * @param cls Closure (set from GNUNET_CADET_connect()).
+ * @param channel Connection to the other end.
+ * @param channel_ctx Place to store local state associated with the channel.
+ * @param message The actual message.
+ * @return #GNUNET_OK to keep the channel open,
+ * #GNUNET_SYSERR to close it (signal serious error).
*/
static int
dispatch_p2p_message (void *cls,
- struct GNUNET_MESH_Tunnel *tunnel,
- void **tunnel_ctx,
+ struct GNUNET_CADET_Channel *channel,
+ void **channel_ctx,
const struct GNUNET_MessageHeader *message)
{
- struct TunnelContext *tc = *tunnel_ctx;
+ struct Operation *op = *channel_ctx;
int ret;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dispatching mesh message (type: %u)\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Dispatching cadet message (type: %u)\n",
ntohs (message->type));
- /* do this before the handler, as the handler might kill the tunnel */
- GNUNET_MESH_receive_done (tunnel);
- ret = tc->vt->msg_handler (tc->op, message);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled mesh message (type: %u)\n",
+ /* do this before the handler, as the handler might kill the channel */
+ GNUNET_CADET_receive_done (channel);
+ if (NULL != op->vt)
+ ret = op->vt->msg_handler (op,
+ message);
+ else
+ ret = GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Handled cadet message (type: %u)\n",
ntohs (message->type));
return ret;
}
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
- {handle_client_accept, NULL, GNUNET_MESSAGE_TYPE_SET_ACCEPT,
- sizeof (struct GNUNET_SET_AcceptRejectMessage)},
- {handle_client_iter_ack, NULL, GNUNET_MESSAGE_TYPE_SET_ITER_ACK, 0},
- {handle_client_add_remove, NULL, GNUNET_MESSAGE_TYPE_SET_ADD, 0},
- {handle_client_create, NULL, GNUNET_MESSAGE_TYPE_SET_CREATE,
- sizeof (struct GNUNET_SET_CreateMessage)},
- {handle_client_iterate, NULL, GNUNET_MESSAGE_TYPE_SET_ITER_REQUEST,
- sizeof (struct GNUNET_MessageHeader)},
- {handle_client_evaluate, NULL, GNUNET_MESSAGE_TYPE_SET_EVALUATE, 0},
- {handle_client_listen, NULL, GNUNET_MESSAGE_TYPE_SET_LISTEN,
- sizeof (struct GNUNET_SET_ListenMessage)},
- {handle_client_reject, NULL, GNUNET_MESSAGE_TYPE_SET_REJECT,
- sizeof (struct GNUNET_SET_AcceptRejectMessage)},
- {handle_client_add_remove, NULL, GNUNET_MESSAGE_TYPE_SET_REMOVE, 0},
- {handle_client_cancel, NULL, GNUNET_MESSAGE_TYPE_SET_CANCEL,
- sizeof (struct GNUNET_SET_CancelMessage)},
- {NULL, NULL, 0, 0}
+ { &handle_client_accept, NULL,
+ GNUNET_MESSAGE_TYPE_SET_ACCEPT,
+ sizeof (struct GNUNET_SET_AcceptMessage)},
+ { &handle_client_iter_ack, NULL,
+ GNUNET_MESSAGE_TYPE_SET_ITER_ACK,
+ sizeof (struct GNUNET_SET_IterAckMessage) },
+ { &handle_client_add, NULL,
+ GNUNET_MESSAGE_TYPE_SET_ADD,
+ 0},
+ { &handle_client_create_set, NULL,
+ GNUNET_MESSAGE_TYPE_SET_CREATE,
+ sizeof (struct GNUNET_SET_CreateMessage)},
+ { &handle_client_iterate, NULL,
+ GNUNET_MESSAGE_TYPE_SET_ITER_REQUEST,
+ sizeof (struct GNUNET_MessageHeader)},
+ { &handle_client_evaluate, NULL,
+ GNUNET_MESSAGE_TYPE_SET_EVALUATE,
+ 0},
+ { &handle_client_listen, NULL,
+ GNUNET_MESSAGE_TYPE_SET_LISTEN,
+ sizeof (struct GNUNET_SET_ListenMessage)},
+ { &handle_client_reject, NULL,
+ GNUNET_MESSAGE_TYPE_SET_REJECT,
+ sizeof (struct GNUNET_SET_RejectMessage)},
+ { &handle_client_remove, NULL,
+ GNUNET_MESSAGE_TYPE_SET_REMOVE,
+ 0},
+ { &handle_client_cancel, NULL,
+ GNUNET_MESSAGE_TYPE_SET_CANCEL,
+ sizeof (struct GNUNET_SET_CancelMessage)},
+ { NULL, NULL, 0, 0}
};
- static const struct GNUNET_MESH_MessageHandler mesh_handlers[] = {
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, 0},
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_IBF, 0},
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, 0},
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_DONE, 0},
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS, 0},
- {dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_SE, 0},
+ static const struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, 0},
{NULL, 0, 0}
};
- static const uint32_t mesh_ports[] = {GNUNET_APPLICATION_TYPE_SET, 0};
+ static const uint32_t cadet_ports[] = {GNUNET_APPLICATION_TYPE_SET, 0};
configuration = cfg;
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task, NULL);
- GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL);
- GNUNET_SERVER_add_handlers (server, server_handlers);
-
- mesh = GNUNET_MESH_connect (cfg, NULL, tunnel_new_cb, tunnel_end_cb,
- mesh_handlers, mesh_ports);
- if (NULL == mesh)
+ GNUNET_SERVER_disconnect_notify (server,
+ &handle_client_disconnect, NULL);
+ GNUNET_SERVER_add_handlers (server,
+ server_handlers);
+ cadet = GNUNET_CADET_connect (cfg, NULL,
+ &channel_new_cb,
+ &channel_end_cb,
+ cadet_handlers,
+ cadet_ports);
+ if (NULL == cadet)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "could not connect to mesh\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not connect to cadet service\n"));
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "started\n");
}
* @return 0 ok, 1 on error
*/
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
int ret;
+
ret = GNUNET_SERVICE_run (argc, argv, "set",
- GNUNET_SERVICE_OPTION_NONE, &run, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit (%d)\n", GNUNET_OK != ret);
+ GNUNET_SERVICE_OPTION_NONE,
+ &run, NULL);
return (GNUNET_OK == ret) ? 0 : 1;
}
+/* end of gnunet-service-set.c */