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
* @brief two-peer set operations
* @author Florian Dold
*/
-
-
+#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet-service-set.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
#include "ibf.h"
#include "strata_estimator.h"
#include "set_protocol.h"
/**
* hash num parameter for the difference digests and strata estimators
*/
-#define SE_IBF_HASH_NUM 3
+#define SE_IBF_HASH_NUM 4
/**
* Number of buckets that can be transmitted in one message.
*/
#define MAX_IBF_ORDER (16)
-
-enum UnionOperationState
-{
- STATE_EXPECT_SE,
- STATE_EXPECT_IBF,
- STATE_EXPECT_IBF_CONT,
- STATE_EXPECT_ELEMENTS,
- STATE_EXPECT_ELEMENTS_AND_REQUESTS,
- STATE_WAIT_SENT_DONE,
- STATE_FINISHED
-};
+/**
+ * Number of buckets used in the ibf per estimated
+ * difference.
+ */
+#define IBF_ALPHA 4
/**
- * State of an evaluate operation
- * with another peer.
+ * Current phase we are in for a union operation.
*/
-struct UnionEvaluateOperation
+enum UnionOperationPhase
{
/**
- * Local set the operation is evaluated on
+ * We sent the request message, and expect a strata estimator
*/
- struct Set *set;
-
+ PHASE_EXPECT_SE,
/**
- * Peer with the remote set
+ * We sent the strata estimator, and expect an IBF
*/
- struct GNUNET_PeerIdentity peer;
-
+ PHASE_EXPECT_IBF,
/**
- * Application-specific identifier
+ * We know what type of IBF the other peer wants to send us,
+ * and expect the remaining parts
*/
- struct GNUNET_HashCode app_id;
-
+ PHASE_EXPECT_IBF_CONT,
/**
- * Context message, given to us
- * by the client, may be NULL.
+ * We are sending request and elements,
+ * and thus only expect elements from the other peer.
*/
- struct GNUNET_MessageHeader *context_msg;
-
+ PHASE_EXPECT_ELEMENTS,
/**
- * Stream socket connected to the other peer
+ * We are expecting elements and requests, and send
+ * requested elements back to the other peer.
*/
- struct GNUNET_STREAM_Socket *socket;
-
+ PHASE_EXPECT_ELEMENTS_AND_REQUESTS,
/**
- * Message queue for the peer on the other
- * end
+ * The protocol is over.
+ * Results may still have to be sent to the client.
*/
- struct GNUNET_MQ_MessageQueue *mq;
+ PHASE_FINISHED
+};
+
+/**
+ * State of an evaluate operation
+ * with another peer.
+ */
+struct OperationState
+{
/**
- * Type of this operation
+ * Tunnel to the remote peer.
*/
- enum GNUNET_SET_OperationType operation;
+ struct GNUNET_MESH_Tunnel *tunnel;
/**
- * GNUNET_YES if we started the operation,
- * GNUNET_NO if the other peer started it.
+ * Detail information about the set operation,
+ * including the set to use.
*/
- int is_outgoing;
+ struct OperationSpecification *spec;
/**
- * Request id, so we can use one client handle
- * for multiple operations
+ * Message queue for the peer.
*/
- uint32_t request_id;
-
- /* last difference estimate */
- unsigned int diff;
+ struct GNUNET_MQ_Handle *mq;
/**
* Number of ibf buckets received
unsigned int ibf_buckets_received;
/**
- * order of the ibf we receive
+ * Copy of the set's strata estimator at the time of
+ * creation of this operation
*/
- unsigned int ibf_order;
-
struct StrataEstimator *se;
/**
struct InvertibleBloomFilter *remote_ibf;
/**
- * Array of IBFs, some of them pre-allocated
+ * IBF of the set's element.
*/
struct InvertibleBloomFilter *local_ibf;
/**
- * Elements we received from the other peer.
+ * Maps IBF-Keys (specific to the current salt) to elements.
+ * Used as a multihashmap, the keys being the lower 32bit of the IBF-Key.
+ * Colliding IBF-Keys are linked.
*/
- struct GNUNET_CONTAINER_MultiHashMap *received_elements;
+ struct GNUNET_CONTAINER_MultiHashMap32 *key_to_element;
/**
- * Maps IBF-Keys (specific to the current salt) to elements.
+ * Current state of the operation.
*/
- struct GNUNET_CONTAINER_MultiHashMap32 *key_to_element;
+ enum UnionOperationPhase phase;
/**
- * Current state of the operation
+ * Generation in which the operation handle
+ * was created.
*/
- enum UnionOperationState state;
+ unsigned int generation_created;
/**
- * Salt to use for this operation.
+ * Set state of the set that this operation
+ * belongs to.
*/
- uint16_t salt;
-
+ struct Set *set;
+
/**
* Evaluate operations are held in
* a linked list.
*/
- struct UnionEvaluateOperation *next;
-
+ struct OperationState *next;
+
/**
- * Evaluate operations are held in
- * a linked list.
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct OperationState *prev;
+
+ /**
+ * Did we send the client that we are done?
*/
- struct UnionEvaluateOperation *prev;
+ int client_done_sent;
};
+
/**
- * Information about the element in a 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.
+ * The key entry is used to associate an ibf key with
+ * an element.
*/
-struct ElementEntry
+struct KeyEntry
{
/**
- * The actual element. The data for the element
- * should be allocated at the end of this struct.
+ * IBF key for the entry, derived from the current salt.
*/
- struct GNUNET_SET_Element element;
-
- /**
- * Hash of the element.
- * Will be used to derive the different IBF keys
- * for different salts.
- */
- struct GNUNET_HashCode element_hash;
-
- /**
- * Generation the element was added.
- * Operations of earlier generations will not consider the element.
- */
- int generation_add;
-
- unsigned int generation_added;
-
- unsigned int generation_removed;
-
- unsigned int generation_received;
+ struct IBF_Key ibf_key;
/**
- * Generation this element was removed.
- * Operations of later generations will not consider the element.
+ * The actual element associated with the key
*/
- int generation_remove;
+ struct ElementEntry *element;
/**
- * GNUNET_YES if we received the element from a remote peer, and not
- * from the local peer. Note that if the local client inserts an
- * element *after* we got it from a remote peer, the element is
- * considered local.
+ * Element that collides with this element
+ * on the ibf key
*/
- int remote;
+ struct KeyEntry *next_colliding;
};
+
/**
- * Information about the element used for
- * a specific union operation.
+ * Used as a closure for sending elements
+ * with a specific IBF key.
*/
-struct KeyEntry
+struct SendElementClosure
{
- struct IBF_Key ibf_key;
-
/**
- * The actual element associated with the key
+ * The IBF key whose matching elements should be
+ * sent.
*/
- struct ElementEntry *element;
+ struct IBF_Key ibf_key;
/**
- * Element that collides with this element
- * on the ibf key
+ * Operation for which the elements
+ * should be sent.
*/
- struct KeyEntry *next_colliding;
+ struct OperationState *eo;
};
/**
* Extra state required for efficient set union.
*/
-struct UnionState
+struct SetState
{
/**
* The strata estimator is only generated once for
* each set.
+ * The IBF keys are derived from the element hashes with
+ * salt=0.
*/
struct StrataEstimator *se;
- /**
- * Maps 'struct GNUNET_HashCode' to 'struct ElementEntry'.
- */
- struct GNUNET_CONTAINER_MultiHashMap *elements;
-
/**
* Evaluate operations are held in
* a linked list.
*/
- struct UnionEvaluateOperation *ops_head;
+ struct OperationState *ops_head;
/**
* Evaluate operations are held in
* a linked list.
*/
- struct UnionEvaluateOperation *ops_tail;
+ struct OperationState *ops_tail;
};
+/**
+ * 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_key_to_element_iter (void *cls,
+ uint32_t key,
+ void *value)
+{
+ struct KeyEntry *k = value;
+
+ while (NULL != k)
+ {
+ struct KeyEntry *k_tmp = k;
+ k = k->next_colliding;
+ if (GNUNET_YES == k_tmp->element->remote)
+ {
+ GNUNET_free (k_tmp->element);
+ k_tmp->element = NULL;
+ }
+ GNUNET_free (k_tmp);
+ }
+ return GNUNET_YES;
+}
+
+
+/**
+ * Destroy a union operation, and free all resources
+ * associated with it.
+ *
+ * @param eo the union operation to destroy
+ */
+static void
+union_operation_destroy (struct OperationState *eo)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying union op\n");
+ GNUNET_CONTAINER_DLL_remove (eo->set->state->ops_head,
+ eo->set->state->ops_tail,
+ eo);
+ if (NULL != eo->mq)
+ {
+ GNUNET_MQ_destroy (eo->mq);
+ eo->mq = NULL;
+ }
+ if (NULL != eo->tunnel)
+ {
+ struct GNUNET_MESH_Tunnel *t = eo->tunnel;
+ eo->tunnel = NULL;
+ GNUNET_MESH_tunnel_destroy (t);
+ }
+ if (NULL != eo->remote_ibf)
+ {
+ ibf_destroy (eo->remote_ibf);
+ eo->remote_ibf = NULL;
+ }
+ if (NULL != eo->local_ibf)
+ {
+ ibf_destroy (eo->local_ibf);
+ eo->local_ibf = NULL;
+ }
+ if (NULL != eo->se)
+ {
+ strata_estimator_destroy (eo->se);
+ eo->se = NULL;
+ }
+ if (NULL != eo->key_to_element)
+ {
+ GNUNET_CONTAINER_multihashmap32_iterate (eo->key_to_element, destroy_key_to_element_iter, NULL);
+ GNUNET_CONTAINER_multihashmap32_destroy (eo->key_to_element);
+ eo->key_to_element = NULL;
+ }
+ if (NULL != eo->spec)
+ {
+ if (NULL != eo->spec->context_msg)
+ {
+ GNUNET_free (eo->spec->context_msg);
+ eo->spec->context_msg = NULL;
+ }
+ GNUNET_free (eo->spec);
+ eo->spec = NULL;
+ }
+ GNUNET_free (eo);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying union op done\n");
+
+ /* FIXME: do a garbage collection of the set generations */
+}
+
+
+/**
+ * Inform the client that the union operation has failed,
+ * and proceed to destroy the evaluate operation.
+ *
+ * @param eo the union operation to fail
+ */
+static void
+fail_union_operation (struct OperationState *eo)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *msg;
+
+ ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ msg->result_status = htons (GNUNET_SET_STATUS_FAILURE);
+ msg->request_id = htonl (eo->spec->client_request_id);
+ msg->element_type = htons (0);
+ GNUNET_MQ_send (eo->spec->set->client_mq, ev);
+ union_operation_destroy (eo);
+}
+
+
+/**
+ * Derive the IBF key from a hash code and
+ * a salt.
+ *
+ * @param src the hash code
+ * @param salt salt to use
+ * @return the derived IBF key
+ */
static struct IBF_Key
get_ibf_key (struct GNUNET_HashCode *src, uint16_t salt)
{
-
struct IBF_Key key;
+
GNUNET_CRYPTO_hkdf (&key, sizeof (key),
GCRY_MD_SHA512, GCRY_MD_SHA256,
src, sizeof *src,
}
+/**
+ * Send a request for the evaluate operation to a remote peer
+ *
+ * @param eo operation with the other peer
+ */
static void
-send_operation_request (struct UnionEvaluateOperation *eo)
+send_operation_request (struct OperationState *eo)
{
- struct GNUNET_MQ_Message *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct OperationRequestMessage *msg;
- int ret;
- mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST);
- ret = GNUNET_MQ_nest (mqm, eo->context_msg);
- if (GNUNET_OK != ret)
+ ev = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
+ eo->spec->context_msg);
+
+ if (NULL == ev)
{
/* the context message is too large */
- _GSS_client_disconnect (eo->set->client);
- GNUNET_MQ_discard (mqm);
GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (eo->spec->set->client);
return;
}
- msg->operation = eo->operation;
- msg->app_id = eo->app_id;
- GNUNET_MQ_send (eo->mq, mqm);
+ msg->operation = htonl (GNUNET_SET_OPERATION_UNION);
+ msg->app_id = eo->spec->app_id;
+ msg->salt = htonl (eo->spec->salt);
+ GNUNET_MQ_send (eo->mq, ev);
+
+ if (NULL != eo->spec->context_msg)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sent op request with context message\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sent op request without context message\n");
+
+ if (NULL != eo->spec->context_msg)
+ {
+ GNUNET_free (eo->spec->context_msg);
+ eo->spec->context_msg = NULL;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "sent op request\n");
}
* GNUNET_NO if not.
*/
static int
-insert_element_iterator (void *cls,
+op_register_element_iterator (void *cls,
uint32_t key,
void *value)
{
{
if (old_k->ibf_key.key_val == new_k->ibf_key.key_val)
{
- new_k->next_colliding = old_k;
+ new_k->next_colliding = old_k->next_colliding;
old_k->next_colliding = new_k;
return GNUNET_NO;
}
}
+/**
+ * Insert an element into the union operation's
+ * key-to-element mapping. Takes ownership of 'ee'.
+ * Note that this does not insert the element in the set,
+ * only in the operation's key-element mapping.
+ * This is done to speed up re-tried operations, if some elements
+ * were transmitted, and then the IBF fails to decode.
+ *
+ * @param eo the union operation
+ * @param ee the element entry
+ */
static void
-insert_element (struct UnionEvaluateOperation *eo, struct ElementEntry *ee)
+op_register_element (struct OperationState *eo, struct ElementEntry *ee)
{
int ret;
struct IBF_Key ibf_key;
struct KeyEntry *k;
- ibf_key = get_ibf_key (&ee->element_hash, eo->salt);
+ ibf_key = get_ibf_key (&ee->element_hash, eo->spec->salt);
k = GNUNET_new (struct KeyEntry);
k->element = ee;
k->ibf_key = ibf_key;
- ret = GNUNET_CONTAINER_multihashmap32_get_multiple (eo->key_to_element, (uint32_t) ibf_key.key_val,
- insert_element_iterator, k);
+ ret = GNUNET_CONTAINER_multihashmap32_get_multiple (eo->key_to_element,
+ (uint32_t) ibf_key.key_val,
+ op_register_element_iterator, k);
+
/* was the element inserted into a colliding bucket? */
if (GNUNET_SYSERR == ret)
- {
- GNUNET_assert (NULL != k->next_colliding);
return;
- }
+
GNUNET_CONTAINER_multihashmap32_put (eo->key_to_element, (uint32_t) ibf_key.key_val, k,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- if (NULL != eo->local_ibf)
- ibf_insert (eo->local_ibf, ibf_key);
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
+/**
+ * Insert a key into an ibf.
+ *
+ * @param cls the ibf
+ * @param key unused
+ * @param value the key entry to get the key from
+ */
static int
prepare_ibf_iterator (void *cls,
- uint32_t key,
- void *value)
+ uint32_t key,
+ void *value)
{
struct InvertibleBloomFilter *ibf = cls;
struct KeyEntry *ke = value;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "inserting %x into ibf\n", ke->ibf_key.key_val);
+
ibf_insert (ibf, ke->ibf_key);
return GNUNET_YES;
}
+
+/**
+ * Iterator for initializing the
+ * key-to-element mapping of a union operation
+ *
+ * @param cls the union operation
+ * @param key unised
+ * @param value the element entry to insert
+ * into the key-to-element mapping
+ * @return GNUNET_YES to continue iterating,
+ * GNUNET_NO to stop
+ */
static int
init_key_to_element_iterator (void *cls,
const struct GNUNET_HashCode *key,
void *value)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo = cls;
struct ElementEntry *e = value;
- insert_element (eo, e);
+ /* make sure that the element belongs to the set at the time
+ * of creating the operation */
+ if ( (e->generation_added > eo->generation_created) ||
+ ( (GNUNET_YES == e->removed) &&
+ (e->generation_removed < eo->generation_created)))
+ return GNUNET_YES;
+
+ GNUNET_assert (GNUNET_NO == e->remote);
+
+ op_register_element (eo, e);
return GNUNET_YES;
}
+
+/**
+ * Create an ibf with the operation's elements
+ * of the specified size
+ *
+ * @param eo the union operation
+ * @param size size of the ibf to create
+ */
static void
-prepare_ibf (struct UnionEvaluateOperation *eo, uint16_t size)
+prepare_ibf (struct OperationState *eo, uint16_t size)
{
if (NULL == eo->key_to_element)
{
unsigned int len;
- len = GNUNET_CONTAINER_multihashmap_size (eo->set->state.u->elements);
- eo->key_to_element = GNUNET_CONTAINER_multihashmap32_create (len);
- GNUNET_CONTAINER_multihashmap_iterate (eo->set->state.u->elements,
- init_key_to_element_iterator, eo);
+ len = GNUNET_CONTAINER_multihashmap_size (eo->set->elements);
+ eo->key_to_element = GNUNET_CONTAINER_multihashmap32_create (len + 1);
+ GNUNET_CONTAINER_multihashmap_iterate (eo->set->elements,
+ init_key_to_element_iterator, eo);
}
if (NULL != eo->local_ibf)
ibf_destroy (eo->local_ibf);
eo->local_ibf = ibf_create (size, SE_IBF_HASH_NUM);
- GNUNET_CONTAINER_multihashmap32_iterate (eo->key_to_element, prepare_ibf_iterator, eo->local_ibf);
+ GNUNET_CONTAINER_multihashmap32_iterate (eo->key_to_element,
+ prepare_ibf_iterator, eo->local_ibf);
}
/**
* Send an ibf of appropriate size.
*
- * @param cpi the peer
+ * @param eo the union operation
+ * @param ibf_order order of the ibf to send, size=2^order
*/
static void
-send_ibf (struct UnionEvaluateOperation *eo, uint16_t ibf_order)
+send_ibf (struct OperationState *eo, uint16_t ibf_order)
{
unsigned int buckets_sent = 0;
struct InvertibleBloomFilter *ibf;
- prepare_ibf (eo, ibf_order);
+ prepare_ibf (eo, 1<<ibf_order);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending ibf of size %u\n", 1<<ibf_order);
ibf = eo->local_ibf;
while (buckets_sent < (1 << ibf_order))
{
unsigned int buckets_in_message;
- struct GNUNET_MQ_Message *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct IBFMessage *msg;
buckets_in_message = (1 << ibf_order) - buckets_sent;
if (buckets_in_message > MAX_BUCKETS_PER_MESSAGE)
buckets_in_message = MAX_BUCKETS_PER_MESSAGE;
- mqm = GNUNET_MQ_msg_extra (msg, buckets_in_message * IBF_BUCKET_SIZE,
+ ev = GNUNET_MQ_msg_extra (msg, buckets_in_message * IBF_BUCKET_SIZE,
GNUNET_MESSAGE_TYPE_SET_P2P_IBF);
- msg->order = htons (ibf_order);
+ msg->reserved = 0;
+ msg->order = ibf_order;
msg->offset = htons (buckets_sent);
ibf_write_slice (ibf, buckets_sent,
buckets_in_message, &msg[1]);
buckets_sent += buckets_in_message;
- GNUNET_MQ_send (eo->mq, mqm);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ibf chunk size %u, %u/%u sent\n",
+ buckets_in_message, buckets_sent, 1<<ibf_order);
+ GNUNET_MQ_send (eo->mq, ev);
}
- eo->state = STATE_EXPECT_ELEMENTS_AND_REQUESTS;
+ eo->phase = PHASE_EXPECT_ELEMENTS_AND_REQUESTS;
}
/**
- * Send a strata estimator.
+ * Send a strata estimator to the remote peer.
*
- * @param cpi the peer
+ * @param eo the union operation with the remote peer
*/
static void
-send_strata_estimator (struct UnionEvaluateOperation *eo)
+send_strata_estimator (struct OperationState *eo)
{
- struct GNUNET_MQ_Message *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct GNUNET_MessageHeader *strata_msg;
- mqm = GNUNET_MQ_msg_header_extra (strata_msg,
- SE_STRATA_COUNT * IBF_BUCKET_SIZE * SE_IBF_SIZE,
- GNUNET_MESSAGE_TYPE_SET_P2P_SE);
- strata_estimator_write (eo->set->state.u->se, &strata_msg[1]);
- GNUNET_MQ_send (eo->mq, mqm);
- eo->state = STATE_EXPECT_IBF;
+ ev = GNUNET_MQ_msg_header_extra (strata_msg,
+ SE_STRATA_COUNT * IBF_BUCKET_SIZE * SE_IBF_SIZE,
+ GNUNET_MESSAGE_TYPE_SET_P2P_SE);
+ strata_estimator_write (eo->set->state->se, &strata_msg[1]);
+ GNUNET_MQ_send (eo->mq, ev);
+ eo->phase = PHASE_EXPECT_IBF;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sent SE, expecting IBF\n");
+}
+
+
+/**
+ * Compute the necessary order of an ibf
+ * from the size of the symmetric set difference.
+ *
+ * @param diff the difference
+ * @return the required size of the ibf
+ */
+static unsigned int
+get_order_from_difference (unsigned int diff)
+{
+ unsigned int ibf_order;
+
+ ibf_order = 2;
+ while ((1<<ibf_order) < (IBF_ALPHA * diff) || (1<<ibf_order) < SE_IBF_HASH_NUM)
+ ibf_order++;
+ if (ibf_order > MAX_IBF_ORDER)
+ ibf_order = MAX_IBF_ORDER;
+ return ibf_order;
}
+/**
+ * Handle a strata estimator from a remote peer
+ *
+ * @param cls the union operation
+ * @param mh the message
+ */
static void
handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo = cls;
struct StrataEstimator *remote_se;
- int ibf_order;
int diff;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got se\n");
-
- if (eo->state != STATE_EXPECT_SE)
+ if (eo->phase != PHASE_EXPECT_SE)
{
- /* FIXME: handle */
+ fail_union_operation (eo);
GNUNET_break (0);
return;
}
strata_estimator_destroy (remote_se);
strata_estimator_destroy (eo->se);
eo->se = NULL;
- /* minimum order */
- ibf_order = 2;
- while ((1<<ibf_order) < (2 * diff))
- ibf_order++;
- if (ibf_order > MAX_IBF_ORDER)
- ibf_order = MAX_IBF_ORDER;
- send_ibf (eo, ibf_order);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got se diff=%d, using ibf size %d\n",
+ diff, 1<<get_order_from_difference (diff));
+ send_ibf (eo, get_order_from_difference (diff));
}
+
/**
- * FIXME
+ * Iterator to send elements to a remote peer
*
- * @param
+ * @param cls closure with the element key and the union operation
+ * @param key ignored
+ * @param value the key entry
+ */
+static int
+send_element_iterator (void *cls,
+ uint32_t key,
+ void *value)
+{
+ struct SendElementClosure *sec = cls;
+ struct IBF_Key ibf_key = sec->ibf_key;
+ struct OperationState *eo = sec->eo;
+ struct KeyEntry *ke = value;
+
+ if (ke->ibf_key.key_val != ibf_key.key_val)
+ return GNUNET_YES;
+ while (NULL != ke)
+ {
+ const struct GNUNET_SET_Element *const element = &ke->element->element;
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_MessageHeader *mh;
+
+ GNUNET_assert (ke->ibf_key.key_val == ibf_key.key_val);
+ ev = GNUNET_MQ_msg_header_extra (mh, element->size, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS);
+ if (NULL == ev)
+ {
+ /* element too large */
+ GNUNET_break (0);
+ continue;
+ }
+ memcpy (&mh[1], element->data, element->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (%s) to peer\n",
+ GNUNET_h2s (&ke->element->element_hash));
+ GNUNET_MQ_send (eo->mq, ev);
+ ke = ke->next_colliding;
+ }
+ return GNUNET_NO;
+}
+
+/**
+ * Send all elements that have the specified IBF key
+ * to the remote peer of the union operation
+ *
+ * @param eo union operation
+ * @param ibf_key IBF key of interest
*/
static void
-decode (struct UnionEvaluateOperation *eo)
+send_elements_for_key (struct OperationState *eo, struct IBF_Key ibf_key)
+{
+ struct SendElementClosure send_cls;
+
+ send_cls.ibf_key = ibf_key;
+ send_cls.eo = eo;
+ GNUNET_CONTAINER_multihashmap32_get_multiple (eo->key_to_element, (uint32_t) ibf_key.key_val,
+ &send_element_iterator, &send_cls);
+}
+
+
+/**
+ * Decode which elements are missing on each side, and
+ * send the appropriate elemens and requests
+ *
+ * @param eo union operation
+ */
+static void
+decode_and_send (struct OperationState *eo)
{
struct IBF_Key key;
+ struct IBF_Key last_key;
int side;
+ unsigned int num_decoded;
struct InvertibleBloomFilter *diff_ibf;
- GNUNET_assert (STATE_EXPECT_ELEMENTS == eo->state);
+ GNUNET_assert (PHASE_EXPECT_ELEMENTS == eo->phase);
- prepare_ibf (eo, eo->ibf_order);
+ prepare_ibf (eo, eo->remote_ibf->size);
diff_ibf = ibf_dup (eo->local_ibf);
ibf_subtract (diff_ibf, eo->remote_ibf);
+ ibf_destroy (eo->remote_ibf);
+ eo->remote_ibf = NULL;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoding IBF (size=%u)\n", diff_ibf->size);
+
+ num_decoded = 0;
+ last_key.key_val = 0;
+
while (1)
{
int res;
+ int cycle_detected = GNUNET_NO;
+
+ last_key = key;
res = ibf_decode (diff_ibf, &side, &key);
- if (GNUNET_SYSERR == res)
+ if (res == GNUNET_OK)
{
- /* decoding failed, we tell the other peer by sending our ibf
- * with a larger order */
- GNUNET_assert (0);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoded ibf key %lx\n",
+ key.key_val);
+ num_decoded += 1;
+ if (num_decoded > diff_ibf->size || (num_decoded > 1 && last_key.key_val == key.key_val))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "detected cyclic ibf (decoded %u/%u)\n",
+ num_decoded, diff_ibf->size);
+ cycle_detected = GNUNET_YES;
+ }
+ }
+ if ((GNUNET_SYSERR == res) || (GNUNET_YES == cycle_detected))
+ {
+ int next_order;
+ next_order = 0;
+ while (1<<next_order < diff_ibf->size)
+ next_order++;
+ next_order++;
+ if (next_order <= MAX_IBF_ORDER)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "decoding failed, sending larger ibf (size %u)\n",
+ 1<<next_order);
+ send_ibf (eo, next_order);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "set union failed: reached ibf limit\n");
+ }
+ break;
}
if (GNUNET_NO == res)
{
- struct GNUNET_MQ_Message *mqm;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "transmitted all values, sending DONE\n");
- mqm = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
- GNUNET_MQ_send (eo->mq, mqm);
- return;
+ struct GNUNET_MQ_Envelope *ev;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "transmitted all values, sending DONE\n");
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ GNUNET_MQ_send (eo->mq, ev);
+ break;
}
if (1 == side)
{
- //struct ElementEntry *e;
- /* we have the element(s), send it to the other peer */
- //GNUNET_CONTAINER_multihashmap32_get_multiple (eo->set->state.u->elements,
- // (uint32_t) key.key_val);
- /* FIXME */
+ send_elements_for_key (eo, key);
}
- else
+ else if (-1 == side)
{
- struct GNUNET_MQ_Message *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct GNUNET_MessageHeader *msg;
/* FIXME: before sending the request, check if we may just have the element */
/* FIXME: merge multiple requests */
- mqm = GNUNET_MQ_msg_header_extra (msg, sizeof (struct IBF_Key), GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS);
+ /* FIXME: remember somewhere that we already requested the element,
+ * so that we don't request it again with the next ibf if decoding fails */
+ ev = GNUNET_MQ_msg_header_extra (msg, sizeof (struct IBF_Key),
+ GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS);
+
*(struct IBF_Key *) &msg[1] = key;
- GNUNET_MQ_send (eo->mq, mqm);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element request\n");
+ GNUNET_MQ_send (eo->mq, ev);
+ }
+ else
+ {
+ GNUNET_assert (0);
}
}
+ ibf_destroy (diff_ibf);
}
+/**
+ * Handle an IBF message from a remote peer.
+ *
+ * @param cls the union operation
+ * @param mh the header of the message
+ */
static void
handle_p2p_ibf (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo = cls;
struct IBFMessage *msg = (struct IBFMessage *) mh;
unsigned int buckets_in_message;
- if (eo->state == STATE_EXPECT_ELEMENTS_AND_REQUESTS)
+ if ( (eo->phase == PHASE_EXPECT_ELEMENTS_AND_REQUESTS) ||
+ (eo->phase == PHASE_EXPECT_IBF) )
{
- /* check that the ibf is a new one / first part */
- /* clear outgoing messages */
- GNUNET_assert (0);
- }
- else if (eo->state == STATE_EXPECT_IBF)
- {
- eo->state = STATE_EXPECT_IBF_CONT;
- eo->ibf_order = msg->order;
+ eo->phase = PHASE_EXPECT_IBF_CONT;
GNUNET_assert (NULL == eo->remote_ibf);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "creating new ibf of size %u\n", 1<<msg->order);
eo->remote_ibf = ibf_create (1<<msg->order, SE_IBF_HASH_NUM);
- if (ntohs (msg->offset) != 0)
+ eo->ibf_buckets_received = 0;
+ if (0 != ntohs (msg->offset))
{
- /* FIXME: handle */
- GNUNET_assert (0);
+ GNUNET_break (0);
+ fail_union_operation (eo);
+ return;
}
}
- else if (eo->state == STATE_EXPECT_IBF_CONT)
+ else if (eo->phase == PHASE_EXPECT_IBF_CONT)
{
if ( (ntohs (msg->offset) != eo->ibf_buckets_received) ||
- (msg->order != eo->ibf_order) )
+ (1<<msg->order != eo->remote_ibf->size) )
{
- /* FIXME: handle */
- GNUNET_assert (0);
+ GNUNET_break (0);
+ fail_union_operation (eo);
+ return;
}
}
buckets_in_message = (ntohs (msg->header.size) - sizeof *msg) / IBF_BUCKET_SIZE;
+ if (0 == buckets_in_message)
+ {
+ GNUNET_break_op (0);
+ fail_union_operation (eo);
+ return;
+ }
+
if ((ntohs (msg->header.size) - sizeof *msg) != buckets_in_message * IBF_BUCKET_SIZE)
{
- /* FIXME: handle, message was malformed */
- GNUNET_assert (0);
+ GNUNET_break (0);
+ fail_union_operation (eo);
+ return;
}
ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, eo->remote_ibf);
eo->ibf_buckets_received += buckets_in_message;
- if (eo->ibf_buckets_received == (1<<eo->ibf_order))
+ if (eo->ibf_buckets_received == eo->remote_ibf->size)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received full ibf\n");
+ eo->phase = PHASE_EXPECT_ELEMENTS;
+ decode_and_send (eo);
+ }
+}
+
+
+/**
+ * Send a result message to the client indicating
+ * that there is a new element.
+ *
+ * @param eo union operation
+ * @param element element to send
+ */
+static void
+send_client_element (struct OperationState *eo,
+ struct GNUNET_SET_Element *element)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *rm;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (size %u) to client\n", element->size);
+ GNUNET_assert (0 != eo->spec->client_request_id);
+ ev = GNUNET_MQ_msg_extra (rm, element->size, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ if (NULL == ev)
{
- eo->state = STATE_EXPECT_ELEMENTS;
- decode (eo);
+ GNUNET_MQ_discard (ev);
+ GNUNET_break (0);
+ return;
}
+ rm->result_status = htons (GNUNET_SET_STATUS_OK);
+ rm->request_id = htonl (eo->spec->client_request_id);
+ rm->element_type = element->type;
+ memcpy (&rm[1], element->data, element->size);
+ GNUNET_MQ_send (eo->spec->set->client_mq, ev);
+}
+
+
+/**
+ * Send a result message to the client indicating
+ * that the operation is over.
+ * After the result done message has been sent to the client,
+ * destroy the evaluate operation.
+ *
+ * @param eo union operation
+ */
+static void
+send_client_done_and_destroy (struct OperationState *eo)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *rm;
+
+ GNUNET_assert (GNUNET_NO == eo->client_done_sent);
+
+ eo->client_done_sent = GNUNET_YES;
+
+ ev = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ rm->request_id = htonl (eo->spec->client_request_id);
+ rm->result_status = htons (GNUNET_SET_STATUS_DONE);
+ rm->element_type = htons (0);
+ GNUNET_MQ_send (eo->spec->set->client_mq, ev);
+
+ union_operation_destroy (eo);
}
+/**
+ * Handle an element message from a remote peer.
+ *
+ * @param cls the union operation
+ * @param mh the message
+ */
static void
handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo = cls;
+ struct ElementEntry *ee;
+ uint16_t element_size;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got element from peer\n");
- if ( (eo->state != STATE_EXPECT_ELEMENTS) &&
- (eo->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS) )
+ if ( (eo->phase != PHASE_EXPECT_ELEMENTS) &&
+ (eo->phase != PHASE_EXPECT_ELEMENTS_AND_REQUESTS) )
{
- /* FIXME: handle */
+ fail_union_operation (eo);
GNUNET_break (0);
return;
}
+ element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
+ ee = GNUNET_malloc (sizeof *ee + element_size);
+ memcpy (&ee[1], &mh[1], element_size);
+ ee->element.size = element_size;
+ ee->element.data = &ee[1];
+ ee->remote = GNUNET_YES;
+ GNUNET_CRYPTO_hash (ee->element.data, ee->element.size, &ee->element_hash);
+
+ /* FIXME: see if the element has already been inserted! */
+
+ op_register_element (eo, ee);
+ send_client_element (eo, &ee->element);
}
+/**
+ * Handle an element request from a remote peer.
+ *
+ * @param cls the union operation
+ * @param mh the message
+ */
static void
handle_p2p_element_requests (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo = cls;
+ struct IBF_Key *ibf_key;
+ unsigned int num_keys;
/* look up elements and send them */
- if (eo->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS)
+ if (eo->phase != PHASE_EXPECT_ELEMENTS_AND_REQUESTS)
+ {
+ GNUNET_break (0);
+ fail_union_operation (eo);
+ return;
+ }
+
+ num_keys = (ntohs (mh->size) - sizeof *mh) / sizeof (struct IBF_Key);
+
+ if ((ntohs (mh->size) - sizeof *mh) != num_keys * sizeof (struct IBF_Key))
{
- /* FIXME: handle */
GNUNET_break (0);
+ fail_union_operation (eo);
return;
}
+
+ ibf_key = (struct IBF_Key *) &mh[1];
+ while (0 != num_keys--)
+ {
+ send_elements_for_key (eo, *ibf_key);
+ ibf_key++;
+ }
}
+/**
+ * Handle a done message from a remote peer
+ *
+ * @param cls the union operation
+ * @param mh the message
+ */
static void
handle_p2p_done (void *cls, const struct GNUNET_MessageHeader *mh)
{
- GNUNET_break (0);
-}
+ struct OperationState *eo = cls;
+ struct GNUNET_MQ_Envelope *ev;
+ if (eo->phase == PHASE_EXPECT_ELEMENTS_AND_REQUESTS)
+ {
+ /* we got all requests, but still have to send our elements as response */
-static const struct GNUNET_MQ_Handler union_handlers[] = {
- {handle_p2p_elements, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS},
- {handle_p2p_strata_estimator, GNUNET_MESSAGE_TYPE_SET_P2P_SE},
- {handle_p2p_ibf, GNUNET_MESSAGE_TYPE_SET_P2P_IBF},
- {handle_p2p_element_requests, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS},
- {handle_p2p_done, GNUNET_MESSAGE_TYPE_SET_P2P_DONE},
- GNUNET_MQ_HANDLERS_END
-};
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got DONE, sending final DONE after elements\n");
+ eo->phase = PHASE_FINISHED;
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ GNUNET_MQ_send (eo->mq, ev);
+ return;
+ }
+ if (eo->phase == PHASE_EXPECT_ELEMENTS)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got final DONE\n");
+ eo->phase = PHASE_FINISHED;
+ send_client_done_and_destroy (eo);
+ return;
+ }
+ GNUNET_break (0);
+ fail_union_operation (eo);
+}
/**
- * Functions of this type will be called when a stream is established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the
- * other side (read/write)
+ * 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 tc tunnel context, passed here so all new incoming
+ * messages are directly going to the union operations
+ * @return a handle to the operation
*/
static void
-stream_open_cb (void *cls,
- struct GNUNET_STREAM_Socket *socket)
+union_evaluate (struct OperationSpecification *spec,
+ struct GNUNET_MESH_Tunnel *tunnel,
+ struct TunnelContext *tc)
{
- struct UnionEvaluateOperation *eo = cls;
+ struct OperationState *eo;
+
+ eo = GNUNET_new (struct OperationState);
+ tc->vt = _GSS_union_vt ();
+ tc->op = eo;
+ eo->se = strata_estimator_dup (spec->set->state->se);
+ eo->generation_created = spec->set->current_generation++;
+ eo->set = spec->set;
+ eo->spec = spec;
+ eo->tunnel = tunnel;
+ eo->mq = GNUNET_MESH_mq_create (tunnel);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "evaluating union operation, (app %s)\n",
+ GNUNET_h2s (&eo->spec->app_id));
- GNUNET_assert (NULL == eo->mq);
- GNUNET_assert (socket == eo->socket);
+ /* we started the operation, thus we have to send the operation request */
+ eo->phase = PHASE_EXPECT_SE;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "open cb successful\n");
+ GNUNET_CONTAINER_DLL_insert (eo->set->state->ops_head,
+ eo->set->state->ops_tail,
+ eo);
- eo->mq = GNUNET_MQ_queue_for_stream_socket (eo->socket,
- union_handlers, eo);
- /* we started the operation, thus we have to send the operation request */
send_operation_request (eo);
- eo->state = STATE_EXPECT_SE;
}
-
-void
-_GSS_union_evaluate (struct EvaluateMessage *m, struct Set *set)
+
+/**
+ * Accept an union operation request from a remote peer
+ *
+ * @param spec all necessary information about the operation
+ * @param tunnel open tunnel to the partner's peer
+ * @param tc tunnel context, passed here so all new incoming
+ * messages are directly going to the union operations
+ * @return operation
+ */
+static void
+union_accept (struct OperationSpecification *spec,
+ struct GNUNET_MESH_Tunnel *tunnel,
+ struct TunnelContext *tc)
+{
+ struct OperationState *eo;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "accepting set union operation\n");
+
+ eo = GNUNET_new (struct OperationState);
+ tc->vt = _GSS_union_vt ();
+ tc->op = eo;
+ eo->set = spec->set;
+ eo->generation_created = eo->set->current_generation++;
+ eo->spec = spec;
+ eo->tunnel = tunnel;
+ eo->mq = GNUNET_MESH_mq_create (tunnel);
+ eo->se = strata_estimator_dup (eo->set->state->se);
+ /* transfer ownership of mq and socket from incoming to eo */
+ GNUNET_CONTAINER_DLL_insert (eo->set->state->ops_head,
+ eo->set->state->ops_tail,
+ eo);
+ /* kick off the operation */
+ send_strata_estimator (eo);
+}
+
+
+/**
+ * Create a new set supporting the union operation
+ *
+ * @return the newly created set
+ */
+static struct SetState *
+union_set_create (void)
{
- struct UnionEvaluateOperation *eo;
+ struct SetState *set_state;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "evaluating union operation\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "union set created\n");
- eo = GNUNET_new (struct UnionEvaluateOperation);
- eo->peer = m->peer;
- eo->set = set;
- eo->socket =
- GNUNET_STREAM_open (configuration, &eo->peer, GNUNET_APPLICATION_TYPE_SET,
- stream_open_cb, eo,
- GNUNET_STREAM_OPTION_END);
+ set_state = GNUNET_new (struct SetState);
+ set_state->se = strata_estimator_create (SE_STRATA_COUNT,
+ SE_IBF_SIZE, SE_IBF_HASH_NUM);
+ return set_state;
}
-void
-_GSS_union_accept (struct AcceptMessage *m, struct Set *set,
- struct Incoming *incoming)
+/**
+ * Add the element from the given element message to the set.
+ *
+ * @param set_state state of the set want to add to
+ * @param ee the element to add to the set
+ */
+static void
+union_add (struct SetState *set_state, struct ElementEntry *ee)
{
- struct UnionEvaluateOperation *eo;
-
- eo = GNUNET_new (struct UnionEvaluateOperation);
- eo->set = set;
- eo->peer = incoming->peer;
- eo->app_id = incoming->app_id;
- eo->salt = ntohs (incoming->salt);
- eo->request_id = m->request_id;
- eo->set = set;
- eo->mq = incoming->mq;
- /* the peer's socket is now ours, we'll receive all messages */
- GNUNET_MQ_replace_handlers (eo->mq, union_handlers, eo);
- /* kick of the operation */
- send_strata_estimator (eo);
+ strata_estimator_insert (set_state->se, get_ibf_key (&ee->element_hash, 0));
}
-struct Set *
-_GSS_union_set_create (void)
+/**
+ * Destroy a set that supports the union operation
+ *
+ * @param set_state the set to destroy
+ */
+static void
+union_set_destroy (struct SetState *set_state)
{
- struct Set *set;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying union set\n");
+ /* important to destroy operations before the rest of the set */
+ while (NULL != set_state->ops_head)
+ union_operation_destroy (set_state->ops_head);
+ if (NULL != set_state->se)
+ {
+ strata_estimator_destroy (set_state->se);
+ set_state->se = NULL;
+ }
+ GNUNET_free (set_state);
+}
+
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set created\n");
-
- set = GNUNET_malloc (sizeof (struct Set) + sizeof (struct UnionState));
- set->state.u = (struct UnionState *) &set[1];
- set->operation = GNUNET_SET_OPERATION_UNION;
- set->state.u->se = strata_estimator_create (SE_STRATA_COUNT,
- SE_IBF_SIZE, SE_IBF_HASH_NUM);
- return set;
+/**
+ * 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 set_state state of the set to remove from
+ * @param element set element to remove
+ */
+static void
+union_remove (struct SetState *set_state, struct ElementEntry *element)
+{
+ /* FIXME: remove from strata estimator */
}
+/**
+ * Dispatch messages for a union operation.
+ *
+ * @param eo the state of the union evaluate operation
+ * @param mh the received message
+ * @return GNUNET_SYSERR if the tunnel should be disconnected,
+ * GNUNET_OK otherwise
+ */
+int
+union_handle_p2p_message (struct OperationState *eo,
+ const struct GNUNET_MessageHeader *mh)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received p2p message (t: %u, s: %u)\n",
+ ntohs (mh->type), ntohs (mh->size));
+ switch (ntohs (mh->type))
+ {
+ case GNUNET_MESSAGE_TYPE_SET_P2P_IBF:
+ handle_p2p_ibf (eo, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_P2P_SE:
+ handle_p2p_strata_estimator (eo, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS:
+ handle_p2p_elements (eo, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS:
+ handle_p2p_element_requests (eo, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_P2P_DONE:
+ handle_p2p_done (eo, mh);
+ break;
+ default:
+ /* something wrong with mesh's message handlers? */
+ GNUNET_assert (0);
+ }
+ return GNUNET_OK;
+}
+
-void
-_GSS_union_add (struct ElementMessage *m, struct Set *set)
+static void
+union_peer_disconnect (struct OperationState *op)
{
- struct ElementEntry *ee;
- struct ElementEntry *ee_dup;
- uint16_t element_size;
-
- element_size = ntohs (m->header.size) - sizeof *m;
- ee = GNUNET_malloc (element_size + sizeof *ee);
- ee->element.size = element_size;
- ee->element.data = &ee[1];
- memcpy (ee->element.data, &m[1], element_size);
- GNUNET_CRYPTO_hash (ee->element.data, element_size, &ee->element_hash);
- ee_dup = GNUNET_CONTAINER_multihashmap_get (set->state.u->elements, &ee->element_hash);
- if (NULL != ee_dup)
+ /* Are we already disconnected? */
+ if (NULL == op->tunnel)
+ return;
+ op->tunnel = NULL;
+ if (NULL != op->mq)
+ {
+ GNUNET_MQ_destroy (op->mq);
+ op->mq = NULL;
+ }
+ if (PHASE_FINISHED != op->phase)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "element inserted twice, ignoring\n");
- GNUNET_free (ee);
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *msg;
+
+ ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ msg->request_id = htonl (op->spec->client_request_id);
+ msg->result_status = htons (GNUNET_SET_STATUS_FAILURE);
+ msg->element_type = htons (0);
+ GNUNET_MQ_send (op->spec->set->client_mq, ev);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "other peer disconnected prematurely\n");
+ union_operation_destroy (op);
return;
}
- GNUNET_CONTAINER_multihashmap_put (set->state.u->elements, &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- strata_estimator_insert (set->state.u->se, get_ibf_key (&ee->element_hash, 0));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "other peer disconnected (finished)\n");
+ if (GNUNET_NO == op->client_done_sent)
+ send_client_done_and_destroy (op);
}
+
+static void
+union_op_cancel (struct SetState *set_state, uint32_t op_id)
+{
+ /* FIXME: implement */
+}
+
+
+const struct SetVT *
+_GSS_union_vt ()
+{
+ static const struct SetVT union_vt = {
+ .create = &union_set_create,
+ .msg_handler = &union_handle_p2p_message,
+ .add = &union_add,
+ .remove = &union_remove,
+ .destroy_set = &union_set_destroy,
+ .evaluate = &union_evaluate,
+ .accept = &union_accept,
+ .peer_disconnect = &union_peer_disconnect,
+ .cancel = &union_op_cancel,
+ };
+
+ return &union_vt;
+}
projects / oweals / gnunet.git / blobdiff