#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-set.h"
-#include "strata_estimator.h"
+#include "gnunet_block_lib.h"
#include "set_protocol.h"
#include <gcrypt.h>
+#define BLOOMFILTER_SIZE GNUNET_CRYPTO_HASH_LENGTH
+
+#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 intersection operation.
*/
enum IntersectionOperationPhase
{
/**
- * We get our tunnel but received no message as of now
+ * Alices has suggested an operation to bob,
+ * and is waiting for a bf or session end.
*/
- PHASE_EXPECT_INITIAL,
+ PHASE_INITIAL,
/**
- * We expect a BF + the number of the other peers elements
+ * Bob has accepted the operation, Bob and Alice are now exchanging bfs
+ * until one notices the their element count is equal
*/
PHASE_BF_EXCHANGE,
+ /**
+ * Multipart continuation of BF_exchange
+ */
+ PHASE_BF_AWAIT_MULTIPART,
+ /**
+ * 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_MAYBE_FINISHED,
/**
* The protocol is over.
* Results may still have to be sent to the client.
struct OperationState
{
/**
- * Tunnel to the remote peer.
- */
- struct GNUNET_MESH_Tunnel *tunnel;
-
- /**
- * Detail information about the set operation,
- * including the set to use.
+ * The bf we currently receive
*/
- struct OperationSpecification *spec;
+ struct GNUNET_CONTAINER_BloomFilter *remote_bf;
/**
- * Message queue for the peer.
+ * BF of the set's element.
*/
- struct GNUNET_MQ_Handle *mq;
+ struct GNUNET_CONTAINER_BloomFilter *local_bf;
/**
- * The bf we currently receive
+ * for multipart msgs we have to store the bloomfilter-data until we fully sent it.
*/
- struct GNUNET_CONTAINER_BloomFilter *remote_bf;
+ char * local_bf_data;
/**
- * BF of the set's element.
+ * size of the bloomfilter
*/
- struct GNUNET_CONTAINER_BloomFilter *local_bf;
-
+ uint32_t local_bf_data_size;
+
/**
* Current state of the operation.
*/
*/
unsigned int generation_created;
- /**
- * Set state of the set that this operation
- * belongs to.
- */
- struct Set *set;
-
/**
* Maps element-id-hashes to 'elements in our set'.
*/
- struct GNUNET_CONTAINER_MultiHashMap *contained_elements;
-
+ struct GNUNET_CONTAINER_MultiHashMap *my_elements;
+
/**
* Current element count contained within contained_elements
*/
- uint64_t contained_elements_count;
+ uint32_t my_element_count;
/**
* Iterator for sending elements on the key to element mapping to the client.
*/
- struct GNUNET_CONTAINER_MultiHashMap32Iterator *full_result_iter;
-
+ struct GNUNET_CONTAINER_MultiHashMapIterator *full_result_iter;
+
/**
* Evaluate operations are held in
* a linked list.
struct SetState
{
/**
- * Evaluate operations are held in
- * a linked list.
- */
- struct OperationState *ops_head;
-
- /**
- * Evaluate operations are held in
- * a linked list.
+ * Number of currently valid elements in the set which have not been removed
*/
- struct OperationState *ops_tail;
+ uint32_t current_set_element_count;
};
/**
- * Destroy a intersection operation, and free all resources
- * associated with it.
+ * 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 eo the intersection 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.
*/
-static void
-intersection_operation_destroy (struct OperationState *eo)
+static int
+iterator_initialization_by_alice (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying intersection 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);
- }
- // TODO: destroy set elements?
- if (NULL != eo->spec)
+ struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
+
+ //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;
+
+ // 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;
+}
+
+/**
+ * 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
+ * iterate,
+ * #GNUNET_NO if not.
+ */
+static int
+iterator_initialization (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct ElementEntry *ee = value;
+ struct Operation *op = cls;
+ struct GNUNET_HashCode mutated_hash;
+
+ //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;
+
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
+ &ee->element_hash, ee,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ return GNUNET_YES;
+}
+
+
+/**
+ * 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
+ * iterate,
+ * #GNUNET_NO if not.
+ */
+static int
+iterator_bf_reduce (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ 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))
{
- if (NULL != eo->spec->context_msg)
- {
- GNUNET_free (eo->spec->context_msg);
- eo->spec->context_msg = NULL;
- }
- GNUNET_free (eo->spec);
- eo->spec = NULL;
+ op->state->my_element_count--;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (op->state->my_elements,
+ &ee->element_hash,
+ ee));
}
- GNUNET_free (eo);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying intersection op done\n");
- /* FIXME: do a garbage collection of the set generations */
+ return GNUNET_YES;
}
+/**
+ * create a bloomfilter based on the elements given
+ *
+ * @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
+iterator_bf_create (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ 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);
+
+ GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
+ &mutated_hash);
+ return GNUNET_YES;
+}
/**
- * Inform the client that the intersection operation has failed,
+ * Inform the client that the union operation has failed,
* and proceed to destroy the evaluate operation.
*
- * @param eo the intersection operation to fail
+ * @param op the intersection operation to fail
*/
static void
-fail_intersection_operation (struct OperationState *eo)
+fail_intersection_operation (struct Operation *op)
{
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *msg;
+ if (op->state->my_elements)
+ GNUNET_CONTAINER_multihashmap_destroy(op->state->my_elements);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "intersection operation failed\n");
+
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->request_id = htonl (op->spec->client_request_id);
msg->element_type = htons (0);
- GNUNET_MQ_send (eo->spec->set->client_mq, ev);
- intersection_operation_destroy (eo);
+ 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 Operation *op)
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_MQ_send (op->mq, ev);
if (NULL != op->spec->context_msg)
GNUNET_free (op->spec->context_msg);
op->spec->context_msg = NULL;
}
-
}
+static void
+send_bloomfilter_multipart (struct Operation *op, uint32_t offset)
+{
+ 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;
+
+ 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);
+
+ 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);
+
+ if (op->state->local_bf_data_size == offset + chunk_size)
+ {
+ // done
+ GNUNET_free(op->state->local_bf_data);
+ op->state->local_bf_data = NULL;
+ return;
+ }
+
+ send_bloomfilter_multipart (op, offset + chunk_size);
+}
/**
- * Handle an BF message from a remote peer.
+ * 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 cls the intersection operation
- * @param mh the header of the message
+ * @param op intersection operation
*/
static void
-handle_p2p_bf (void *cls, const struct GNUNET_MessageHeader *mh)
+send_bloomfilter (struct Operation *op)
{
- struct OperationState *eo = cls;
- struct BFMessage *msg = (struct BFMessage *) mh;
- unsigned int buckets_in_message;
+ 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;
- if (eo->phase == PHASE_EXPECT_INITIAL )
- {
- eo->phase = PHASE_BF_EXCHANGE;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "creating new bf of size %u\n", 1<<msg->order);
-
- // if (the remote peer has less elements than us)
- // run our elements through his bloomfilter
- // else if (we have the same elements)
- // done;
- //
- // evict elements we can exclude through the bloomfilter
- //
- // create a new bloomfilter over our remaining elements
- //
- // send our new count and the bloomfilter back
+ 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);
+
+ local_bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ bf_size,
+ bf_elementbits);
+
+ op->spec->salt++;
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &iterator_bf_create,
+ op);
+
+ // 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 if (eo->phase == PHASE_BF_EXCHANGE)
- {
-
+ 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);
+
+ 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);
+ if (op->state->local_bf_data)
+ send_bloomfilter_multipart (op, chunk_size);
}
/**
- * Send a result message to the client indicating
- * that there is a new element.
+ * Signal to the client that the operation has finished and
+ * destroy the operation.
*
- * @param eo intersection operation
- * @param element element to send
+ * @param cls operation to destroy
*/
static void
-send_client_element (struct OperationState *eo,
- struct GNUNET_SET_Element *element)
+send_client_done_and_destroy (void *cls)
{
+ 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);
+}
- 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)
- {
- GNUNET_MQ_discard (ev);
- GNUNET_break (0);
+
+/**
+ * Send all elements in the full result iterator.
+ *
+ * @param cls operation
+ */
+static void
+send_remaining_elements (void *cls)
+{
+ 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;
+
+ 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;
}
+
+ 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);
+
rm->result_status = htons (GNUNET_SET_STATUS_OK);
- rm->request_id = htonl (eo->spec->client_request_id);
+ rm->request_id = htonl (op->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);
+
+ GNUNET_MQ_notify_sent (ev, send_remaining_elements, op);
+ GNUNET_MQ_send (op->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.
+ * Inform the peer that this operation is complete.
*
- * @param eo intersection operation
+ * @param op the intersection operation to fail
*/
static void
-send_client_done_and_destroy (struct OperationState *eo)
+send_peer_done (struct Operation *op)
{
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_SET_ResultMessage *rm;
-
- GNUNET_assert (GNUNET_NO == eo->client_done_sent);
- eo->client_done_sent = GNUNET_YES;
+ 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 (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);
-
- intersection_operation_destroy (eo);
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ GNUNET_MQ_send (op->mq, ev);
}
/**
- * 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.
+ * Handle an BF multipart message from a remote peer.
*
- * @param eo intersection operation
+ * @param cls the intersection operation
+ * @param mh the header of the message
*/
static void
-send_bloomfilter (struct Operation *op){
- //get number of all elements still in the set
-
- // send the bloomfilter
- unsigned int buckets_sent = 0;
- struct BloomFilter *bf;
- //TODO:
- // add all our elements to the bloomfilter
- // create new bloomfilter for all our elements & count elements
- //GNUNET_CONTAINER_multihashmap32_remove
- //eo->local_bf = GNUNET_CONTAINER_multihashmap32_iterate(eo->set->elements, add);
+handle_p2p_bf_part (void *cls, const struct GNUNET_MessageHeader *mh)
+{
+ struct Operation *op = cls;
+ const struct BFPart *msg = (const struct BFPart *) mh;
- op->state->local_bf;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending bf of size %u\n", 1<<ibf_order);
-
- bf = eo->local_bf;
-
- while (buckets_sent < (1 << bf_order))
- {
- unsigned int buckets_in_message;
- struct GNUNET_MQ_Envelope *ev;
- struct IBFMessage *msg;
-
- buckets_in_message = (1 << bf_order) - buckets_sent;
- /* limit to maximum */
- if (buckets_in_message > MAX_BUCKETS_PER_MESSAGE)
- buckets_in_message = MAX_BUCKETS_PER_MESSAGE;
-
- ev = GNUNET_MQ_msg_extra (msg, buckets_in_message * IBF_BUCKET_SIZE,
- GNUNET_MESSAGE_TYPE_SET_P2P_BF);
- msg->reserved = 0;
- msg->order = bf_order;
- msg->offset = htons (buckets_sent);
- ibf_write_slice (ibf, buckets_sent,
- buckets_in_message, &msg[1]);
- buckets_sent += buckets_in_message;
- 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);
+ if (op->state->phase != PHASE_BF_AWAIT_MULTIPART){
+ GNUNET_break_op (0);
+ fail_intersection_operation(op);
+ return;
}
-
- eo->phase = PHASE_BF_EXCHANGE;
+
+
}
/**
- * Handle a done message from a remote peer
+ * Handle an BF message from a remote peer.
*
* @param cls the intersection operation
- * @param mh the message
+ * @param mh the header of the message
*/
static void
-handle_p2p_done (void *cls, const struct GNUNET_MessageHeader *mh)
+handle_p2p_bf (void *cls, const struct GNUNET_MessageHeader *mh)
{
- struct OperationState *eo = cls;
- struct GNUNET_MQ_Envelope *ev;
-
- if (eo->phase == PHASE_EXPECT_ELEMENTS_AND_REQUESTS)
+ 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)
{
- /* we got all requests, but still have to send our elements as response */
-
- 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;
+ 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);
}
- 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);
+ // 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;
}
- GNUNET_break (0);
- fail_intersection_operation (eo);
+
+ 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;
+
+ send_bloomfilter (op);
}
/**
- * Evaluate a union operation with
- * a remote peer.
+ * Handle an BF message from a remote peer.
*
- * @param op operation to evaluate
+ * @param cls the intersection operation
+ * @param mh the header of the message
*/
static void
-intersection_evaluate (struct Operation *op)
+handle_p2p_element_info (void *cls, const struct GNUNET_MessageHeader *mh)
{
- op->state = GNUNET_new (struct OperationState);
- /* we started the operation, thus we have to send the operation request */
+ struct Operation *op = cls;
+ struct BFMessage *msg = (struct BFMessage *) mh;
+
+ 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);
+ }
+
op->state->phase = PHASE_BF_EXCHANGE;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "evaluating intersection operation");
- send_operation_request (op);
+ 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);
}
/**
- * 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.
+ * Send our element to the peer, in case our element count is lower than his
+ *
+ * @param op intersection operation
*/
-static int
-intersection_iterator_set_to_contained_alice (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
- struct ElementEntry *ee = value;
- struct Operation *op = cls;
- struct GNUNET_HashCode mutated_hash;
-
- //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;
-
- // 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->contained_elements_count++;
- GNUNET_CONTAINER_multihashmap_put (op->state->contained_elements,
- &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-
- // create our own bloomfilter with salt+1
- GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt+1, &mutated_hash);
- GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
- &mutated_hash);
-
- return GNUNET_YES;
+static void
+send_element_count (struct Operation *op)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct BFMessage *msg;
+
+ 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);
}
+
/**
- * Bob's version:
- *
- * 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
- * iterate,
- * #GNUNET_NO if not.
+ * 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 op intersection operation
*/
-static int
-intersection_iterator_set_to_contained_bob (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
- struct ElementEntry *ee = value;
- struct Operation *op = cls;
- struct GNUNET_HashCode mutated_hash;
-
- //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;
-
- GNUNET_CONTAINER_multihashmap_put (op->state->contained_elements,
- &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-
- op->state->contained_elements_count++;
-
- GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt, &mutated_hash);
-
- GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
- &mutated_hash);
-
- return GNUNET_YES;
+static void
+finish_and_destroy (struct Operation *op)
+{
+ GNUNET_assert (GNUNET_NO == op->state->client_done_sent);
+
+ if (GNUNET_SET_RESULT_FULL == op->spec->result_mode)
+ {
+ 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;
+ }
+ send_client_done_and_destroy (op);
}
+
/**
- * removes element from a hashmap if it is not contained within the
- * provided remote bloomfilter.
- *
- * @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.
+ * Handle a done message from a remote peer
+ *
+ * @param cls the union operation
+ * @param mh the message
*/
-static int
-intersection_iterator_element_removal (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
- struct ElementEntry *ee = value;
+static void
+handle_p2p_done (void *cls,
+ const struct GNUNET_MessageHeader *mh)
+{
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)){
- op->state->contained_elements_count--;
- GNUNET_CONTAINER_multihashmap_remove (op->state->contained_elements,
- &ee->element_hash,
- ee);
+
+ if ((op->state->phase = PHASE_FINISHED) || (op->state->phase = PHASE_MAYBE_FINISHED)){
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got final DONE\n");
+
+ finish_and_destroy (op);
+ return;
}
-
- return GNUNET_YES;
+
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
}
+
/**
- * removes element from a hashmap if it is not contained within the
- * provided remote bloomfilter.
- *
- * @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.
+ * Evaluate a union operation with
+ * a remote peer.
+ *
+ * @param op operation to evaluate
*/
-static int
-intersection_iterator_create_bf (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
- 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);
-
- GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
- &mutated_hash);
-
- return GNUNET_YES;
+static void
+intersection_evaluate (struct Operation *op)
+{
+ 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;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "evaluating intersection operation");
+ send_operation_request (op);
}
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "accepting set union operation\n");
op->state = GNUNET_new (struct OperationState);
-
- op->state->contained_elements = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_YES);
-
- GNUNET_CONTAINER_multihashmap_iterate(op->spec->set->elements,
- &intersection_iterator_set_to_contained_bob,
- op);
-
-
- op->state->local_bf = GNUNET_CONTAINER_bloomfilter_init(NULL, sizeof(struct GNUNET_HashCode), GNUNET_CONSTANTS_BLOOMFILTER_K);
-
- if (NULL != op->state->remote_bf){
- // run the set through the remote bloomfilter
- ;
+ 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 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;
}
-
- //
- op->state->local_bf;
-
- /* kick off the operation */
+ // 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);
}
* @return the newly created set
*/
static struct SetState *
-intersection_set_create (void)
+intersection_set_create ()
{
struct SetState *set_state;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "intersection set created\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "intersection set created\n");
set_state = GNUNET_new (struct SetState);
-
+ set_state->current_set_element_count = 0;
+
return set_state;
}
* @param ee the element to add to the set
*/
static void
-intersection_add (struct SetState *set_state, struct ElementEntry *ee)
+intersection_add (struct SetState *set_state,
+ struct ElementEntry *ee)
{
- //nothing to do here
+ GNUNET_assert(0 < set_state->current_set_element_count);
+ set_state->current_set_element_count++;
}
* @param element set element to remove
*/
static void
-intersection_remove (struct SetState *set_state, struct ElementEntry *element)
+intersection_remove (struct SetState *set_state,
+ struct ElementEntry *element)
{
- //nothing to do here
+ GNUNET_assert(0 < set_state->current_set_element_count);
+ set_state->current_set_element_count--;
}
/**
* Dispatch messages for a intersection operation.
*
- * @param eo the state of the intersection evaluate operation
+ * @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
+ * @return #GNUNET_SYSERR if the tunnel should be disconnected,
+ * #GNUNET_OK otherwise
*/
-int
-intersection_handle_p2p_message (struct OperationState *eo,
- const struct GNUNET_MessageHeader *mh)
+static int
+intersection_handle_p2p_message (struct Operation *op,
+ 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));
/* 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_BF:
- handle_p2p_bf (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);
+ 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;
}
-/**
- * Signal to the client that the operation has finished and
- * destroy the operation.
- *
- * @param cls operation to destroy
- */
-static void
-send_done_and_destroy (void *cls)
-{
- 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);
-}
/**
- * 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.
+ * handler for peer-disconnects, notifies the client about the aborted operation
*
- * @param op union operation
+ * @param op the destroyed operation
*/
-static void
-finish_and_destroy (struct Operation *op)
-{
- GNUNET_assert (GNUNET_NO == op->state->client_done_sent);
-
- if (GNUNET_SET_RESULT_FULL == op->spec->result_mode)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending full result set\n");
- GNUNET_assert (NULL == op->state->full_result_iter);
- op->state->full_result_iter =
- GNUNET_CONTAINER_multihashmap32_iterator_create (op->state->contained_elements);
- return;
- }
- send_done_and_destroy (op);
-}
-
-
static void
intersection_peer_disconnect (struct Operation *op)
{
_GSS_operation_destroy (op);
return;
}
+ // 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);
/**
* Destroy the union operation. Only things specific to the union operation are destroyed.
- *
+ *
* @param op union operation to destroy
*/
static void
GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf);
op->state->local_bf = NULL;
}
- if (NULL != op->state->contained_elements)
+ 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->contained_elements);
- op->state->contained_elements = NULL;
+ GNUNET_CONTAINER_multihashmap_destroy (op->state->my_elements);
+ op->state->my_elements = NULL;
}
GNUNET_free (op->state);
op->state = NULL;
projects / oweals / gnunet.git / blobdiff