* @author Christian Grothoff
*/
#include "gnunet-service-set.h"
-#include "set_protocol.h"
-
+#include "gnunet-service-set_protocol.h"
/**
- * State of an operation where the peer has connected to us, but is not yet
- * evaluating a set operation. Once the peer has sent a concrete request, and
- * the client has accepted or rejected it, this information will be deleted
- * and replaced by the real set operation state.
+ * How long do we hold on to an incoming channel if there is
+ * no local listener before giving up?
*/
-struct OperationState
-{
- /**
- * 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;
-
- /**
- * Timeout task, if the incoming peer has not been accepted
- * after the timeout, it will be disconnected.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * 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;
-
-};
-
+#define INCOMING_CHANNEL_TIMEOUT GNUNET_TIME_UNIT_MINUTES
/**
* A listener is inhabited by a client, and waits for evaluation
struct Operation *op;
for (op = incoming_head; NULL != op; op = op->next)
- if (op->state->suggest_id == id)
+ if (op->suggest_id == id)
{
- // FIXME: remove this assertion once the corresponding bug is gone!
GNUNET_assert (GNUNET_YES == op->is_incoming);
return op;
}
listener->client = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "disconnecting listener client\n");
+ "Disconnecting listener client\n");
GNUNET_SERVER_client_disconnect (client);
return;
}
GNUNET_assert (GNUNET_NO == op->is_incoming);
GNUNET_assert (NULL != op->spec);
set = op->spec->set;
- GNUNET_CONTAINER_DLL_remove (op->spec->set->ops_head,
- op->spec->set->ops_tail,
+ GNUNET_CONTAINER_DLL_remove (set->ops_head,
+ set->ops_tail,
op);
op->vt->cancel (op);
op->vt = NULL;
{
GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
set->iter = NULL;
+ set->iteration_id++;
}
if (NULL != set->elements)
{
GNUNET_CONTAINER_DLL_remove (incoming_head,
incoming_tail,
incoming);
- if (GNUNET_SCHEDULER_NO_TASK != incoming->state->timeout_task)
+ if (GNUNET_SCHEDULER_NO_TASK != incoming->timeout_task)
{
- GNUNET_SCHEDULER_cancel (incoming->state->timeout_task);
- incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (incoming->timeout_task);
+ incoming->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_assert (NULL != incoming->state);
- GNUNET_free (incoming->state);
/* make sure that the tunnel end handler will not destroy us again */
incoming->vt = NULL;
- incoming->state = NULL;
+ if (NULL != incoming->spec)
+ {
+ GNUNET_free (incoming->spec);
+ incoming->spec = NULL;
+ }
if (NULL != incoming->mq)
{
GNUNET_MQ_destroy (incoming->mq);
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) &&
- (0 == GNUNET_CRYPTO_hash_cmp (app_id, &l->app_id)) )
- 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. The listening client can
* then accept or reject the remote request.
struct GNUNET_SET_RequestMessage *cmsg;
GNUNET_assert (GNUNET_YES == incoming->is_incoming);
- GNUNET_assert (NULL != incoming->state);
GNUNET_assert (NULL != incoming->spec);
- GNUNET_assert (0 == incoming->state->suggest_id);
- incoming->state->suggest_id = suggest_id++;
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != incoming->state->timeout_task);
- GNUNET_SCHEDULER_cancel (incoming->state->timeout_task);
- incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
+ 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,
incoming->spec->context_msg);
GNUNET_assert (NULL != mqm);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "suggesting request with accept id %u\n",
- incoming->state->suggest_id);
- cmsg->accept_id = htonl (incoming->state->suggest_id);
+ "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);
}
/**
- * 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.
+ * 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
const struct OperationRequestMessage *msg;
struct Listener *listener;
struct OperationSpecification *spec;
+ const struct GNUNET_MessageHeader *nested_context;
msg = (const struct OperationRequestMessage *) mh;
GNUNET_assert (GNUNET_YES == op->is_incoming);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "got op request\n");
-
if (GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST != ntohs (mh->type))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
-
/* double operation request */
if (NULL != op->spec)
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
-
spec = GNUNET_new (struct OperationSpecification);
- spec->context_msg = GNUNET_MQ_extract_nested_mh (msg);
- // for simplicity we just backup the context msg instead of rebuilding it later on
+ 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;
+ }
+ /* 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 (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->state->peer;
+ spec->peer = op->peer;
spec->remote_element_count = ntohl (msg->element_count);
-
op->spec = spec;
- if ( (NULL != spec->context_msg) &&
- (ntohs (spec->context_msg->size) > GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE) )
- {
- GNUNET_break_op (0);
- 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);
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;
}
+ 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;
}
* 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
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,
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);
+ 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
{
struct Set *set;
- // iterate over a non existing set
set = set_get (client);
if (NULL == set)
{
+ /* attempt to iterate over a non existing set */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
- // only one concurrent iterate-action per set
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",
+ "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
msg = (const struct GNUNET_SET_CreateMessage *) m;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client created new set (operation %u)\n",
+ "Client created new set (operation %u)\n",
ntohs (msg->operation));
-
- // max. one set per client!
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 (ntohl (msg->operation))
{
case GNUNET_SET_OPERATION_INTERSECTION:
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 Operation *op;
msg = (const struct GNUNET_SET_ListenMessage *) m;
- /* max. one per client! */
if (NULL != listener_get (client))
{
+ /* max. one active listener per client! */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
listener = GNUNET_new (struct Listener);
listener->client = client;
listener->client_mq = GNUNET_MQ_queue_for_server_client (client);
listeners_tail,
listener);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "new listener created (op %u, app %s)\n",
+ "New listener created (op %u, app %s)\n",
listener->operation,
GNUNET_h2s (&listener->app_id));
- /* check for incoming requests the listener is interested in */
+ /* check for existing incoming requests the listener might be interested in */
for (op = incoming_head; NULL != op; op = op->next)
{
if (NULL == op->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",
- op->spec->operation,
- GNUNET_h2s (&op->spec->app_id),
- op->state->suggest_id);
-
- /* don't consider the incoming request if it has been already suggested to a listener */
- if (0 != op->state->suggest_id)
- continue;
+ 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;
- if (0 != GNUNET_CRYPTO_hash_cmp (&listener->app_id, &op->spec->app_id))
- continue;
+ 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,
- "request suggested\n");
- incoming_suggest (op, listener);
+ "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);
}
const struct GNUNET_SET_RejectMessage *msg;
msg = (const struct GNUNET_SET_RejectMessage *) m;
- GNUNET_break (0 == ntohl (msg->request_id));
-
- // no matching incoming operation for this reject
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");
-
+ "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);
- //channel destruction handler called immediately upon destruction
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * Called when a client wants to add/remove an element to/from 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;
- // client without a set requested an operation
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_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 = (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);
-
- // for simplicity we just backup the context msg instead of rebuilding it later on
- if (NULL != spec->context_msg)
- spec->context_msg = GNUNET_copy_message (spec->context_msg);
-
+ 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);
-
+ 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);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ set->vt->evaluate (op,
+ context);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * Handle an ack from a client, and send the next element.
+ * 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
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *m)
{
+ const struct GNUNET_SET_IterAckMessage *ack;
struct Set *set;
- // client without a set requested an operation
set = set_get (client);
if (NULL == set)
{
+ /* client without a set acknowledged receiving a value */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
- // client sent an ack, but we were not expecting one
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++;
+ }
}
struct Operation *op;
int found;
- // client without a set requested an operation
set = set_get (client);
if (NULL == set)
{
+ /* client without a set requested an operation */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client requested cancel for op %u\n",
+ "Client requested cancel for op %u\n",
ntohl (msg->request_id));
-
found = GNUNET_NO;
for (op = set->ops_head; NULL != op; op = op->next)
{
break;
}
}
-
- /* It may happen that the operation was destroyed due to
- * the other peer disconnecting. The client may not know about this
- * yet and try to cancel the (non non-existent) operation.
- */
- if (GNUNET_NO != found)
+ 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);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "client canceled non-existent op\n");
-
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ }
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
/**
- * 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
+ * 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
struct Set *set;
const struct GNUNET_SET_AcceptMessage *msg;
struct Operation *op;
+ struct GNUNET_SET_ResultMessage *result_message;
+ struct GNUNET_MQ_Envelope *ev;
msg = (const struct GNUNET_SET_AcceptMessage *) mh;
-
- // client without a set requested an operation
set = set_get (client);
-
if (NULL == set)
{
+ /* client without a set requested to accept */
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (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. */
if (NULL == op)
{
- struct GNUNET_SET_ResultMessage *result_message;
- struct GNUNET_MQ_Envelope *ev;
- ev = GNUNET_MQ_msg (result_message, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ /* 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_log (GNUNET_ERROR_TYPE_DEBUG,
- "client accepting %u\n",
+ "Client accepting request %u\n",
ntohl (msg->accept_reject_id));
-
- GNUNET_assert (GNUNET_YES == op->is_incoming);
-
-
- op->spec->set = set;
-
GNUNET_assert (GNUNET_YES == op->is_incoming);
op->is_incoming = GNUNET_NO;
- GNUNET_assert (NULL != op->state);
- GNUNET_free (op->state);
- op->state = NULL;
GNUNET_CONTAINER_DLL_remove (incoming_head,
incoming_tail,
op);
-
- GNUNET_assert (NULL != op->spec->set);
- GNUNET_assert (NULL != op->spec->set->vt);
-
+ 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 = op->spec->set->vt;
- GNUNET_assert (NULL != op->vt->accept);
- set->vt->accept (op);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ 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);
{
struct Operation *incoming = cls;
- incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ 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");
+ "Remote peer's incoming request timed out\n");
incoming_destroy (incoming);
}
/**
- * 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().
+ * 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
* @param port Port this channel is for.
* @param options Unused.
* @return initial channel context for the channel
- * (can be NULL -- that's not an error)
+ * returns NULL on error
*/
static void *
channel_new_cb (void *cls,
- struct GNUNET_CADET_Channel *channel,
- const struct GNUNET_PeerIdentity *initiator,
- uint32_t port, enum GNUNET_CADET_ChannelOption options)
+ struct GNUNET_CADET_Channel *channel,
+ const struct GNUNET_PeerIdentity *initiator,
+ uint32_t port,
+ enum GNUNET_CADET_ChannelOption options)
{
- struct Operation *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
};
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "new incoming channel\n");
+ struct Operation *incoming;
if (GNUNET_APPLICATION_TYPE_SET != port)
{
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->state = GNUNET_new (struct OperationState);
- incoming->state->peer = *initiator;
+ incoming->peer = *initiator;
incoming->channel = channel;
incoming->mq = GNUNET_CADET_mq_create (incoming->channel);
incoming->vt = &incoming_vt;
- incoming->state->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ 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;
}
* 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
+ * when a peer creates a new channel with us (#channel_new_cb()), or once we create
* a new channel ourselves (evaluate).
*
* Once we know the exact type of operation (union/intersection), the vt is
struct Operation *op = channel_ctx;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "channel end cb called\n");
+ "channel_end_cb called\n");
op->channel = NULL;
/* the vt can be null if a client already requested canceling op. */
if (NULL != op->vt)
"calling peer disconnect due to channel end\n");
op->vt->peer_disconnect (op);
}
-
- if (GNUNET_YES == op->keep)
- return;
-
- /* cadet will never call us with the context again! */
- GNUNET_free (channel_ctx);
+ 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");
+ "channel_end_cb finished\n");
}
int ret;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "dispatching cadet message (type: %u)\n",
+ "Dispatching cadet message (type: %u)\n",
ntohs (message->type));
/* 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);
+ ret = op->vt->msg_handler (op,
+ message);
else
ret = GNUNET_SYSERR;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "handled cadet message (type: %u)\n",
+ "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_AcceptMessage)},
- {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_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_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_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_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_BF_PART, 0},
+ { &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 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);
-
- cadet = GNUNET_CADET_connect (cfg, NULL, channel_new_cb, channel_end_cb,
- cadet_handlers, cadet_ports);
+ 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,
* @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_SERVICE_OPTION_NONE,
+ &run, NULL);
return (GNUNET_OK == ret) ? 0 : 1;
}
/* end of gnunet-service-set.c */
-
projects / oweals / gnunet.git / blobdiff