GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
/**
* 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.
+ * 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;
* 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;
+};
+
+
+/**
+ * A listener is inhabited by a client, and
+ * waits for evaluation requests from remote peers.
+ */
+struct Listener
+{
+ /**
+ * Listeners are held in a doubly linked list.
+ */
+ struct Listener *next;
+
+ /**
+ * Listeners are held in a doubly linked list.
+ */
+ struct Listener *prev;
+
+ /**
+ * Client that owns the listener.
+ * Only one client may own a listener.
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Message queue for the client
+ */
+ 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;
};
/**
* Configuration of our local peer.
- * (Not declared 'static' as also needed in gnunet-service-set_union.c)
*/
-const struct GNUNET_CONFIGURATION_Handle *configuration;
+static const struct GNUNET_CONFIGURATION_Handle *configuration;
/**
* Handle to the mesh service, used
* to listen for and connect to remote peers.
- * (Not declared 'static' as also needed in gnunet-service-set_union.c)
*/
-struct GNUNET_MESH_Handle *mesh;
+static struct GNUNET_MESH_Handle *mesh;
/**
* Sets are held in a doubly linked list.
* The client's destroy callback will destroy the listener again. */
if (NULL != listener->client)
{
- GNUNET_SERVER_client_disconnect (listener->client);
+ struct GNUNET_SERVER_Client *client = listener->client;
listener->client = NULL;
+ GNUNET_SERVER_client_disconnect (client);
return;
}
if (NULL != listener->client_mq)
}
+/**
+ * Iterator over hash map 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.
+ */
+static int
+destroy_elements_iterator (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
+{
+ struct ElementEntry *ee = value;
+
+ GNUNET_free (ee);
+ return GNUNET_YES;
+}
+
+
/**
* Destroy a set, and free all resources associated with it.
*
set_destroy (struct Set *set)
{
/* If the client is not dead yet, destroy it.
- * The client's destroy callback will destroy the set again. */
+ * 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)
{
- GNUNET_SERVER_client_disconnect (set->client);
+ struct GNUNET_SERVER_Client *client = set->client;
set->client = NULL;
+ GNUNET_SERVER_client_disconnect (client);
return;
}
- switch (set->operation)
+ GNUNET_assert (NULL != set->state);
+ set->vt->destroy_set (set->state);
+ set->state = NULL;
+ if (NULL != set->client_mq)
{
- case GNUNET_SET_OPERATION_INTERSECTION:
- GNUNET_assert (0);
- break;
- case GNUNET_SET_OPERATION_UNION:
- _GSS_union_set_destroy (set);
- break;
- default:
- GNUNET_assert (0);
- break;
+ GNUNET_MQ_destroy (set->client_mq);
+ set->client_mq = NULL;
+ }
+ if (NULL != set->iter)
+ {
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter);
+ set->iter = NULL;
}
GNUNET_CONTAINER_DLL_remove (sets_head, sets_tail, set);
+ if (NULL != set->elements)
+ {
+ GNUNET_CONTAINER_multihashmap_iterate (set->elements,
+ destroy_elements_iterator, NULL);
+ GNUNET_CONTAINER_multihashmap_destroy (set->elements);
+ set->elements = NULL;
+ }
GNUNET_free (set);
}
struct Set *set;
struct Listener *listener;
+ 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");
}
listener = listener_get (client);
if (NULL != listener)
{
listener->client = NULL;
listener_destroy (listener);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(client's listener destroyed)\n");
}
}
static void
incoming_destroy (struct Incoming *incoming)
{
+ GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
if (NULL != incoming->tunnel)
{
struct GNUNET_MESH_Tunnel *t = incoming->tunnel;
GNUNET_MESH_tunnel_destroy (t);
return;
}
- GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
GNUNET_free (incoming);
}
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_INFO, "suggesting request with accept id %u\n", incoming->suggest_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "suggesting request with accept id %u\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.
*
- * @param cls the incoming socket
- * @param tunnel the tunnel that sent the message
- * @param tunnel_ctx the tunnel context
- * @param mh the message
+ * @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
*/
static int
-handle_p2p_operation_request (void *cls,
- struct GNUNET_MESH_Tunnel *tunnel,
- void **tunnel_ctx,
- const struct GNUNET_MessageHeader *mh)
+handle_incoming_msg (struct OperationState *op,
+ const struct GNUNET_MessageHeader *mh)
{
- struct TunnelContext *tc = *tunnel_ctx;
- struct Incoming *incoming;
+ struct Incoming *incoming = (struct Incoming *) op;
const struct OperationRequestMessage *msg = (const struct OperationRequestMessage *) mh;
struct Listener *listener;
struct OperationSpecification *spec;
- if (CONTEXT_INCOMING != tc->type)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got op request\n");
+
+ if (GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST != ntohs (mh->type))
{
- /* unexpected request */
GNUNET_break_op (0);
- /* kill the tunnel, cleaner will be called */
return GNUNET_SYSERR;
}
- incoming = tc->data.incoming;
-
if (NULL != incoming->spec)
{
/* double operation request */
}
spec = GNUNET_new (struct OperationSpecification);
- spec->context_msg =
- GNUNET_copy_message (GNUNET_MQ_extract_nested_mh (msg));
+ 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);
return GNUNET_SYSERR;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "received P2P operation request (op %u, app %s)\n",
- ntohs (msg->operation), GNUNET_h2s (&msg->app_id));
- listener = listener_get_by_target (ntohs (msg->operation), &msg->app_id);
+ 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_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"no listener matches incoming request, waiting with timeout\n");
return GNUNET_OK;
}
}
+static void
+send_client_element (struct Set *set)
+{
+ int ret;
+ struct ElementEntry *ee;
+ struct GNUNET_MQ_Envelope *ev;
+
+ GNUNET_assert (NULL != set->iter);
+ 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);
+ }
+ 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;
+ }
+ GNUNET_MQ_send (set->client_mq, ev);
+}
+
+
+/**
+ * Called when a client wants to iterate the elements of a set.
+ *
+ * @param cls unused
+ * @param client client that sent the message
+ * @param m message sent by the client
+ */
+static void
+handle_client_iterate (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *m)
+{
+ struct Set *set;
+
+ set = set_get (client);
+ if (NULL == set)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
+ }
+
+ if (NULL != set->iter)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
+ }
+ 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);
+ set->iter = GNUNET_CONTAINER_multihashmap_iterator_create (set->elements);
+ send_client_element (set);
+}
+
+
/**
* Called when a client wants to create a new set.
*
struct GNUNET_SET_CreateMessage *msg = (struct GNUNET_SET_CreateMessage *) m;
struct Set *set;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "client created new set (operation %u)\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client created new set (operation %u)\n",
ntohs (msg->operation));
if (NULL != set_get (client))
return;
}
- set = NULL;
+ set = GNUNET_new (struct Set);
switch (ntohs (msg->operation))
{
case GNUNET_SET_OPERATION_INTERSECTION:
- //set = _GSS_intersection_set_create ();
+ // FIXME
break;
case GNUNET_SET_OPERATION_UNION:
- set = _GSS_union_set_create ();
+ set->vt = _GSS_union_vt ();
break;
default:
+ GNUNET_free (set);
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
return;
}
- GNUNET_assert (NULL != set);
-
+ 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);
listener->client = client;
listener->client_mq = GNUNET_MQ_queue_for_server_client (client);
listener->app_id = msg->app_id;
- listener->operation = ntohs (msg->operation);
+ listener->operation = ntohl (msg->operation);
GNUNET_CONTAINER_DLL_insert_tail (listeners_head, listeners_tail, listener);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "new listener created (op %u, app %s)\n",
+ 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)
{
- if ( (NULL == incoming->spec) ||
- (0 != incoming->suggest_id) )
+ 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);
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "considered all incoming requests\n");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-/**
- * Called when a client wants to remove an element
- * from the 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;
-
- set = set_get (client);
- if (NULL == set)
- {
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
- }
- switch (set->operation)
- {
- case GNUNET_SET_OPERATION_UNION:
- _GSS_union_remove ((struct GNUNET_SET_ElementMessage *) m, set);
- break;
- case GNUNET_SET_OPERATION_INTERSECTION:
- //_GSS_intersection_remove ((struct GNUNET_SET_ElementMessage *) m, set);
- break;
- default:
- GNUNET_assert (0);
- break;
- }
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-
/**
* Called when the client wants to reject an operation
* request from another peer.
const struct GNUNET_MessageHeader *m)
{
struct Incoming *incoming;
- struct GNUNET_SET_AcceptRejectMessage *msg = (struct GNUNET_SET_AcceptRejectMessage *) m;
+ const struct GNUNET_SET_AcceptRejectMessage *msg;
+ msg = (const struct GNUNET_SET_AcceptRejectMessage *) m;
GNUNET_break (0 == ntohl (msg->request_id));
incoming = get_incoming (ntohl (msg->accept_reject_id));
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "peer request rejected by client\n");
+ 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);
}
-
/**
* Called when a client wants to add an element to a
* set it inhabits.
* @param m message sent by the client
*/
static void
-handle_client_add (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+handle_client_add_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;
set = set_get (client);
if (NULL == set)
GNUNET_SERVER_client_disconnect (client);
return;
}
- switch (set->operation)
+ 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);
+ el.data = &msg[1];
+ if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type))
{
- case GNUNET_SET_OPERATION_UNION:
- _GSS_union_add ((struct GNUNET_SET_ElementMessage *) m, set);
- break;
- case GNUNET_SET_OPERATION_INTERSECTION:
- //_GSS_intersection_add ((struct GNUNET_SET_ElementMessage *) m, set);
- break;
- default:
- GNUNET_assert (0);
- break;
- }
+ struct GNUNET_HashCode hash;
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ 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);
+ }
+ else
+ {
+ 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);
+ }
}
spec->app_id = msg->app_id;
spec->salt = ntohl (msg->salt);
spec->peer = msg->target_peer;
+ spec->set = set;
+ 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_APPLICATION_TYPE_SET,
+ GNUNET_YES,
+ GNUNET_YES);
- switch (set->operation)
- {
- case GNUNET_SET_OPERATION_INTERSECTION:
- tc->type = CONTEXT_OPERATION_INTERSECTION;
- //_GSS_intersection_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set);
- break;
- case GNUNET_SET_OPERATION_UNION:
- tc->type = CONTEXT_OPERATION_UNION;
- tc->data.union_op =
- _GSS_union_evaluate (spec, tunnel);
- break;
- default:
- GNUNET_assert (0);
- break;
- }
+ set->vt->evaluate (spec, tunnel, tc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* @param m the message
*/
static void
-handle_client_ack (void *cls,
+handle_client_iter_ack (void *cls,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *m)
{
- /* FIXME: implement */
+ struct Set *set;
+
+ set = set_get (client);
+ if (NULL == set)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
+ }
+
+ if (NULL == set->iter)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (client);
+ return;
+ }
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ send_client_element (set);
+}
+
+
+/**
+ * Handle a request from the client to accept
+ * a set operation that came from a remote peer.
+ *
+ * @param cls unused
+ * @param client the client
+ * @param mh the message
+ */
+static void
+handle_client_cancel (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *mh)
+{
+ const struct GNUNET_SET_CancelMessage *msg =
+ (const struct GNUNET_SET_CancelMessage *) mh;
+ struct Set *set;
+
+ set = set_get (client);
+ if (NULL == set)
+ {
+ 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));
}
struct Set *set;
struct Incoming *incoming;
struct GNUNET_SET_AcceptRejectMessage *msg = (struct GNUNET_SET_AcceptRejectMessage *) mh;
- struct GNUNET_MESH_Tunnel *tunnel;
- struct TunnelContext *tc;
- struct OperationSpecification *spec;
incoming = get_incoming (ntohl (msg->accept_reject_id));
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "client accepting %u\n", ntohl (msg->accept_reject_id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client accepting %u\n", ntohl (msg->accept_reject_id));
if (NULL == incoming)
{
return;
}
- tc = GNUNET_new (struct TunnelContext);
- tunnel = GNUNET_MESH_tunnel_create (mesh, tc, &incoming->spec->peer,
- GNUNET_APPLICATION_TYPE_SET);
- spec = GNUNET_new (struct OperationSpecification);
-
- switch (set->operation)
- {
- case GNUNET_SET_OPERATION_INTERSECTION:
- tc->type = CONTEXT_OPERATION_INTERSECTION;
- // _GSS_intersection_accept (msg, set, incoming);
- break;
- case GNUNET_SET_OPERATION_UNION:
- tc->type = CONTEXT_OPERATION_UNION;
- tc->data.union_op = _GSS_union_accept (spec, tunnel);
- break;
- default:
- GNUNET_assert (0);
- break;
- }
-
- /* note: _GSS_*_accept has to make sure the tunnel and mq are set to NULL,
- * otherwise they will be destroyed and disconnected */
+ incoming->spec->set = set;
+ incoming->spec->client_request_id = ntohl (msg->request_id);
+ 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);
}
shutdown_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != mesh)
- {
- GNUNET_MESH_disconnect (mesh);
- mesh = NULL;
- }
-
while (NULL != incoming_head)
incoming_destroy (incoming_head);
while (NULL != sets_head)
set_destroy (sets_head);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "handled shutdown request\n");
-}
+ /* it's important to destroy mesh at the end, as tunnels
+ * must be destroyed first! */
+ if (NULL != mesh)
+ {
+ GNUNET_MESH_disconnect (mesh);
+ mesh = NULL;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled shutdown request\n");
+}
/**
{
struct Incoming *incoming = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "remote peer timed out\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "remote peer timed out\n");
+ incoming_destroy (incoming);
+}
+
+
+static void
+handle_incoming_disconnect (struct OperationState *op_state)
+{
+ struct Incoming *incoming = (struct Incoming *) op_state;
+ if (NULL == incoming->tunnel)
+ return;
+
incoming_destroy (incoming);
}
uint32_t port)
{
struct Incoming *incoming;
- struct TunnelContext *tc;
+ static const struct SetVT incoming_vt = {
+ .msg_handler = handle_incoming_msg,
+ .peer_disconnect = handle_incoming_disconnect
+ };
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "new incoming tunnel\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "new incoming tunnel\n");
GNUNET_assert (port == GNUNET_APPLICATION_TYPE_SET);
- tc = GNUNET_new (struct TunnelContext);
incoming = GNUNET_new (struct Incoming);
incoming->peer = *initiator;
incoming->tunnel = tunnel;
- tc->data.incoming = incoming;
- tc->type = CONTEXT_INCOMING;
- incoming->timeout_task =
+ 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 tc;
+ return incoming->tc;
}
{
struct TunnelContext *ctx = tunnel_ctx;
- switch (ctx->type)
- {
- case CONTEXT_INCOMING:
- incoming_destroy (ctx->data.incoming);
- break;
- case CONTEXT_OPERATION_UNION:
- _GSS_union_operation_destroy (ctx->data.union_op);
- break;
- case CONTEXT_OPERATION_INTERSECTION:
- GNUNET_assert (0);
- /* FIXME: cfuchs */
- break;
- default:
- GNUNET_assert (0);
- }
-
+ ctx->vt->peer_disconnect (ctx->op);
+ /* mesh will never call us with the context again! */
GNUNET_free (tunnel_ctx);
}
+/**
+ * Functions with this signature are called whenever a message is
+ * received.
+ *
+ * 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.
+ *
+ * @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.
+ *
+ * @return GNUNET_OK to keep the tunnel open,
+ * GNUNET_SYSERR to close it (signal serious error).
+ */
+static int
+dispatch_p2p_message (void *cls,
+ struct GNUNET_MESH_Tunnel *tunnel,
+ void **tunnel_ctx,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct TunnelContext *tc = *tunnel_ctx;
+ int ret;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dispatching mesh 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",
+ ntohs (message->type));
+ return ret;
+}
+
+
/**
* Function called by the service's run
* method to run service-specific setup code.
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
- {handle_client_accept, NULL, GNUNET_MESSAGE_TYPE_SET_ACCEPT, 0},
- {handle_client_ack, NULL, GNUNET_MESSAGE_TYPE_SET_ACK, 0},
- {handle_client_add, NULL, GNUNET_MESSAGE_TYPE_SET_ADD, 0},
- {handle_client_create, NULL, GNUNET_MESSAGE_TYPE_SET_CREATE, 0},
+ {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, 0},
- {handle_client_reject, NULL, GNUNET_MESSAGE_TYPE_SET_REJECT, 0},
- {handle_client_remove, NULL, GNUNET_MESSAGE_TYPE_SET_REMOVE, 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_REMOVE,
+ sizeof (struct GNUNET_SET_CancelMessage)},
{NULL, NULL, 0, 0}
};
static const struct GNUNET_MESH_MessageHandler mesh_handlers[] = {
- {handle_p2p_operation_request,
- GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, 0},
- /* messages for the union operation */
- {_GSS_union_handle_p2p_message,
- GNUNET_MESSAGE_TYPE_SET_P2P_IBF, 0},
- {_GSS_union_handle_p2p_message,
- GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, 0},
- {_GSS_union_handle_p2p_message,
- GNUNET_MESSAGE_TYPE_SET_P2P_DONE, 0},
- {_GSS_union_handle_p2p_message,
- GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS, 0},
- {_GSS_union_handle_p2p_message,
- GNUNET_MESSAGE_TYPE_SET_P2P_SE, 0},
- /* FIXME: messages for intersection operation */
+ {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},
{NULL, 0, 0}
};
static const uint32_t mesh_ports[] = {GNUNET_APPLICATION_TYPE_SET, 0};
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "service started\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "started\n");
}
int ret;
ret = GNUNET_SERVICE_run (argc, argv, "set",
GNUNET_SERVICE_OPTION_NONE, &run, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit (%d)\n", GNUNET_OK != ret);
return (GNUNET_OK == ret) ? 0 : 1;
}