#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
{
/**
- * Alices has suggested an operation to bob,
+ * Alices has suggested an operation to bob,
* and is waiting for a bf or session end.
*/
PHASE_INITIAL,
*/
PHASE_BF_EXCHANGE,
/**
- * if both peers have an equal peercount, they enter this state for
+ * 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,
+ * if a peer finds the same element count after the next iteration,
* it ends the the session
*/
PHASE_MAYBE_FINISHED,
*/
struct GNUNET_CONTAINER_BloomFilter *local_bf;
+ /**
+ * for multipart msgs we have to store the bloomfilter-data until we fully sent it.
+ */
+ char * local_bf_data;
+
+ /**
+ * size of the bloomfilter
+ */
+ uint32_t local_bf_data_size;
+
/**
* Current state of the operation.
*/
* was created.
*/
unsigned int generation_created;
-
+
/**
* Maps element-id-hashes to 'elements in our set'.
*/
struct GNUNET_CONTAINER_MultiHashMap *my_elements;
-
+
/**
* Current element count contained within contained_elements
*/
* Iterator for sending elements on the key to element mapping to the client.
*/
struct GNUNET_CONTAINER_MultiHashMapIterator *full_result_iter;
-
+
/**
* Evaluate operations are held in
* a linked list.
/**
* Alice's version:
- *
- * fills the contained-elements hashmap with all relevant
+ *
+ * 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
* iterate,
* #GNUNET_NO if not.
*/
-static int
+static int
iterator_initialization_by_alice (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
+ 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)
+ 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,
+ 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_CONTAINER_multihashmap_put (op->state->my_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);
-
+
+ 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
+ * 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
* iterate,
* #GNUNET_NO if not.
*/
-static int
+static int
iterator_initialization (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
+ 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)
+ if ((op->generation_created >= ee->generation_removed)
|| (op->generation_created < ee->generation_added))
return GNUNET_YES;
-
- GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
- &ee->element_hash, ee,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-
- GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt, &mutated_hash);
-
- GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
- &mutated_hash);
-
+
+ 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
* #GNUNET_NO if not.
*/
static int
-iterator_bf_round (void *cls,
- const struct GNUNET_HashCode *key,
- void *value){
+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 (GNUNET_NO ==
+ GNUNET_CONTAINER_bloomfilter_test (op->state->remote_bf,
+ &mutated_hash))
+ {
op->state->my_element_count--;
- GNUNET_CONTAINER_multihashmap_remove (op->state->my_elements,
- &ee->element_hash,
- ee);
- return GNUNET_YES;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (op->state->my_elements,
+ &ee->element_hash,
+ ee));
}
-
- GNUNET_BLOCK_mingle_hash(&ee->element_hash, op->spec->salt+1, &mutated_hash);
-
- GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
+
+ 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;
}
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);
/**
* 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->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);
}
/**
* After the result done message has been sent to the client,
* destroy the evaluate operation.
*
- * @param eo intersection operation
+ * @param op intersection operation
*/
static void
send_bloomfilter (struct Operation *op)
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;
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
- bf_size = GNUNET_CONTAINER_bloomfilter_get_size (op->state->local_bf);
+ 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);
- ev = GNUNET_MQ_msg_extra (msg, bf_size, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
- msg->reserved = 0;
msg->sender_element_count = htonl (op->state->my_element_count);
- msg->bloomfilter_length = htonl (bf_size);
+ 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_assert (GNUNET_SYSERR !=
- GNUNET_CONTAINER_bloomfilter_get_raw_data (op->state->local_bf,
- (char *) &msg[1],
- bf_size));
- GNUNET_CONTAINER_bloomfilter_free (op->state->local_bf);
- op->state->local_bf = NULL;
+
GNUNET_MQ_send (op->mq, ev);
+
+ if (op->state->local_bf_data)
+ send_bloomfilter_multipart (op, chunk_size);
}
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 (op->spec->client_request_id);
rm->element_type = element->type;
/**
* Inform the peer that this operation is complete.
*
- * @param eo the intersection operation to fail
+ * @param op the intersection operation to fail
*/
static void
send_peer_done (struct Operation *op)
GNUNET_MQ_send (op->mq, ev);
}
+/**
+ * Handle an BF multipart message from a remote peer.
+ *
+ * @param cls the intersection operation
+ * @param mh the header of the message
+ */
+static void
+handle_p2p_bf_part (void *cls, const struct GNUNET_MessageHeader *mh)
+{
+ 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;
+ }
+
+
+}
/**
* Handle an BF message from a remote peer.
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],
- BLOOMFILTER_SIZE,
- ntohl (msg->bloomfilter_length));
+ 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);
case PHASE_MAYBE_FINISHED:
// if we are bob or alice and are continuing operation
GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
- &iterator_bf_round,
+ &iterator_bf_reduce,
op);
break;
default:
// 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)
+ 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;
}
-
+
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 ...
op->state->phase = PHASE_BF_EXCHANGE;
op->state->my_elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
-
- 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 our element to the peer, in case our element count is lower than his
*
- * @param eo intersection operation
+ * @param op intersection operation
*/
static void
send_element_count (struct Operation *op)
// 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->reserved = 0;
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);
}
+
/**
* Send a result message to the client indicating
* that the operation is over.
send_client_done_and_destroy (op);
}
+
/**
* Handle a done message from a remote peer
*
* @param mh the message
*/
static void
-handle_p2p_done (void *cls, const struct GNUNET_MessageHeader *mh)
+handle_p2p_done (void *cls,
+ const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
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;
}
-
+
GNUNET_break_op (0);
fail_intersection_operation (op);
}
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");
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "evaluating intersection operation");
send_operation_request (op);
}
+
/**
* Accept an union operation request from a remote peer.
* Only initializes the private operation state.
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 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;
* @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)
{
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)
{
GNUNET_assert(0 < set_state->current_set_element_count);
set_state->current_set_element_count--;
- //nothing to do here
}
/**
* 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
+static int
intersection_handle_p2p_message (struct Operation *op,
const struct GNUNET_MessageHeader *mh)
{
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;
/**
* handler for peer-disconnects, notifies the client about the aborted operation
- *
+ *
* @param op the destroyed operation
*/
static void
/**
* Destroy the union operation. Only things specific to the union operation are destroyed.
- *
+ *
* @param op union operation to destroy
*/
static void
projects / oweals / gnunet.git / blobdiff