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
/**
* @file set/gnunet-service-set_intersection.c
* @brief two-peer set intersection
- * @author Christian M. Fuchs
+ * @author Christian Fuchs
*/
-
-
+#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 "gnunet_block_lib.h"
#include "set_protocol.h"
#include <gcrypt.h>
+#define BLOOMFILTER_SIZE GNUNET_CRYPTO_HASH_LENGTH
-/**
- * Number of IBFs in a strata estimator.
- */
-#define SE_STRATA_COUNT 32
-/**
- * Size of the IBFs in the strata estimator.
- */
-#define SE_IBF_SIZE 80
-/**
- * hash num parameter for the difference digests and strata estimators
- */
-#define SE_IBF_HASH_NUM 3
-
-/**
- * Number of buckets that can be transmitted in one message.
- */
-#define MAX_BUCKETS_PER_MESSAGE ((1<<15) / IBF_BUCKET_SIZE)
-
-/**
- * The maximum size of an ibf we use is 2^(MAX_IBF_ORDER).
- * Choose this value so that computing the IBF is still cheaper
- * than transmitting all values.
- */
-#define MAX_IBF_ORDER (16)
-
+#define CALCULATE_BF_SIZE(A, B, s, k) \
+ do { \
+ k = ceil(1 + log2((double) (2*B / (double) A)));\
+ s = ceil((double) (A * k / log(2))); \
+ } while (0)
/**
- * Current phase we are in for a union operation
+ * Current phase we are in for a intersection operation.
*/
enum IntersectionOperationPhase
{
/**
- * We sent the request message, and expect a strata estimator
+ * Alices has suggested an operation to bob,
+ * and is waiting for a bf or session end.
*/
- PHASE_EXPECT_SE,
+ PHASE_INITIAL,
/**
- * We sent the strata estimator, and expect an IBF
+ * Bob has accepted the operation, Bob and Alice are now exchanging bfs
+ * until one notices the their element count is equal
*/
- PHASE_EXPECT_IBF,
+ PHASE_BF_EXCHANGE,
/**
- * We know what type of IBF the other peer wants to send us,
- * and expect the remaining parts
+ * Multipart continuation of BF_exchange
*/
- PHASE_EXPECT_IBF_CONT,
+ PHASE_BF_AWAIT_MULTIPART,
/**
- * We are sending request and elements,
- * and thus only expect elements from the other peer.
+ * if both peers have an equal peercount, they enter this state for
+ * one more turn, to see if they actually have agreed on a correct set.
+ * if a peer finds the same element count after the next iteration,
+ * it ends the the session
*/
- PHASE_EXPECT_ELEMENTS,
- /**
- * We are expecting elements and requests, and send
- * requested elements back to the other peer.
- */
- PHASE_EXPECT_ELEMENTS_AND_REQUESTS,
+ PHASE_MAYBE_FINISHED,
/**
* The protocol is over.
* Results may still have to be sent to the client.
* State of an evaluate operation
* with another peer.
*/
-struct IntersectionEvaluateOperation
+struct OperationState
{
/**
- * Local set the operation is evaluated on.
- */
- struct Set *set;
-
- /**
- * Peer with the remote set
- */
- struct GNUNET_PeerIdentity peer;
-
- /**
- * Application-specific identifier
+ * The bf we currently receive
*/
- struct GNUNET_HashCode app_id;
+ struct GNUNET_CONTAINER_BloomFilter *remote_bf;
/**
- * Context message, given to us
- * by the client, may be NULL.
+ * BF of the set's element.
*/
- struct GNUNET_MessageHeader *context_msg;
+ struct GNUNET_CONTAINER_BloomFilter *local_bf;
/**
- * Tunnel context for the peer we
- * evaluate the union operation with.
+ * for multipart msgs we have to store the bloomfilter-data until we fully sent it.
*/
- struct TunnelContext *tc;
+ char * local_bf_data;
/**
- * Request ID to multiplex set operations to
- * the client inhabiting the set.
+ * size of the bloomfilter
*/
- uint32_t request_id;
-
- /**
- * Number of ibf buckets received
- */
- unsigned int ibf_buckets_received;
-
- /**
- * Copy of the set's strata estimator at the time of
- * creation of this operation
- */
- struct StrataEstimator *se;
-
- /**
- * The ibf we currently receive
- */
- struct InvertibleBloomFilter *remote_ibf;
-
- /**
- * IBF of the set's element.
- */
- struct InvertibleBloomFilter *local_ibf;
-
- /**
- * Maps IBF-Keys (specific to the current salt) to elements.
- */
- struct GNUNET_CONTAINER_MultiHashMap32 *key_to_element;
-
+ uint32_t local_bf_data_size;
+
/**
* Current state of the operation.
*/
enum IntersectionOperationPhase phase;
- /**
- * Salt to use for this operation.
- */
- uint16_t salt;
-
/**
* Generation in which the operation handle
* was created.
*/
unsigned int generation_created;
-
- /**
- * Evaluate operations are held in
- * a linked list.
- */
- struct IntersectionEvaluateOperation *next;
-
- /**
- * Evaluate operations are held in
- * a linked list.
- */
- struct IntersectionEvaluateOperation *prev;
-};
-
-/**
- * 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.
- */
-struct ElementEntry
-{
/**
- * The actual element. The data for the element
- * should be allocated at the end of this struct.
+ * Maps element-id-hashes to 'elements in our set'.
*/
- struct GNUNET_SET_Element element;
+ struct GNUNET_CONTAINER_MultiHashMap *my_elements;
/**
- * Hash of the element.
- * Will be used to derive the different IBF keys
- * for different salts.
+ * Current element count contained within contained_elements
*/
- struct GNUNET_HashCode element_hash;
+ uint32_t my_element_count;
/**
- * Generation the element was added by the client.
- * Operations of earlier generations will not consider the element.
+ * Iterator for sending elements on the key to element mapping to the client.
*/
- unsigned int generation_added;
+ struct GNUNET_CONTAINER_MultiHashMapIterator *full_result_iter;
/**
- * GNUNET_YES if the element has been removed in some generation.
+ * Evaluate operations are held in
+ * a linked list.
*/
- int removed;
+ struct OperationState *next;
- /**
- * 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.
- */
- unsigned int generation_removed;
+ /**
+ * Evaluate operations are held in
+ * a linked list.
+ */
+ struct OperationState *prev;
/**
- * GNUNET_YES if the element is a remote element, and does not belong
- * to the operation's set.
+ * Did we send the client that we are done?
*/
- int remote;
+ int client_done_sent;
};
/**
- * Entries in the key-to-element map of the union set.
+ * Extra state required for efficient set intersection.
*/
-struct KeyEntry
+struct SetState
{
/**
- * IBF key for the entry, derived from the current salt.
- */
- struct IBF_Key ibf_key;
-
- /**
- * The actual element associated with the key
- */
- struct ElementEntry *element;
-
- /**
- * Element that collides with this element
- * on the ibf key
+ * Number of currently valid elements in the set which have not been removed
*/
- struct KeyEntry *next_colliding;
-};
-
-/**
- * Used as a closure for sending elements
- * with a specific IBF key.
- */
-struct SendElementClosure
-{
- /**
- * The IBF key whose matching elements should be
- * sent.
- */
- struct IBF_Key ibf_key;
-
- /**
- * Operation for which the elements
- * should be sent.
- */
- struct IntersectionEvaluateOperation *eo;
+ uint32_t current_set_element_count;
};
/**
- * Extra state required for efficient set union.
+ * Alice's version:
+ *
+ * fills the contained-elements hashmap with all relevant
+ * elements and adds their mutated hashes to our local bloomfilter with mutator+1
+ *
+ * @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.
*/
-struct IntersectionState
+static int
+iterator_initialization_by_alice (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
- /**
- * 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 IntersectionEvaluateOperation *ops_head;
+ struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
- /**
- * Evaluate operations are held in
- * a linked list.
- */
- struct IntersectionEvaluateOperation *ops_tail;
+ //only consider this element, if it is valid for us
+ if ((op->generation_created >= ee->generation_removed)
+ || (op->generation_created < ee->generation_added))
+ return GNUNET_YES;
- /**
- * Current generation, that is, number of
- * previously executed operations on this set
- */
- unsigned int current_generation;
-};
+ // not contained according to bob's bloomfilter
+ GNUNET_BLOCK_mingle_hash(&ee->element_hash,
+ op->spec->salt,
+ &mutated_hash);
+ if (GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (op->state->remote_bf,
+ &mutated_hash))
+ return GNUNET_YES;
+ op->state->my_element_count++;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
+ &ee->element_hash, ee,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ return GNUNET_YES;
+}
/**
- * Iterator over hash map entries.
+ * fills the contained-elements hashmap with all relevant
+ * elements and adds their mutated hashes to our local bloomfilter
*
* @param cls closure
* @param key current key code
* @param value value in the hash map
- * @return GNUNET_YES if we should continue to
+ * @return #GNUNET_YES if we should continue to
* iterate,
- * GNUNET_NO if not.
+ * #GNUNET_NO if not.
*/
static int
-destroy_elements_iterator (void *cls,
- const struct GNUNET_HashCode * key,
- void *value)
+iterator_initialization (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
- GNUNET_free (ee);
- return GNUNET_YES;
-}
-
+ //only consider this element, if it is valid for us
+ if ((op->generation_created >= ee->generation_removed)
+ || (op->generation_created < ee->generation_added))
+ return GNUNET_YES;
-/**
- * Destroy the elements belonging to a union set.
- *
- * @param us union state that contains the elements
- */
-static void
-destroy_elements (struct IntersectionState *us)
-{
- if (NULL == us->elements)
- return;
- GNUNET_CONTAINER_multihashmap_iterate (us->elements, destroy_elements_iterator, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (us->elements);
- us->elements = NULL;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
+ &ee->element_hash, ee,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ return GNUNET_YES;
}
-
/**
- * Iterator over hash map entries.
+ * removes element from a hashmap if it is not contained within the
+ * provided remote bloomfilter. Then, fill our new bloomfilter.
*
* @param cls closure
* @param key current key code
* @param value value in the hash map
- * @return GNUNET_YES if we should continue to
+ * @return #GNUNET_YES if we should continue to
* iterate,
- * GNUNET_NO if not.
+ * #GNUNET_NO if not.
*/
static int
-destroy_key_to_element_iter (void *cls,
- uint32_t key,
- void *value)
+iterator_bf_reduce (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
- struct KeyEntry *k = value;
-
- while (NULL != k)
+ struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
+
+ GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt, &mutated_hash);
+
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_bloomfilter_test (op->state->remote_bf,
+ &mutated_hash))
{
- struct KeyEntry *k_tmp = k;
- k = k->next_colliding;
- GNUNET_free (k_tmp);
+ op->state->my_element_count--;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (op->state->my_elements,
+ &ee->element_hash,
+ ee));
}
+
return GNUNET_YES;
}
-
/**
- * Destroy a union operation, and free all resources
- * associated with it.
+ * create a bloomfilter based on the elements given
*
- * @param eo the union operation to destroy
+ * @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.
*/
-void
-_GSS_union_operation_destroy (struct UnionEvaluateOperation *eo)
+static int
+iterator_bf_create (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "destroying union op\n");
-
- if (NULL != eo->tc)
- {
- GNUNET_MQ_destroy (eo->tc->mq);
- GNUNET_MESH_tunnel_destroy (eo->tc->tunnel);
- GNUNET_free (eo->tc);
- eo->tc = NULL;
- }
-
- 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;
- }
-
- GNUNET_CONTAINER_DLL_remove (eo->set->state.u->ops_head,
- eo->set->state.u->ops_tail,
- eo);
- GNUNET_free (eo);
-
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "destroying union op done\n");
+ struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
+ GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt, &mutated_hash);
- /* FIXME: do a garbage collection of the set generations */
+ GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
+ &mutated_hash);
+ return GNUNET_YES;
}
-
/**
* Inform the client that the union operation has failed,
* and proceed to destroy the evaluate operation.
*
- * @param eo the union operation to fail
+ * @param op the intersection operation to fail
*/
static void
-fail_union_operation (struct UnionEvaluateOperation *eo)
+fail_intersection_operation (struct Operation *op)
{
- struct GNUNET_MQ_Envelope *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *msg;
- mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_RESULT);
- msg->result_status = htons (GNUNET_SET_STATUS_FAILURE);
- msg->request_id = htonl (eo->request_id);
- GNUNET_MQ_send (eo->set->client_mq, mqm);
- _GSS_union_operation_destroy (eo);
-}
+ if (op->state->my_elements)
+ GNUNET_CONTAINER_multihashmap_destroy(op->state->my_elements);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "intersection operation failed\n");
-/**
- * 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,
- &salt, sizeof (salt),
- NULL, 0);
- return key;
+ ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ msg->result_status = htons (GNUNET_SET_STATUS_FAILURE);
+ msg->request_id = htonl (op->spec->client_request_id);
+ msg->element_type = htons (0);
+ GNUNET_MQ_send (op->spec->set->client_mq, ev);
+ _GSS_operation_destroy (op);
}
/**
* Send a request for the evaluate operation to a remote peer
*
- * @param eo operation with the other peer
+ * @param op operation with the other peer
*/
static void
-send_operation_request (struct IntersectionEvaluateOperation *eo)
+send_operation_request (struct Operation *op)
{
- struct GNUNET_MQ_Envelope *mqm;
+ struct GNUNET_MQ_Envelope *ev;
struct OperationRequestMessage *msg;
- mqm = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, eo->context_msg);
+ ev = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
+ op->spec->context_msg);
- if (NULL == mqm)
+ if (NULL == ev)
{
/* the context message is too large */
GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (eo->set->client);
+ GNUNET_SERVER_client_disconnect (op->spec->set->client);
return;
}
- msg->operation = htons (GNUNET_SET_OPERATION_INTERSECTION);
- msg->app_id = eo->app_id;
- GNUNET_MQ_send (eo->tc->mq, mqm);
-
- if (NULL != eo->context_msg)
- {
- GNUNET_free (eo->context_msg);
- eo->context_msg = NULL;
- }
+ msg->operation = htonl (GNUNET_SET_OPERATION_INTERSECTION);
+ msg->app_id = op->spec->app_id;
+ msg->salt = htonl (op->spec->salt);
+ msg->element_count = htonl(op->state->my_element_count);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "sent op request\n");
-}
+ GNUNET_MQ_send (op->mq, ev);
+ if (NULL != op->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");
-/**
- * Iterator to create the mapping between ibf keys
- * and element entries.
- *
- * @param cls closure
- * @param key current key code
- * @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- * iterate,
- * GNUNET_NO if not.
- */
-static int
-insert_element_iterator (void *cls,
- uint32_t key,
- void *value)
-{
- struct KeyEntry *const new_k = cls;
- struct KeyEntry *old_k = value;
-
- GNUNET_assert (NULL != old_k);
- do
+ if (NULL != op->spec->context_msg)
{
- if (old_k->ibf_key.key_val == new_k->ibf_key.key_val)
- {
- new_k->next_colliding = old_k->next_colliding;
- old_k->next_colliding = new_k;
- return GNUNET_NO;
- }
- old_k = old_k->next_colliding;
- } while (NULL != old_k);
- return GNUNET_YES;
+ GNUNET_free (op->spec->context_msg);
+ op->spec->context_msg = NULL;
+ }
}
-
-/**
- * Insert an element into the union operation's
- * key-to-element mapping
- *
- * @param eo the union operation
- * @param ee the element entry
- */
static void
-insert_element (struct UnionEvaluateOperation *eo, struct ElementEntry *ee)
+send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
{
- int ret;
- struct IBF_Key ibf_key;
- struct KeyEntry *k;
-
- ibf_key = get_ibf_key (&ee->element_hash, eo->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);
-
- /* was the element inserted into a colliding bucket? */
- if (GNUNET_SYSERR == ret)
- return;
+ struct GNUNET_MQ_Envelope *ev;
+ struct BFPart *msg;
+ uint32_t chunk_size = (GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof(struct BFPart));
+ uint32_t todo_size = op->state->local_bf_data_size - offset;
- GNUNET_CONTAINER_multihashmap32_put (eo->key_to_element, (uint32_t) ibf_key.key_val, k,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-}
+ if (todo_size < chunk_size)
+ chunk_size = todo_size;
+ ev = GNUNET_MQ_msg_extra (msg, chunk_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF_PART);
-/**
- * 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)
-{
- struct InvertibleBloomFilter *ibf = cls;
- struct KeyEntry *ke = value;
-
- ibf_insert (ibf, ke->ibf_key);
- return GNUNET_YES;
-}
+ msg->bloomfilter_length = htonl (chunk_size);
+ msg->bloomfilter_offset = htonl (offset);
+ memcpy(&msg[1], &op->state->local_bf_data[offset], chunk_size);
+ GNUNET_MQ_send (op->mq, ev);
-/**
- * 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
- */
-static int
-init_key_to_element_iterator (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
-{
- struct UnionEvaluateOperation *eo = cls;
- struct ElementEntry *e = value;
-
- /* 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;
-
- insert_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)
-{
- if (NULL == eo->key_to_element)
+ if (op->state->local_bf_data_size == offset + chunk_size)
{
- unsigned int len;
- len = GNUNET_CONTAINER_multihashmap_size (eo->set->state.u->elements);
- eo->key_to_element = GNUNET_CONTAINER_multihashmap32_create (len + 1);
- GNUNET_CONTAINER_multihashmap_iterate (eo->set->state.u->elements,
- init_key_to_element_iterator, eo);
+ // done
+ GNUNET_free(op->state->local_bf_data);
+ op->state->local_bf_data = NULL;
+ return;
}
- 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);
-}
+ send_bloomfilter_multipart (op, offset + chunk_size);
+}
/**
- * Send an ibf of appropriate size.
+ * Send a bloomfilter to our peer.
+ * that the operation is over.
+ * After the result done message has been sent to the client,
+ * destroy the evaluate operation.
*
- * @param eo the union operation
- * @param ibf_order order of the ibf to send, size=2^order
+ * @param op intersection operation
*/
static void
-send_ibf (struct UnionEvaluateOperation *eo, uint16_t ibf_order)
+send_bloomfilter (struct Operation *op)
{
- unsigned int buckets_sent = 0;
- struct InvertibleBloomFilter *ibf;
+ struct GNUNET_MQ_Envelope *ev;
+ struct BFMessage *msg;
+ uint32_t bf_size;
+ uint32_t bf_elementbits;
+ uint32_t chunk_size;
+ struct GNUNET_CONTAINER_BloomFilter * local_bf;
- prepare_ibf (eo, 1<<ibf_order);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending bf of size %u\n");
+
+ CALCULATE_BF_SIZE(op->state->my_element_count,
+ op->spec->remote_element_count,
+ bf_size,
+ bf_elementbits);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "sending ibf of size %u\n", 1<<ibf_order);
+ local_bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ bf_size,
+ bf_elementbits);
- ibf = eo->local_ibf;
+ op->spec->salt++;
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_bf_create,
+ op);
- while (buckets_sent < (1 << ibf_order))
- {
- unsigned int buckets_in_message;
- struct GNUNET_MQ_Envelope *mqm;
- struct IBFMessage *msg;
-
- buckets_in_message = (1 << ibf_order) - buckets_sent;
- /* limit to maximum */
- 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,
- GNUNET_MESSAGE_TYPE_SET_P2P_IBF);
- 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->tc->mq, mqm);
+ // send our bloomfilter
+ if (GNUNET_SERVER_MAX_MESSAGE_SIZE > bf_size + sizeof (struct BFMessage)) {
+ // singlepart
+ chunk_size = bf_size;
+ ev = GNUNET_MQ_msg_extra (msg, chunk_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_bloomfilter_get_raw_data (local_bf,
+ &msg[1],
+ bf_size));
+ }
+ else {
+ //multipart
+ chunk_size = GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - sizeof (struct BFMessage);
+ ev = GNUNET_MQ_msg_extra (msg, chunk_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
+ op->state->local_bf_data = (char *) GNUNET_malloc (bf_size);
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_bloomfilter_get_raw_data (local_bf,
+ op->state->local_bf_data,
+ bf_size));
+ memcpy (&msg[1], op->state->local_bf_data, chunk_size);
+ op->state->local_bf_data_size = bf_size;
}
+ GNUNET_CONTAINER_bloomfilter_free (local_bf);
- eo->phase = PHASE_EXPECT_ELEMENTS_AND_REQUESTS;
-}
+ msg->sender_element_count = htonl (op->state->my_element_count);
+ msg->bloomfilter_total_length = htonl (bf_size);
+ msg->bloomfilter_length = htonl (chunk_size);
+ msg->bits_per_element = htonl (bf_elementbits);
+ msg->sender_mutator = htonl (op->spec->salt);
+ GNUNET_MQ_send (op->mq, ev);
-/**
- * Send a strata estimator to the remote peer.
- *
- * @param eo the union operation with the remote peer
- */
-static void
-send_strata_estimator (struct IntersectionEvaluateOperation *eo)
-{
- struct GNUNET_MQ_Envelope *mqm;
- 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.i->se, &strata_msg[1]);
- GNUNET_MQ_send (eo->tc->mq, mqm);
- eo->phase = PHASE_EXPECT_IBF;
+ if (op->state->local_bf_data)
+ send_bloomfilter_multipart (op, chunk_size);
}
/**
- * Compute the necessary order of an ibf
- * from the size of the symmetric set difference.
+ * Signal to the client that the operation has finished and
+ * destroy the operation.
*
- * @param diff the difference
- * @return the required size of the ibf
+ * @param cls operation to destroy
*/
-static unsigned int
-get_order_from_difference (unsigned int diff)
+static void
+send_client_done_and_destroy (void *cls)
{
- unsigned int ibf_order;
-
- ibf_order = 2;
- while ((1<<ibf_order) < (2 * diff))
- ibf_order++;
- if (ibf_order > MAX_IBF_ORDER)
- ibf_order = MAX_IBF_ORDER;
- return ibf_order;
+ struct Operation *op = cls;
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *rm;
+ ev = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ rm->request_id = htonl (op->spec->client_request_id);
+ rm->result_status = htons (GNUNET_SET_STATUS_DONE);
+ rm->element_type = htons (0);
+ GNUNET_MQ_send (op->spec->set->client_mq, ev);
+ _GSS_operation_destroy (op);
}
/**
- * Handle a strata estimator from a remote peer
+ * Send all elements in the full result iterator.
*
- * @param cls the union operation
- * @param mh the message
+ * @param cls operation
*/
static void
-handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
+send_remaining_elements (void *cls)
{
- struct UnionEvaluateOperation *eo = cls;
- struct StrataEstimator *remote_se;
- int diff;
-
+ struct Operation *op = cls;
+ struct ElementEntry *remaining; //TODO rework this, key entry does not exist here
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_SET_ResultMessage *rm;
+ struct GNUNET_SET_Element *element;
+ int res;
- if (eo->phase != PHASE_EXPECT_SE)
- {
- fail_union_operation (eo);
- GNUNET_break (0);
+ res = GNUNET_CONTAINER_multihashmap_iterator_next (op->state->full_result_iter, NULL, (const void **) &remaining);
+ if (GNUNET_NO == res) {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending done and destroy because iterator ran out\n");
+ send_client_done_and_destroy (op);
return;
}
- remote_se = strata_estimator_create (SE_STRATA_COUNT, SE_IBF_SIZE,
- SE_IBF_HASH_NUM);
- strata_estimator_read (&mh[1], remote_se);
- GNUNET_assert (NULL != eo->se);
- diff = strata_estimator_difference (remote_se, eo->se);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got se, diff=%d\n", diff);
- strata_estimator_destroy (remote_se);
- strata_estimator_destroy (eo->se);
- eo->se = NULL;
- send_ibf (eo, get_order_from_difference (diff));
-}
+ element = &remaining->element;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (size %u) to client (full set)\n", element->size);
+ GNUNET_assert (0 != op->spec->client_request_id);
+ ev = GNUNET_MQ_msg_extra (rm, element->size, GNUNET_MESSAGE_TYPE_SET_RESULT);
+ GNUNET_assert (NULL != ev);
-/**
- * Iterator to send elements to a remote peer
- *
- * @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 UnionEvaluateOperation *eo = sec->eo;
- struct KeyEntry *ke = value;
+ rm->result_status = htons (GNUNET_SET_STATUS_OK);
+ rm->request_id = htonl (op->spec->client_request_id);
+ rm->element_type = element->type;
+ memcpy (&rm[1], element->data, element->size);
- 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 *mqm;
- struct GNUNET_MessageHeader *mh;
-
- GNUNET_assert (ke->ibf_key.key_val == ibf_key.key_val);
- mqm = GNUNET_MQ_msg_header_extra (mh, element->size, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS);
- if (NULL == mqm)
- {
- /* element too large */
- GNUNET_break (0);
- continue;
- }
- memcpy (&mh[1], element->data, element->size);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "sending element to client\n");
- GNUNET_MQ_send (eo->tc->mq, mqm);
- ke = ke->next_colliding;
- }
- return GNUNET_NO;
+ GNUNET_MQ_notify_sent (ev, send_remaining_elements, op);
+ GNUNET_MQ_send (op->spec->set->client_mq, ev);
}
+
/**
- * Send all elements that have the specified IBF key
- * to the remote peer of the union operation
+ * Inform the peer that this operation is complete.
*
- * @param eo union operation
- * @param ibf_key IBF key of interest
+ * @param op the intersection operation to fail
*/
static void
-send_elements_for_key (struct UnionEvaluateOperation *eo, struct IBF_Key ibf_key)
+send_peer_done (struct Operation *op)
{
- struct SendElementClosure send_cls;
+ struct GNUNET_MQ_Envelope *ev;
- 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);
-}
+ op->state->phase = PHASE_FINISHED;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Intersection succeeded, sending DONE\n");
+ GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf);
+ op->state->local_bf = NULL;
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ GNUNET_MQ_send (op->mq, ev);
+}
/**
- * Decode which elements are missing on each side, and
- * send the appropriate elemens and requests
+ * Handle an BF multipart message from a remote peer.
*
- * @param eo union operation
+ * @param cls the intersection operation
+ * @param mh the header of the message
*/
static void
-decode_and_send (struct UnionEvaluateOperation *eo)
+handle_p2p_bf_part (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct IBF_Key key;
- int side;
- struct InvertibleBloomFilter *diff_ibf;
-
- GNUNET_assert (PHASE_EXPECT_ELEMENTS == eo->phase);
-
- prepare_ibf (eo, eo->remote_ibf->size);
- diff_ibf = ibf_dup (eo->local_ibf);
- ibf_subtract (diff_ibf, eo->remote_ibf);
-
- while (1)
- {
- int res;
-
- res = ibf_decode (diff_ibf, &side, &key);
- if (GNUNET_SYSERR == res)
- {
- 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_Envelope *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->tc->mq, mqm);
- break;
- }
- if (1 == side)
- {
- send_elements_for_key (eo, key);
- }
- else
- {
- struct GNUNET_MQ_Envelope *mqm;
- 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);
- *(struct IBF_Key *) &msg[1] = key;
- GNUNET_MQ_send (eo->tc->mq, mqm);
- }
+ struct Operation *op = cls;
+ const struct BFPart *msg = (const struct BFPart *) mh;
+
+ if (op->state->phase != PHASE_BF_AWAIT_MULTIPART){
+ GNUNET_break_op (0);
+ fail_intersection_operation(op);
+ return;
}
- ibf_destroy (diff_ibf);
+
+
}
-
/**
- * Handle an IBF message from a remote peer.
+ * Handle an BF message from a remote peer.
*
- * @param cls the union operation
+ * @param cls the intersection 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 IBFMessage *msg = (struct IBFMessage *) mh;
- unsigned int buckets_in_message;
-
- if ( (eo->phase == PHASE_EXPECT_ELEMENTS_AND_REQUESTS) ||
- (eo->phase == PHASE_EXPECT_IBF) )
- {
- eo->phase = PHASE_EXPECT_IBF_CONT;
- GNUNET_assert (NULL == eo->remote_ibf);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "creating new ibf of order %u\n", 1<<msg->order);
- eo->remote_ibf = ibf_create (1<<msg->order, SE_IBF_HASH_NUM);
- if (0 != ntohs (msg->offset))
- {
- GNUNET_break (0);
- fail_union_operation (eo);
- }
- }
- else if (eo->phase == PHASE_EXPECT_IBF_CONT)
- {
- if ( (ntohs (msg->offset) != eo->ibf_buckets_received) ||
- (1<<msg->order != eo->remote_ibf->size) )
- {
- GNUNET_break (0);
- fail_union_operation (eo);
- return;
- }
- }
-
- buckets_in_message = (ntohs (msg->header.size) - sizeof *msg) / IBF_BUCKET_SIZE;
-
- if ((ntohs (msg->header.size) - sizeof *msg) != buckets_in_message * IBF_BUCKET_SIZE)
- {
- GNUNET_break (0);
- fail_union_operation (eo);
+handle_p2p_bf (void *cls, const struct GNUNET_MessageHeader *mh)
+{
+ struct Operation *op = cls;
+ const struct BFMessage *msg = (const struct BFMessage *) mh;
+ uint32_t old_elements;
+ uint32_t peer_elements;
+
+ old_elements = op->state->my_element_count;
+ op->spec->salt = ntohl (msg->sender_mutator);
+
+ op->state->remote_bf = GNUNET_CONTAINER_bloomfilter_init ((const char*) &msg[1],
+ ntohl (msg->bloomfilter_total_length),
+ ntohl (msg->bits_per_element));
+ op->state->local_bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ BLOOMFILTER_SIZE,
+ GNUNET_CONSTANTS_BLOOMFILTER_K);
+ switch (op->state->phase)
+ {
+ case PHASE_INITIAL:
+ // If we are ot our first msg
+ op->state->my_elements = GNUNET_CONTAINER_multihashmap_create (op->state->my_element_count, GNUNET_YES);
+
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_initialization_by_alice,
+ op);
+ break;
+ case PHASE_BF_EXCHANGE:
+ case PHASE_MAYBE_FINISHED:
+ // if we are bob or alice and are continuing operation
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_bf_reduce,
+ op);
+ break;
+ default:
+ GNUNET_break_op (0);
+ fail_intersection_operation(op);
+ }
+ // the iterators created a new BF with salt+1
+ // the peer needs this information for decoding the next BF
+ // this behavior can be modified at will later on.
+ op->spec->salt++;
+
+ GNUNET_CONTAINER_bloomfilter_free (op->state->remote_bf);
+ op->state->remote_bf = NULL;
+
+ peer_elements = ntohl(msg->sender_element_count);
+ if ((op->state->phase == PHASE_MAYBE_FINISHED)
+ && (old_elements == op->state->my_element_count)
+ && (op->state->my_element_count == peer_elements)){
+ // In the last round we though we were finished, we now know this is correct
+ send_peer_done(op);
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 == eo->remote_ibf->size)
- {
+ op->state->phase = PHASE_BF_EXCHANGE;
+ // maybe we are finished, but we do one more round to make certain
+ // we don't have false positives ...
+ if (op->state->my_element_count == peer_elements)
+ op->state->phase = PHASE_MAYBE_FINISHED;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "received full strata estimator\n");
- eo->phase = PHASE_EXPECT_ELEMENTS;
- decode_and_send (eo);
- }
+ send_bloomfilter (op);
}
/**
- * Send a result message to the client indicating
- * that there is a new element.
+ * Handle an BF message from a remote peer.
*
- * @param eo union operation
- * @param element element to send
+ * @param cls the intersection operation
+ * @param mh the header of the message
*/
static void
-send_client_element (struct UnionEvaluateOperation *eo,
- struct GNUNET_SET_Element *element)
+handle_p2p_element_info (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct GNUNET_MQ_Envelope *mqm;
- struct GNUNET_SET_ResultMessage *rm;
+ struct Operation *op = cls;
+ struct BFMessage *msg = (struct BFMessage *) mh;
- GNUNET_assert (0 != eo->request_id);
- mqm = GNUNET_MQ_msg_extra (rm, element->size, GNUNET_MESSAGE_TYPE_SET_RESULT);
- if (NULL == mqm)
- {
- GNUNET_MQ_discard (mqm);
- GNUNET_break (0);
- return;
+ op->spec->remote_element_count = ntohl(msg->sender_element_count);
+ if ((op->state->phase != PHASE_INITIAL)
+ || (op->state->my_element_count > op->spec->remote_element_count)){
+ GNUNET_break_op (0);
+ fail_intersection_operation(op);
}
- rm->result_status = htons (GNUNET_SET_STATUS_OK);
- rm->request_id = htonl (eo->request_id);
- memcpy (&rm[1], element->data, element->size);
- GNUNET_MQ_send (eo->set->client_mq, mqm);
+
+ op->state->phase = PHASE_BF_EXCHANGE;
+ op->state->my_elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
+
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_initialization,
+ op);
+
+ GNUNET_CONTAINER_bloomfilter_free (op->state->remote_bf);
+ op->state->remote_bf = NULL;
+
+ if (op->state->my_element_count == ntohl (msg->sender_element_count))
+ op->state->phase = PHASE_MAYBE_FINISHED;
+
+ send_bloomfilter (op);
}
/**
- * 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.
+ * Send our element to the peer, in case our element count is lower than his
*
- * @param eo union operation
+ * @param op intersection operation
*/
static void
-send_client_done_and_destroy (struct UnionEvaluateOperation *eo)
+send_element_count (struct Operation *op)
{
- struct GNUNET_MQ_Envelope *mqm;
- struct GNUNET_SET_ResultMessage *rm;
+ struct GNUNET_MQ_Envelope *ev;
+ struct BFMessage *msg;
- GNUNET_assert (0 != eo->request_id);
- mqm = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SET_RESULT);
- rm->request_id = htonl (eo->request_id);
- rm->result_status = htons (GNUNET_SET_STATUS_DONE);
- GNUNET_MQ_send (eo->set->client_mq, mqm);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element count (bf_msg)\n");
+
+ // just send our element count, as the other peer must start
+ ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO);
+ msg->sender_element_count = htonl (op->state->my_element_count);
+ msg->bloomfilter_length = htonl (0);
+ msg->sender_mutator = htonl (0);
+ GNUNET_MQ_send (op->mq, ev);
}
/**
- * Handle an element message from a remote peer.
+ * 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 cls the union operation
- * @param mh the message
+ * @param op intersection operation
*/
static void
-handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
+finish_and_destroy (struct Operation *op)
{
- struct UnionEvaluateOperation *eo = cls;
- struct ElementEntry *ee;
- uint16_t element_size;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got element from peer\n");
+ GNUNET_assert (GNUNET_NO == op->state->client_done_sent);
- if ( (eo->phase != PHASE_EXPECT_ELEMENTS) &&
- (eo->phase != PHASE_EXPECT_ELEMENTS_AND_REQUESTS) )
+ if (GNUNET_SET_RESULT_FULL == op->spec->result_mode)
{
- fail_union_operation (eo);
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending full result set\n");
+ op->state->full_result_iter =
+ GNUNET_CONTAINER_multihashmap_iterator_create (op->state->my_elements);
+ send_remaining_elements (op);
return;
}
- element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
- ee = GNUNET_malloc (sizeof *eo + element_size);
- memcpy (&ee[1], &mh[1], element_size);
- ee->element.data = &ee[1];
- ee->remote = GNUNET_YES;
-
- insert_element (eo, ee);
- send_client_element (eo, &ee->element);
-
- GNUNET_free (ee);
+ send_client_done_and_destroy (op);
}
/**
- * Handle an element request from a remote peer.
+ * Handle a done message 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)
+handle_p2p_done (void *cls,
+ const struct GNUNET_MessageHeader *mh)
{
- struct UnionEvaluateOperation *eo = cls;
- struct IBF_Key *ibf_key;
- unsigned int num_keys;
-
- /* look up elements and send them */
- if (eo->phase != PHASE_EXPECT_ELEMENTS_AND_REQUESTS)
- {
- GNUNET_break (0);
- fail_union_operation (eo);
- return;
- }
+ struct Operation *op = cls;
- num_keys = (ntohs (mh->size) - sizeof *mh) / sizeof (struct IBF_Key);
+ if ((op->state->phase = PHASE_FINISHED) || (op->state->phase = PHASE_MAYBE_FINISHED)){
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got final DONE\n");
- if ((ntohs (mh->size) - sizeof *mh) != num_keys * sizeof (struct IBF_Key))
- {
- GNUNET_break (0);
- fail_union_operation (eo);
+ finish_and_destroy (op);
return;
}
- ibf_key = (struct IBF_Key *) &mh[1];
- while (0 != num_keys--)
- {
- send_elements_for_key (eo, *ibf_key);
- ibf_key++;
- }
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
}
/**
- * Callback used for notifications
+ * Evaluate a union operation with
+ * a remote peer.
*
- * @param cls closure
+ * @param op operation to evaluate
*/
static void
-peer_done_sent_cb (void *cls)
+intersection_evaluate (struct Operation *op)
{
- struct UnionEvaluateOperation *eo = cls;
+ op->state = GNUNET_new (struct OperationState);
+ /* we started the operation, thus we have to send the operation request */
+ op->state->phase = PHASE_INITIAL;
+ op->state->my_elements = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_YES);
+ op->state->my_element_count = op->spec->set->state->current_set_element_count;
- send_client_done_and_destroy (eo);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "evaluating intersection operation");
+ send_operation_request (op);
}
/**
- * Handle a done message from a remote peer
- *
- * @param cls the union operation
- * @param mh the message
+ * Accept an union operation request from a remote peer.
+ * Only initializes the private operation state.
+ *
+ * @param op operation that will be accepted as a union operation
*/
static void
-handle_p2p_done (void *cls, const struct GNUNET_MessageHeader *mh)
+intersection_accept (struct Operation *op)
{
- struct UnionEvaluateOperation *eo = cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "accepting set union operation\n");
+ op->state = GNUNET_new (struct OperationState);
+ op->state->my_elements = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_YES);
+ op->state->my_element_count = op->spec->set->state->current_set_element_count;
- if (eo->phase == PHASE_EXPECT_ELEMENTS_AND_REQUESTS)
- {
- /* we got all requests, but still have to send our elements as response */
- struct GNUNET_MQ_Envelope *mqm;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got DONE, sending final DONE after elements\n");
- eo->phase = PHASE_FINISHED;
- mqm = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
- GNUNET_MQ_notify_sent (mqm, peer_done_sent_cb, eo);
- GNUNET_MQ_send (eo->tc->mq, mqm);
+ // if Alice (the peer) has more elements than Bob (us), she should start
+ if (op->spec->remote_element_count < op->state->my_element_count){
+ op->state->phase = PHASE_INITIAL;
+ send_element_count(op);
return;
}
- if (eo->phase == PHASE_EXPECT_ELEMENTS)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got final DONE\n");
- eo->phase = PHASE_FINISHED;
- send_client_done_and_destroy (eo);
- return;
- }
- GNUNET_break (0);
- fail_union_operation (eo);
+ // create a new bloomfilter in case we have fewer elements
+ op->state->phase = PHASE_BF_EXCHANGE;
+ op->state->local_bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ BLOOMFILTER_SIZE,
+ GNUNET_CONSTANTS_BLOOMFILTER_K);
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_initialization,
+ op);
+ send_bloomfilter (op);
}
/**
- * Evaluate a union operation with
- * a remote peer.
+ * Create a new set supporting the intersection operation
*
- * @param m the evaluate request message from the client
- * @param set the set to evaluate the operation with
+ * @return the newly created set
*/
-void
-_GSS_intersection_evaluate (struct GNUNET_SET_EvaluateMessage *m, struct Set *set)
+static struct SetState *
+intersection_set_create ()
{
- struct IntersectionEvaluateOperation *eo;
- struct GNUNET_MessageHeader *context_msg;
-
- eo = GNUNET_new (struct IntersectionEvaluateOperation);
- eo->peer = m->target_peer;
- eo->set = set;
- eo->request_id = htonl (m->request_id);
- GNUNET_assert (0 != eo->request_id);
- eo->se = strata_estimator_dup (set->state.i->se);
- eo->salt = ntohs (m->salt);
- eo->app_id = m->app_id;
-
- context_msg = GNUNET_MQ_extract_nested_mh (m);
- if (NULL != context_msg)
- {
- eo->context_msg = GNUNET_copy_message (context_msg);
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "evaluating intersection operation, (app %s)\n",
- GNUNET_h2s (&eo->app_id));
-
- eo->tc = GNUNET_new (struct TunnelContext);
- eo->tc->tunnel = GNUNET_MESH_tunnel_create (mesh, eo->tc, &eo->peer,
- GNUNET_APPLICATION_TYPE_SET);
- GNUNET_assert (NULL != eo->tc->tunnel);
- eo->tc->peer = eo->peer;
- eo->tc->mq = GNUNET_MESH_mq_create (eo->tc->tunnel);
- /* we started the operation, thus we have to send the operation request */
- eo->phase = PHASE_EXPECT_SE;
+ struct SetState *set_state;
- GNUNET_CONTAINER_DLL_insert (eo->set->state.i->ops_head,
- eo->set->state.i->ops_tail,
- eo);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "intersection set created\n");
+ set_state = GNUNET_new (struct SetState);
+ set_state->current_set_element_count = 0;
- send_operation_request (eo);
+ return set_state;
}
/**
- * Accept an union operation request from a remote peer
+ * Add the element from the given element message to the set.
*
- * @param m the accept message from the client
- * @param set the set of the client
- * @param incoming information about the requesting remote peer
+ * @param set_state state of the set want to add to
+ * @param ee the element to add to the set
*/
-void
-_GSS_intersection_accept (struct GNUNET_SET_AcceptRejectMessage *m, struct Set *set,
- struct Incoming *incoming)
+static void
+intersection_add (struct SetState *set_state,
+ struct ElementEntry *ee)
{
- struct IntersectionEvaluateOperation *eo;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "accepting set union operation\n");
-
- eo = GNUNET_new (struct IntersectionEvaluateOperation);
- eo->tc = incoming->tc;
- eo->generation_created = set->state.i->current_generation++;
- eo->set = set;
- eo->salt = ntohs (incoming->salt);
- GNUNET_assert (0 != ntohl (m->request_id));
- eo->request_id = ntohl (m->request_id);
- eo->se = strata_estimator_dup (set->state.i->se);
- /* transfer ownership of mq and socket from incoming to eo */
- GNUNET_CONTAINER_DLL_insert (eo->set->state.i->ops_head,
- eo->set->state.i->ops_tail,
- eo);
- /* kick off the operation */
- send_strata_estimator (eo);
+ GNUNET_assert(0 < set_state->current_set_element_count);
+ set_state->current_set_element_count++;
}
/**
- * Create a new set supporting the intersection operation
+ * Destroy a set that supports the intersection operation
*
- * @return the newly created set
+ * @param set_state the set to destroy
*/
-struct Set *
-_GSS_intersection_set_create (void)
+static void
+intersection_set_destroy (struct SetState *set_state)
{
- struct Set *set;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "intersection set created\n");
-
- set = GNUNET_malloc (sizeof (struct Set) + sizeof (struct IntersectionState));
- set->state.i = (struct IntersectionState *) &set[1];
- set->operation = GNUNET_SET_OPERATION_INTERSECTION;
- /* keys of the hash map are stored in the element entrys, thus we do not
- * want the hash map to copy them */
- set->state.i->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
- set->state.i->se = strata_estimator_create (SE_STRATA_COUNT,
- SE_IBF_SIZE, SE_IBF_HASH_NUM);
- return set;
+ GNUNET_free (set_state);
}
/**
- * Add the element from the given element message to the set.
+ * Remove the element given in the element message from the set.
*
- * @param m message with the element
- * @param set set to add the element to
+ * @param set_state state of the set to remove from
+ * @param element set element to remove
*/
-void
-_GSS_intersection_add (struct GNUNET_SET_ElementMessage *m, struct Set *set)
+static void
+intersection_remove (struct SetState *set_state,
+ struct ElementEntry *element)
{
- struct ElementEntry *ee;
- struct ElementEntry *ee_dup;
- uint16_t element_size;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "adding element\n");
-
- GNUNET_assert (GNUNET_SET_OPERATION_INTERSECTION == set->operation);
- element_size = ntohs (m->header.size) - sizeof *m;
- ee = GNUNET_malloc (element_size + sizeof *ee);
- ee->element.size = element_size;
- memcpy (&ee[1], &m[1], element_size);
- ee->element.data = &ee[1];
- ee->generation_added = set->state.i->current_generation;
- GNUNET_CRYPTO_hash (ee->element.data, element_size, &ee->element_hash);
- ee_dup = GNUNET_CONTAINER_multihashmap_get (set->state.i->elements, &ee->element_hash);
- if (NULL != ee_dup)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "element inserted twice, ignoring\n");
- GNUNET_free (ee);
- return;
- }
- GNUNET_CONTAINER_multihashmap_put (set->state.i->elements, &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- strata_estimator_insert (set->state.i->se, get_ibf_key (&ee->element_hash, 0));
+ GNUNET_assert(0 < set_state->current_set_element_count);
+ set_state->current_set_element_count--;
}
/**
- * Destroy a set that supports the union operation
+ * Dispatch messages for a intersection operation.
*
- * @param the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
+ * @param op the state of the intersection evaluate operation
+ * @param mh the received message
+ * @return #GNUNET_SYSERR if the tunnel should be disconnected,
+ * #GNUNET_OK otherwise
*/
-void
-_GSS_union_set_destroy (struct Set *set)
+static int
+intersection_handle_p2p_message (struct Operation *op,
+ const struct GNUNET_MessageHeader *mh)
{
- GNUNET_assert (GNUNET_SET_OPERATION_UNION == set->operation);
- if (NULL != set->client)
- {
- GNUNET_SERVER_client_drop (set->client);
- set->client = NULL;
- }
- if (NULL != set->client_mq)
- {
- GNUNET_MQ_destroy (set->client_mq);
- set->client_mq = NULL;
- }
-
- if (NULL != set->state.u->se)
- {
- strata_estimator_destroy (set->state.u->se);
- set->state.u->se = NULL;
- }
-
- destroy_elements (set->state.u);
-
- while (NULL != set->state.u->ops_head)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received p2p message (t: %u, s: %u)\n",
+ ntohs (mh->type), ntohs (mh->size));
+ switch (ntohs (mh->type))
{
- _GSS_union_operation_destroy (set->state.u->ops_head);
+ /* this message handler is not active until after we received an
+ * operation request message, thus the ops request is not handled here
+ */
+ case GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO:
+ handle_p2p_element_info (op, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF:
+ handle_p2p_bf (op, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF_PART:
+ handle_p2p_bf_part (op, mh);
+ break;
+ case GNUNET_MESSAGE_TYPE_SET_P2P_DONE:
+ handle_p2p_done (op, mh);
+ break;
+ default:
+ /* something wrong with mesh's message handlers? */
+ GNUNET_assert (0);
}
+ return GNUNET_OK;
}
+
/**
- * 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.
+ * handler for peer-disconnects, notifies the client about the aborted operation
*
- * @param m message with the element
- * @param set set to remove the element from
+ * @param op the destroyed operation
*/
-void
-_GSS_intersection_remove (struct GNUNET_SET_ElementMessage *m, struct Set *set)
+static void
+intersection_peer_disconnect (struct Operation *op)
{
- struct GNUNET_HashCode hash;
- struct ElementEntry *ee;
-
- GNUNET_assert (GNUNET_SET_OPERATION_UNION == set->operation);
- GNUNET_CRYPTO_hash (&m[1], ntohs (m->header.size), &hash);
- ee = GNUNET_CONTAINER_multihashmap_get (set->state.i->elements, &hash);
- if (NULL == ee)
+ if (PHASE_FINISHED != op->state->phase)
{
- 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");
+ 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");
+ _GSS_operation_destroy (op);
return;
}
- ee->removed = GNUNET_YES;
- ee->generation_removed = set->state.i->current_generation;
+ // else: the session has already been concluded
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "other peer disconnected (finished)\n");
+ if (GNUNET_NO == op->state->client_done_sent)
+ finish_and_destroy (op);
}
/**
- * Dispatch messages for a union operation.
+ * Destroy the union operation. Only things specific to the union operation are destroyed.
*
- * @param cls closure
- * @param tunnel mesh tunnel
- * @param tunnel_ctx tunnel context
- * @param sender ???
- * @param mh message to process
- * @return ???
+ * @param op union operation to destroy
*/
-int
-_GSS_union_handle_p2p_message (void *cls,
- struct GNUNET_MESH_Tunnel *tunnel,
- void **tunnel_ctx,
- const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *mh)
+static void
+intersection_op_cancel (struct Operation *op)
{
- struct TunnelContext *tc = *tunnel_ctx;
- struct UnionEvaluateOperation *eo;
-
- if (CONTEXT_OPERATION_UNION != tc->type)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying intersection op\n");
+ /* check if the op was canceled twice */
+ GNUNET_assert (NULL != op->state);
+ if (NULL != op->state->remote_bf)
{
- /* FIXME: kill the tunnel */
- /* never kill mesh */
- return GNUNET_OK;
+ GNUNET_CONTAINER_bloomfilter_free (op->state->remote_bf);
+ op->state->remote_bf = NULL;
}
-
- eo = tc->data;
-
- switch (ntohs (mh->type))
+ if (NULL != op->state->local_bf)
{
- 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);
+ GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf);
+ op->state->local_bf = NULL;
}
- /* never kill mesh! */
- return GNUNET_OK;
+ if (NULL != op->state->my_elements)
+ {
+ // no need to free the elements, they are still part of the set
+ GNUNET_CONTAINER_multihashmap_destroy (op->state->my_elements);
+ op->state->my_elements = NULL;
+ }
+ GNUNET_free (op->state);
+ op->state = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying intersection op done\n");
+}
+
+const struct SetVT *
+_GSS_intersection_vt ()
+{
+ static const struct SetVT intersection_vt = {
+ .create = &intersection_set_create,
+ .msg_handler = &intersection_handle_p2p_message,
+ .add = &intersection_add,
+ .remove = &intersection_remove,
+ .destroy_set = &intersection_set_destroy,
+ .evaluate = &intersection_evaluate,
+ .accept = &intersection_accept,
+ .peer_disconnect = &intersection_peer_disconnect,
+ .cancel = &intersection_op_cancel,
+ };
+
+ return &intersection_vt;
}
projects / oweals / gnunet.git / blobdiff