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
#define GNUNET_SERVICE_SET_H_PRIVATE
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_applications.h"
-#include "gnunet_util_lib.h"
#include "gnunet_core_service.h"
-#include "gnunet_mesh2_service.h"
+#include "gnunet_mesh_service.h"
#include "gnunet_set_service.h"
#include "set.h"
-/* FIXME: cfuchs */
-struct IntersectionState;
-
-
-/* FIXME: cfuchs */
-struct IntersectionOperation;
-
-
/**
- * Extra state required for set union.
+ * Implementation-specific set state.
+ * Used as opaque pointer, and specified further
+ * in the respective implementation.
*/
-struct UnionState;
-
-/**
- * State of a union operation being evaluated.
- */
-struct UnionEvaluateOperation;
-
+struct SetState;
/**
- * A set that supports a specific operation
- * with other peers.
+ * Implementation-specific set operation.
+ * Used as opaque pointer, and specified further
+ * in the respective implementation.
*/
-struct Set
-{
- /**
- * Client that owns the set.
- * Only one client may own a set.
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * Message queue for the client
- */
- struct GNUNET_MQ_Handle *client_mq;
+struct OperationState;
- /**
- * Type of operation supported for this set
- */
- uint32_t operation; // use enum from API
-
- /**
- * Sets are held in a doubly linked list.
- */
- struct Set *next;
-
- /**
- * Sets are held in a doubly linked list.
- */
- struct Set *prev;
- /**
- * Appropriate state for each type of
- * operation.
- */
- union {
- struct IntersectionState *i;
- struct UnionState *u;
- } state;
-};
+/* forward declarations */
+struct Set;
+struct ElementEntry;
+struct Operation;
/**
uint32_t salt;
/**
- * ID used to identify responses to a client.
+ * Remote peers element count
+ */
+ uint32_t remote_element_count;
+
+ /**
+ * ID used to identify an operation between service and client
*/
uint32_t client_request_id;
* with a set.
*/
struct Set *set;
+
+ /**
+ * When are elements sent to the client, and which elements are sent?
+ */
+ enum GNUNET_SET_ResultMode result_mode;
};
+
+
/**
- * A listener is inhabited by a client, and
- * waits for evaluation requests from remote peers.
+ * Signature of functions that create the implementation-specific
+ * state for a set supporting a specific operation.
+ *
+ * @return a set state specific to the supported operation
+ */
+typedef struct SetState *(*CreateImpl) (void);
+
+
+/**
+ * Signature of functions that implement the add/remove functionality
+ * for a set supporting a specific operation.
+ *
+ * @param set implementation-specific set state
+ * @param msg element message from the client
+ */
+typedef void (*AddRemoveImpl) (struct SetState *state, struct ElementEntry *ee);
+
+
+/**
+ * Signature of functions that handle disconnection
+ * of the remote peer.
+ *
+ * @param op the set operation, contains implementation-specific data
+ */
+typedef void (*PeerDisconnectImpl) (struct Operation *op);
+
+
+/**
+ * Signature of functions that implement the destruction of the
+ * implementation-specific set state.
+ *
+ * @param state the set state, contains implementation-specific data
+ */
+typedef void (*DestroySetImpl) (struct SetState *state);
+
+
+/**
+ * Signature of functions that implement the creation of set operations
+ * (currently evaluate and accept).
+ *
+ * @param op operation that is created, should be initialized by the implementation
*/
-struct Listener
+typedef void (*OpCreateImpl) (struct Operation *op);
+
+
+/**
+ * Signature of functions that implement the message handling for
+ * the different set operations.
+ *
+ * @param op operation state
+ * @param msg received message
+ * @return GNUNET_OK on success, GNUNET_SYSERR to
+ * destroy the operation and the tunnel
+ */
+typedef int (*MsgHandlerImpl) (struct Operation *op,
+ const struct GNUNET_MessageHeader *msg);
+
+/**
+ * Signature of functions that implement operation cancellation
+ *
+ * @param op operation state
+ */
+typedef void (*CancelImpl) (struct Operation *op);
+
+
+/**
+ * Dispatch table for a specific set operation.
+ * Every set operation has to implement the callback
+ * in this struct.
+ */
+struct SetVT
{
/**
- * Listeners are held in a doubly linked list.
+ * Callback for the set creation.
*/
- struct Listener *next;
+ CreateImpl create;
/**
- * Listeners are held in a doubly linked list.
+ * Callback for element insertion
*/
- struct Listener *prev;
+ AddRemoveImpl add;
/**
- * Client that owns the listener.
- * Only one client may own a listener.
+ * Callback for element removal.
*/
- struct GNUNET_SERVER_Client *client;
+ AddRemoveImpl remove;
/**
- * Message queue for the client
+ * Callback for accepting a set operation request
*/
- struct GNUNET_MQ_Handle *client_mq;
+ OpCreateImpl accept;
/**
- * The type of the operation.
+ * Callback for starting evaluation with a remote peer.
*/
- enum GNUNET_SET_OperationType operation;
+ OpCreateImpl evaluate;
/**
- * Application ID for the operation, used to distinguish
- * multiple operations of the same type with the same peer.
+ * Callback for destruction of the set state.
*/
- struct GNUNET_HashCode app_id;
+ DestroySetImpl destroy_set;
+
+ /**
+ * Callback for handling operation-specific messages.
+ */
+ MsgHandlerImpl msg_handler;
+
+ /**
+ * Callback for handling the remote peer's
+ * disconnect.
+ */
+ PeerDisconnectImpl peer_disconnect;
+
+ /**
+ * Callback for canceling an operation by
+ * its ID.
+ */
+ CancelImpl cancel;
};
/**
- * 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.
+ * Information about an element element in the set.
+ * All elements are stored in a hash-table
+ * from their hash-code to their 'struct Element',
+ * so that the remove and add operations are reasonably
+ * fast.
*/
-struct Incoming;
+struct ElementEntry
+{
+ /**
+ * The actual element. The data for the element
+ * should be allocated at the end of this struct.
+ */
+ struct GNUNET_SET_Element element;
+ /**
+ * Hash of the element.
+ * For set union:
+ * Will be used to derive the different IBF keys
+ * for different salts.
+ */
+ struct GNUNET_HashCode element_hash;
+
+ /**
+ * Generation the element was added by the client.
+ * Operations of earlier generations will not consider the element.
+ */
+ unsigned int generation_added;
-/**
- * Different types a tunnel can be.
- */
-enum TunnelContextType {
/**
- * Tunnel is waiting for a set request from the tunnel,
- * or for the ack/nack of the client for a received request.
+ * GNUNET_YES if the element has been removed in some generation.
*/
- CONTEXT_INCOMING,
+ int removed;
/**
- * The tunnel performs a union operation.
+ * Generation the element was removed by the client.
+ * Operations of later generations will not consider the element.
+ * Only valid if is_removed is GNUNET_YES.
*/
- CONTEXT_OPERATION_UNION,
+ unsigned int generation_removed;
/**
- * The tunnel performs an intersection operation.
+ * GNUNET_YES if the element is a remote element, and does not belong
+ * to the operation's set.
+ *
+ * //TODO: Move to Union, unless additional set-operations are implemented ever
*/
- CONTEXT_OPERATION_INTERSECTION,
+ int remote;
};
-/**
- * State associated with the tunnel, dependent on
- * tunnel type.
- */
-union TunnelContextData
+struct Operation
{
/**
- * Valid for tag 'CONTEXT_INCOMING'
+ * V-Table for the operation belonging
+ * to the tunnel contest.
+ *
+ * Used for all operation specific operations after receiving the ops request
*/
- struct Incoming *incoming;
+ const struct SetVT *vt;
/**
- * Valid for tag 'CONTEXT_OPERATION_UNION'
+ * Tunnel to the peer.
*/
- struct UnionEvaluateOperation *union_op;
+ struct GNUNET_MESH_Channel *channel;
/**
- * Valid for tag 'CONTEXT_OPERATION_INTERSECTION'
+ * Message queue for the tunnel.
*/
- struct IntersectionEvaluateOperation *intersection_op;
-};
+ struct GNUNET_MQ_Handle *mq;
-/**
- * Information about a tunnel we are connected to.
- * Used as tunnel context with mesh.
- */
-struct TunnelContext
-{
/**
- * Type of the tunnel.
+ * GNUNET_YES if this is not a "real" set operation yet, and we still
+ * need to wait for the other peer to give us more details.
*/
- enum TunnelContextType type;
+ int is_incoming;
/**
- * State associated with the tunnel, dependent on
- * tunnel type.
+ * Generation in which the operation handle
+ * was created.
*/
- union TunnelContextData data;
-};
+ unsigned int generation_created;
+ /**
+ * Detail information about the set operation,
+ * including the set to use.
+ * When 'spec' is NULL, the operation is not yet entirely
+ * initialized.
+ */
+ struct OperationSpecification *spec;
+ /**
+ * Operation-specific operation state.
+ */
+ struct OperationState *state;
-/**
- * Configuration of the local peer
- */
-extern const struct GNUNET_CONFIGURATION_Handle *configuration;
+ /**
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct Operation *next;
+
+ /**
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct Operation *prev;
-extern struct GNUNET_MESH_Handle *mesh;
+ /**
+ * Set to GNUNET_YES if the set service should not free
+ * the operation, as it is still needed (e.g. in some scheduled task).
+ */
+ int keep;
+};
/**
- * Create a new set supporting the union operation
- *
- * @return the newly created set
+ * A set that supports a specific operation
+ * with other peers.
*/
-struct Set *
-_GSS_union_set_create (void);
+struct Set
+{
+ /**
+ * Client that owns the set.
+ * Only one client may own a set.
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Message queue for the client
+ */
+ struct GNUNET_MQ_Handle *client_mq;
+ /**
+ * Type of operation supported for this set
+ */
+ enum GNUNET_SET_OperationType operation;
-/**
- * Evaluate a union operation with
- * a remote peer.
- *
- * @param spec specification of the operation the evaluate
- * @param tunnel tunnel already connected to the partner peer
- * @param set the set to evaluate the operation with
- * @return a handle to the operation
- */
-struct UnionEvaluateOperation *
-_GSS_union_evaluate (struct OperationSpecification *spec,
- struct GNUNET_MESH_Tunnel *tunnel);
+ /**
+ * Virtual table for this set.
+ * Determined by the operation type of this set.
+ *
+ * Used only for Add/remove of elements and when receiving an incoming
+ * operation from a remote peer.
+ */
+ const struct SetVT *vt;
+ /**
+ * Sets are held in a doubly linked list.
+ */
+ struct Set *next;
-/**
- * Add the element from the given element message to the set.
- *
- * @param m message with the element
- * @param set set to add the element to
- */
-void
-_GSS_union_add (struct GNUNET_SET_ElementMessage *m, struct Set *set);
+ /**
+ * Sets are held in a doubly linked list.
+ */
+ struct Set *prev;
+ /**
+ * Implementation-specific state.
+ */
+ struct SetState *state;
-/**
- * Remove the element given in the element message from the set.
- * Only marks the element as removed, so that older set operations can still exchange it.
- *
- * @param m message with the element
- * @param set set to remove the element from
- */
-void
-_GSS_union_remove (struct GNUNET_SET_ElementMessage *m, struct Set *set);
+ /**
+ * Current state of iterating elements for the client.
+ * NULL if we are not currently iterating.
+ */
+ struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
+ /**
+ * Maps 'struct GNUNET_HashCode' to 'struct ElementEntry'.
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *elements;
-/**
- * Destroy a set that supports the union operation
- *
- * @param set the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
- */
-void
-_GSS_union_set_destroy (struct Set *set);
+ /**
+ * Current generation, that is, number of
+ * previously executed operations on this set
+ */
+ unsigned int current_generation;
+
+ /**
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct Operation *ops_head;
+
+ /**
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct Operation *ops_tail;
+};
/**
- * Accept an union operation request from a remote peer
+ * 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 spec all necessary information about the operation
- * @param tunnel open tunnel to the partner's peer
- * @return operation
+ * @param op operation to destroy
*/
-struct UnionEvaluateOperation *
-_GSS_union_accept (struct OperationSpecification *spec,
- struct GNUNET_MESH_Tunnel *tunnel);
+void
+_GSS_operation_destroy (struct Operation *op);
/**
- * Destroy a union operation, and free all resources
- * associated with it.
+ * Get the table with implementing functions for
+ * set union.
*
- * @param eo the union operation to destroy
+ * @return the operation specific VTable
*/
-void
-_GSS_union_operation_destroy (struct UnionEvaluateOperation *eo);
+const struct SetVT *
+_GSS_union_vt (void);
/**
- * Dispatch messages for a union operation.
+ * Get the table with implementing functions for
+ * set intersection.
*
- * @param cls closure
- * @param tunnel mesh tunnel
- * @param tunnel_ctx tunnel context
- * @param mh message to process
- * @return ???
+ * @return the operation specific VTable
*/
-int
-_GSS_union_handle_p2p_message (void *cls,
- struct GNUNET_MESH_Tunnel *tunnel,
- void **tunnel_ctx,
- const struct GNUNET_MessageHeader *mh);
+const struct SetVT *
+_GSS_intersection_vt (void);
#endif
projects / oweals / gnunet.git / blobdiff