[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34448 - in gnunet/src: include set util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34448 - in gnunet/src: include set util |
|
Date: |
Fri, 28 Nov 2014 21:52:20 +0100 |
Author: grothoff
Date: 2014-11-28 21:52:20 +0100 (Fri, 28 Nov 2014)
New Revision: 34448
Modified:
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/include/gnunet_protocols.h
gnunet/src/set/gnunet-service-set.c
gnunet/src/set/gnunet-service-set_intersection.c
gnunet/src/set/gnunet-service-set_protocol.h
gnunet/src/set/gnunet-service-set_union.c
gnunet/src/util/crypto_hash.c
Log:
-fixing misc issues and bugs, including better termination logic for
intersection and salt handling
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2014-11-28 12:05:53 UTC (rev
34447)
+++ gnunet/src/include/gnunet_crypto_lib.h 2014-11-28 20:52:20 UTC (rev
34448)
@@ -743,8 +743,9 @@
* @param result set to @a a ^ @a b
*/
void
-GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode * a, const struct
GNUNET_HashCode * b,
- struct GNUNET_HashCode * result);
+GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode *a,
+ const struct GNUNET_HashCode *b,
+ struct GNUNET_HashCode *result);
/**
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2014-11-28 12:05:53 UTC (rev
34447)
+++ gnunet/src/include/gnunet_protocols.h 2014-11-28 20:52:20 UTC (rev
34448)
@@ -1867,9 +1867,9 @@
#define GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS 585
/**
- * Operation is done.
+ * Union operation is done.
*/
-#define GNUNET_MESSAGE_TYPE_SET_P2P_DONE 586
+#define GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE 586
/**
* Start iteration over set elements.
@@ -1897,10 +1897,11 @@
#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF 592
/**
- * Bloom filter message for intersection exchange started by Bob.
+ * Intersection operation is done.
*/
-#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF_PART 593
+#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE 593
+
/*******************************************************************************
* TESTBED LOGGER message types
******************************************************************************/
Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2014-11-28 12:05:53 UTC (rev 34447)
+++ gnunet/src/set/gnunet-service-set.c 2014-11-28 20:52:20 UTC (rev 34448)
@@ -1498,12 +1498,12 @@
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, 0},
- { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_DONE, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, 0},
{ &dispatch_p2p_message,
GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, 0},
- { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF_PART,
0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, 0},
{NULL, 0, 0}
};
static const uint32_t cadet_ports[] = {GNUNET_APPLICATION_TYPE_SET, 0};
Modified: gnunet/src/set/gnunet-service-set_intersection.c
===================================================================
--- gnunet/src/set/gnunet-service-set_intersection.c 2014-11-28 12:05:53 UTC
(rev 34447)
+++ gnunet/src/set/gnunet-service-set_intersection.c 2014-11-28 20:52:20 UTC
(rev 34448)
@@ -21,6 +21,7 @@
* @file set/gnunet-service-set_intersection.c
* @brief two-peer set intersection
* @author Christian Fuchs
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
@@ -29,26 +30,8 @@
#include "gnunet-service-set_protocol.h"
#include <gcrypt.h>
-#define BLOOMFILTER_SIZE GNUNET_CRYPTO_HASH_LENGTH
/**
- * Calculate the size of the bloom filter.
- *
- * @param A
- * @param B
- * @param s
- * @param k
- * @return
- */
-#define CALCULATE_BF_SIZE(A, B, s, k) \
- do { \
- k = ceil(1 + log2((double) (2*B / (double) A)));\
- if (k<1) k=1; /* k can be calculated as 0 */\
- s = ceil((double) (A * k / log(2))); \
- } while (0)
-
-
-/**
* Current phase we are in for a intersection operation.
*/
enum IntersectionOperationPhase
@@ -61,22 +44,14 @@
/**
* Bob has accepted the operation, Bob and Alice are now exchanging bfs
- * until one notices the their element count is equal
+ * until one notices the their element hashes are equal.
*/
PHASE_BF_EXCHANGE,
/**
- * 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
+ * The protocol is over. Results may still have to be sent to the
+ * client.
*/
- PHASE_MAYBE_FINISHED,
-
- /**
- * The protocol is over.
- * Results may still have to be sent to the client.
- */
PHASE_FINISHED
};
@@ -118,13 +93,34 @@
struct OperationState *prev;
/**
- * for multipart msgs we have to store the bloomfilter-data until we fully
sent it.
+ * For multipart BF transmissions, we have to store the
+ * bloomfilter-data until we fully received it.
*/
char *bf_data;
/**
- * Current element count contained within @e my_elements
+ * XOR of the keys of all of the elements (remaining) in my set.
+ * Always updated when elements are added or removed to
+ * @e my_elements.
*/
+ struct GNUNET_HashCode my_xor;
+
+ /**
+ * XOR of the keys of all of the elements (remaining) in
+ * the other peer's set. Updated when we receive the
+ * other peer's Bloom filter.
+ */
+ struct GNUNET_HashCode other_xor;
+
+ /**
+ * How many bytes of @e bf_data are valid?
+ */
+ uint32_t bf_data_offset;
+
+ /**
+ * Current element count contained within @e my_elements.
+ * (May differ briefly during initialization.)
+ */
uint32_t my_element_count;
/**
@@ -138,6 +134,12 @@
uint32_t bf_bits_per_element;
/**
+ * Salt currently used for BF construction (by us or the other peer,
+ * depending on where we are in the code).
+ */
+ uint32_t salt;
+
+ /**
* Current state of the operation.
*/
enum IntersectionOperationPhase phase;
@@ -162,7 +164,8 @@
struct SetState
{
/**
- * Number of currently valid elements in the set which have not been removed
+ * Number of currently valid elements in the set which have not been
+ * removed.
*/
uint32_t current_set_element_count;
};
@@ -208,8 +211,7 @@
/**
- * Fills the "my_elements" hashmap with all relevant elements and
- * adds their mutated hashes to our local bloomfilter with mutator+1.
+ * Fills the "my_elements" hashmap with all relevant elements.
*
* @param cls the `struct Operation *` we are performing
* @param key current key code
@@ -217,9 +219,9 @@
* @return #GNUNET_YES (we should continue to iterate)
*/
static int
-filtered_map_and_bf_initialization (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
+filtered_map_initialization (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct Operation *op = cls;
struct ElementEntry *ee = value;
@@ -230,9 +232,8 @@
return GNUNET_YES; /* element not valid in our operation's generation */
/* Test if element is in Bob's bloomfilter */
- // FIXME: where does this salt come from!?
GNUNET_BLOCK_mingle_hash (&ee->element_hash,
- op->spec->salt,
+ op->state->salt,
&mutated_hash);
if (GNUNET_NO ==
GNUNET_CONTAINER_bloomfilter_test (op->state->remote_bf,
@@ -244,6 +245,9 @@
return GNUNET_YES;
}
op->state->my_element_count++;
+ GNUNET_CRYPTO_hash_xor (&op->state->my_xor,
+ &ee->element_hash,
+ &op->state->my_xor);
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
&ee->element_hash,
@@ -272,15 +276,18 @@
struct ElementEntry *ee = value;
struct GNUNET_HashCode mutated_hash;
- // FIXME: where does this salt come from!?
GNUNET_BLOCK_mingle_hash (&ee->element_hash,
- op->spec->salt,
+ op->state->salt,
&mutated_hash);
if (GNUNET_NO ==
GNUNET_CONTAINER_bloomfilter_test (op->state->remote_bf,
&mutated_hash))
{
+ GNUNET_break (0 < op->state->my_element_count);
op->state->my_element_count--;
+ GNUNET_CRYPTO_hash_xor (&op->state->my_xor,
+ &ee->element_hash,
+ &op->state->my_xor);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove
(op->state->my_elements,
&ee->element_hash,
@@ -309,9 +316,8 @@
struct ElementEntry *ee = value;
struct GNUNET_HashCode mutated_hash;
- // FIXME: where does this salt come from!?
GNUNET_BLOCK_mingle_hash (&ee->element_hash,
- op->spec->salt,
+ op->state->salt,
&mutated_hash);
GNUNET_CONTAINER_bloomfilter_add (op->state->local_bf,
&mutated_hash);
@@ -350,50 +356,7 @@
}
-
-
-
-
-
/**
- *
- * @param op
- * @param offset
- */
-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->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->chunk_length = htonl (chunk_size);
- msg->chunk_offset = htonl (offset);
- memcpy(&msg[1], &op->state->bf_data[offset], chunk_size);
-
- GNUNET_MQ_send (op->mq, ev);
-
- if (op->state->bf_data_size == offset + chunk_size)
- {
- // done
- GNUNET_free(op->state->bf_data);
- op->state->bf_data = NULL;
- return;
- }
- send_bloomfilter_multipart (op, offset + chunk_size);
-}
-
-
-/**
* Send a bloomfilter to our peer. After the result done message has
* been sent to the client, destroy the evaluate operation.
*
@@ -408,64 +371,83 @@
uint32_t bf_elementbits;
uint32_t chunk_size;
struct GNUNET_CONTAINER_BloomFilter *local_bf;
+ char *bf_data;
+ uint32_t offset;
+ /* We consider the ratio of the set sizes to determine
+ the number of bits per element, as the smaller set
+ should use more bits to maximize its set reduction
+ potential and minimize overall bandwidth consumption. */
+ bf_elementbits = 2 + ceil (log2((double)
+ (op->spec->remote_element_count /
+ (double) op->state->my_element_count)));
+ if (bf_elementbits < 1)
+ bf_elementbits = 1; /* make sure k is not 0 */
+ /* optimize BF-size to ~50% of bits set */
+ bf_size = ceil ((double) (op->state->my_element_count
+ * bf_elementbits / log(2)));
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);
-
+ "Sending bf of size %u\n",
+ (unsigned int) bf_size);
local_bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
bf_size,
bf_elementbits);
-
- op->spec->salt++;
+ op->state->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
GNUNET_CONTAINER_multihashmap_iterate (op->state->my_elements,
&iterator_bf_create,
op);
- // send our bloomfilter
- if (GNUNET_SERVER_MAX_MESSAGE_SIZE > bf_size + sizeof (struct BFMessage))
+ /* send our Bloom filter */
+ chunk_size = 60 * 1024 - sizeof (struct BFMessage);
+ if (bf_size <= chunk_size)
{
- // singlepart
+ /* 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,
- (char*)&msg[1],
+ (char*) &msg[1],
bf_size));
+ msg->sender_element_count = htonl (op->state->my_element_count);
+ msg->bloomfilter_total_length = htonl (bf_size);
+ msg->bits_per_element = htonl (bf_elementbits);
+ msg->sender_mutator = htonl (op->state->salt);
+ msg->element_xor_hash = op->state->my_xor;
+ GNUNET_MQ_send (op->mq, ev);
}
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->bf_data = (char *) GNUNET_malloc (bf_size);
+ /* multipart */
+ bf_data = GNUNET_malloc (bf_size);
GNUNET_assert (GNUNET_SYSERR !=
GNUNET_CONTAINER_bloomfilter_get_raw_data (local_bf,
-
op->state->bf_data,
+ bf_data,
bf_size));
- memcpy (&msg[1], op->state->bf_data, chunk_size);
- op->state->bf_data_size = bf_size;
+ offset = 0;
+ while (offset < bf_size)
+ {
+ if (bf_size - chunk_size < offset)
+ chunk_size = bf_size - offset;
+ ev = GNUNET_MQ_msg_extra (msg,
+ chunk_size,
+ GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF);
+ memcpy (&msg[1],
+ &bf_data[offset],
+ chunk_size);
+ offset += chunk_size;
+ msg->sender_element_count = htonl (op->state->my_element_count);
+ msg->bloomfilter_total_length = htonl (bf_size);
+ msg->bits_per_element = htonl (bf_elementbits);
+ msg->sender_mutator = htonl (op->state->salt);
+ msg->element_xor_hash = op->state->my_xor;
+ GNUNET_MQ_send (op->mq, ev);
+ }
+ GNUNET_free (bf_data);
}
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->bf_data)
- send_bloomfilter_multipart (op, chunk_size);
}
@@ -553,6 +535,7 @@
send_peer_done (struct Operation *op)
{
struct GNUNET_MQ_Envelope *ev;
+ struct IntersectionDoneMessage *idm;
op->state->phase = PHASE_FINISHED;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -560,8 +543,12 @@
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);
+ ev = GNUNET_MQ_msg (idm,
+ GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE);
+ idm->final_element_count = htonl (op->state->my_element_count);
+ idm->element_xor_hash = op->state->my_xor;
+ GNUNET_MQ_send (op->mq,
+ ev);
}
@@ -573,107 +560,49 @@
static void
process_bf (struct Operation *op)
{
- uint32_t old_elements;
- uint32_t peer_elements;
-
- old_elements = op->state->my_element_count;
- peer_elements = op->spec->remote_element_count;
switch (op->state->phase)
{
case PHASE_INITIAL:
- /* This is the first BF being sent, build our
- initial map with filtering in place */
+ /* This is the first BF being sent, build our initial map with
+ filtering in place */
op->state->my_elements
= GNUNET_CONTAINER_multihashmap_create (op->spec->remote_element_count,
GNUNET_YES);
+ GNUNET_break (0 == op->state->my_element_count);
GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
- &filtered_map_and_bf_initialization,
+ &filtered_map_initialization,
op);
break;
case PHASE_BF_EXCHANGE:
- case PHASE_MAYBE_FINISHED:
/* Update our set by reduction */
GNUNET_CONTAINER_multihashmap_iterate (op->state->my_elements,
&iterator_bf_reduce,
op);
break;
- default:
+ case PHASE_FINISHED:
GNUNET_break_op (0);
fail_intersection_operation(op);
+ return;
}
- // 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;
- if ((0 == op->state->my_element_count) // fully disjoint
- || ((op->state->phase == PHASE_MAYBE_FINISHED) // we agree on a shared
set of elements
- && (old_elements == op->state->my_element_count)
- && (op->state->my_element_count == peer_elements)))
+ if ( (0 == op->state->my_element_count) || /* fully disjoint */
+ ( (op->state->my_element_count == op->spec->remote_element_count) &&
+ (0 == memcmp (&op->state->my_xor,
+ &op->state->other_xor,
+ sizeof (struct GNUNET_HashCode))) ) )
{
- // In the last round we though we were finished, we now know this is
correct
+ /* we are done */
send_peer_done (op);
return;
}
-
op->state->phase = PHASE_BF_EXCHANGE;
- if (op->state->my_element_count == peer_elements)
- // maybe we are finished, but we do one more round to make certain
- // we don't have false positives ...
- op->state->phase = PHASE_MAYBE_FINISHED;
-
send_bloomfilter (op);
}
/**
- * 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;
- uint32_t chunk_size;
- uint32_t chunk_offset;
-
- chunk_size = ntohl(msg->chunk_length);
- chunk_offset = ntohl(msg->chunk_offset);
-
- if ((NULL == op->state->bf_data)
- || (op->state->bf_data_size < chunk_size + chunk_offset))
- {
- // unexpected multipart chunk
- GNUNET_break_op (0);
- fail_intersection_operation(op);
- return;
- }
-
- memcpy (&op->state->bf_data[chunk_offset], (const char*) &msg[1],
chunk_size);
-
- if (op->state->bf_data_size != chunk_offset + chunk_size)
- // wait for next chunk
- return;
-
- op->state->remote_bf = GNUNET_CONTAINER_bloomfilter_init ((const char*)
&msg[1],
-
op->state->bf_data_size,
-
op->state->bf_bits_per_element);
-
- GNUNET_free (op->state->bf_data);
- op->state->bf_data = NULL;
-
- process_bf (op);
-}
-
-
-/**
* Handle an BF message from a remote peer.
*
* @param cls the intersection operation
@@ -684,44 +613,94 @@
const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
- const struct BFMessage *msg = (const struct BFMessage *) mh;
+ const struct BFMessage *msg;
uint32_t bf_size;
uint32_t chunk_size;
uint32_t bf_bits_per_element;
+ uint16_t msize;
+ msize = htons (mh->size);
+ if (msize < sizeof (struct BFMessage))
+ {
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
+ return;
+ }
+ msg = (const struct BFMessage *) mh;
switch (op->state->phase)
{
case PHASE_INITIAL:
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
+ break;
case PHASE_BF_EXCHANGE:
- case PHASE_MAYBE_FINISHED:
- if (NULL == op->state->bf_data)
+ bf_size = ntohl (msg->bloomfilter_total_length);
+ bf_bits_per_element = ntohl (msg->bits_per_element);
+ chunk_size = msize - sizeof (struct BFMessage);
+ op->state->other_xor = msg->element_xor_hash;
+ if (bf_size == chunk_size)
{
- // no colliding multipart transaction going on currently
- op->spec->salt = ntohl (msg->sender_mutator);
- bf_size = ntohl (msg->bloomfilter_total_length);
- bf_bits_per_element = ntohl (msg->bits_per_element);
- chunk_size = ntohl (msg->bloomfilter_length);
- op->spec->remote_element_count = ntohl(msg->sender_element_count);
- if (bf_size == chunk_size)
+ if (NULL != op->state->bf_data)
{
- // single part, done here
- op->state->remote_bf = GNUNET_CONTAINER_bloomfilter_init ((const
char*) &msg[1],
- bf_size,
-
bf_bits_per_element);
- process_bf (op);
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
return;
}
-
- //first multipart chunk
+ /* single part, done here immediately */
+ op->state->remote_bf
+ = GNUNET_CONTAINER_bloomfilter_init ((const char*) &msg[1],
+ bf_size,
+ bf_bits_per_element);
+ op->state->salt = ntohl (msg->sender_mutator);
+ process_bf (op);
+ return;
+ }
+ /* multipart chunk */
+ if (NULL == op->state->bf_data)
+ {
+ /* first chunk, initialize */
op->state->bf_data = GNUNET_malloc (bf_size);
op->state->bf_data_size = bf_size;
op->state->bf_bits_per_element = bf_bits_per_element;
- memcpy (op->state->bf_data, (const char*) &msg[1], chunk_size);
- return;
+ op->state->bf_data_offset = 0;
+ op->state->salt = ntohl (msg->sender_mutator);
+ op->spec->remote_element_count = ntohl (msg->sender_element_count);
}
+ else
+ {
+ /* increment */
+ if ( (op->state->bf_data_size != bf_size) ||
+ (op->state->bf_bits_per_element != bf_bits_per_element) ||
+ (op->state->bf_data_offset + chunk_size > bf_size) ||
+ (op->state->salt != ntohl (msg->sender_mutator)) ||
+ (op->spec->remote_element_count != ntohl
(msg->sender_element_count)) )
+ {
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
+ return;
+ }
+ }
+ memcpy (&op->state->bf_data[op->state->bf_data_offset],
+ (const char*) &msg[1],
+ chunk_size);
+ op->state->bf_data_offset += chunk_size;
+ if (op->state->bf_data_offset == bf_size)
+ {
+ /* last chunk, run! */
+ op->state->remote_bf
+ = GNUNET_CONTAINER_bloomfilter_init (op->state->bf_data,
+ bf_size,
+ bf_bits_per_element);
+ GNUNET_free (op->state->bf_data);
+ op->state->bf_data = NULL;
+ op->state->bf_data_size = 0;
+ process_bf (op);
+ }
+ break;
default:
GNUNET_break_op (0);
fail_intersection_operation (op);
+ break;
}
}
@@ -736,9 +715,9 @@
* @return #GNUNET_YES (we should continue to iterate)
*/
static int
-initialize_map (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
+initialize_map_unfiltered (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct ElementEntry *ee = value;
struct Operation *op = cls;
@@ -746,6 +725,9 @@
if ( (op->generation_created < ee->generation_removed) &&
(op->generation_created >= ee->generation_added) )
return GNUNET_YES; /* element not live in operation's generation */
+ GNUNET_CRYPTO_hash_xor (&op->state->my_xor,
+ &ee->element_hash,
+ &op->state->my_xor);
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_put (op->state->my_elements,
&ee->element_hash,
@@ -756,6 +738,48 @@
/**
+ * Send our element count to the peer, in case our element count is
+ * lower than his.
+ *
+ * @param op intersection operation
+ */
+static void
+send_element_count (struct Operation *op)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct IntersectionElementInfoMessage *msg;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending our element count (bf_msg)\n");
+ ev = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO);
+ msg->sender_element_count = htonl (op->state->my_element_count);
+ GNUNET_MQ_send (op->mq, ev);
+}
+
+
+/**
+ * We go first, initialize our map with all elements and
+ * send the first Bloom filter.
+ *
+ * @param op operation to start exchange for
+ */
+static void
+begin_bf_exchange (struct Operation *op)
+{
+ GNUNET_break (PHASE_INITIAL == op->state->phase);
+ op->state->phase = PHASE_BF_EXCHANGE;
+ op->state->my_elements
+ = GNUNET_CONTAINER_multihashmap_create (op->state->my_element_count,
+ GNUNET_YES);
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &initialize_map_unfiltered,
+ op);
+ send_bloomfilter (op);
+}
+
+
+/**
* Handle the initial `struct IntersectionElementInfoMessage` from a
* remote peer.
*
@@ -786,45 +810,12 @@
fail_intersection_operation(op);
return;
}
-
- op->state->phase = PHASE_BF_EXCHANGE;
- // FIXME... -- why a new map here!?
- op->state->my_elements = GNUNET_CONTAINER_multihashmap_create (1,
- GNUNET_YES);
- GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
- &initialize_map, // FIXME: filtering!?
- 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);
+ GNUNET_break (NULL == op->state->remote_bf);
+ begin_bf_exchange (op);
}
/**
- * Send our element count to the peer, in case our element count is lower than
his
- *
- * @param op intersection operation
- */
-static void
-send_element_count (struct Operation *op)
-{
- struct GNUNET_MQ_Envelope *ev;
- struct IntersectionElementInfoMessage *msg;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending our element count (bf_msg)\n");
- ev = GNUNET_MQ_msg (msg,
- GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO);
- msg->sender_element_count = htonl (op->state->my_element_count);
- GNUNET_MQ_send (op->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.
@@ -850,6 +841,37 @@
/**
+ * Remove all elements from our hashmap.
+ *
+ * @param cls closure with the `struct Operation *`
+ * @param key current key code
+ * @param value value in the hash map
+ * @return #GNUNET_YES (we should continue to iterate)
+ */
+static int
+filter_all (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct Operation *op = cls;
+ struct ElementEntry *ee = value;
+
+ GNUNET_break (0 < op->state->my_element_count);
+ op->state->my_element_count--;
+ GNUNET_CRYPTO_hash_xor (&op->state->my_xor,
+ &ee->element_hash,
+ &op->state->my_xor);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (op->state->my_elements,
+ &ee->element_hash,
+ ee));
+ send_client_removed_element (op,
+ &ee->element);
+ return GNUNET_YES;
+}
+
+
+/**
* Handle a done message from a remote peer
*
* @param cls the intersection operation
@@ -860,17 +882,45 @@
const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
+ const struct IntersectionDoneMessage *idm;
- if ( (op->state->phase = PHASE_FINISHED) ||
- (op->state->phase = PHASE_MAYBE_FINISHED) )
+ if (PHASE_BF_EXCHANGE != op->state->phase)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got final DONE\n");
- finish_and_destroy (op);
+ /* wrong phase to conclude? FIXME: Or should we allow this
+ if the other peer has _initially_ already an empty set? */
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
return;
}
- GNUNET_break_op (0);
- fail_intersection_operation (op);
+ if (ntohs (mh->size) != sizeof (struct IntersectionDoneMessage))
+ {
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
+ return;
+ }
+ idm = (const struct IntersectionDoneMessage *) mh;
+ if (0 == ntohl (idm->final_element_count))
+ {
+ /* other peer determined empty set is the intersection,
+ remove all elements */
+ GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements,
+ &filter_all,
+ op);
+ }
+ if ( (op->state->my_element_count != ntohl (idm->final_element_count)) ||
+ (0 != memcmp (&op->state->my_xor,
+ &idm->element_xor_hash,
+ sizeof (struct GNUNET_HashCode))) )
+ {
+ /* Other peer thinks we are done, but we disagree on the result! */
+ GNUNET_break_op (0);
+ fail_intersection_operation (op);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got final DONE\n");
+ op->state->phase = PHASE_FINISHED;
+ finish_and_destroy (op);
}
@@ -892,7 +942,6 @@
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,
@@ -909,8 +958,6 @@
}
msg->operation = htonl (GNUNET_SET_OPERATION_INTERSECTION);
msg->app_id = op->spec->app_id;
- // FIXME: where does this 'salt' come from?
- msg->salt = htonl (op->spec->salt);
msg->element_count = htonl (op->state->my_element_count);
GNUNET_MQ_send (op->mq,
ev);
@@ -935,29 +982,23 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Accepting set intersection operation\n");
op->state = GNUNET_new (struct OperationState);
+ op->state->phase = PHASE_INITIAL;
op->state->my_element_count
= op->spec->set->state->current_set_element_count;
op->state->my_elements
- = GNUNET_CONTAINER_multihashmap_create (GNUNET_MIN
(op->state->my_element_count,
-
op->spec->remote_element_count),
- GNUNET_YES);
+ = GNUNET_CONTAINER_multihashmap_create
+ (GNUNET_MIN (op->state->my_element_count,
+ op->spec->remote_element_count),
+ GNUNET_YES);
if (op->spec->remote_element_count < op->state->my_element_count)
{
/* If the other peer (Alice) has fewer elements than us (Bob),
we just send the count as Alice should send the first BF */
- op->state->phase = PHASE_INITIAL;
send_element_count (op);
return;
}
/* We have fewer elements, so we start with the BF */
- 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,
- &initialize_map,
- op);
- send_bloomfilter (op);
+ begin_bf_exchange (op);
}
@@ -987,10 +1028,7 @@
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:
+ case GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE:
handle_p2p_done (op, mh);
break;
default:
Modified: gnunet/src/set/gnunet-service-set_protocol.h
===================================================================
--- gnunet/src/set/gnunet-service-set_protocol.h 2014-11-28 12:05:53 UTC
(rev 34447)
+++ gnunet/src/set/gnunet-service-set_protocol.h 2014-11-28 20:52:20 UTC
(rev 34448)
@@ -17,9 +17,9 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @author Florian Dold
+ * @author Christian Grothoff
* @file set/gnunet-service-set_protocol.h
* @brief Peer-to-Peer messages for gnunet set
*/
@@ -45,11 +45,6 @@
uint32_t operation GNUNET_PACKED;
/**
- * Salt to use for this operation.
- */
- uint32_t salt GNUNET_PACKED;
-
- /**
* For Intersection: my element count
*/
uint32_t element_count GNUNET_PACKED;
@@ -126,27 +121,28 @@
struct GNUNET_MessageHeader header;
/**
- * mutator used with this bloomfilter.
+ * Number of elements the sender still has in the set.
*/
uint32_t sender_element_count GNUNET_PACKED;
/**
- * mutator used with this bloomfilter.
+ * XOR of all hashes over all elements remaining in the set.
+ * Used to determine termination.
*/
- uint32_t sender_mutator GNUNET_PACKED;
+ struct GNUNET_HashCode element_xor_hash;
/**
- * Length of the bloomfilter data
+ * Mutator used with this bloomfilter.
*/
- uint32_t bloomfilter_total_length GNUNET_PACKED;
+ uint32_t sender_mutator GNUNET_PACKED;
/**
- * Length of the appended bloomfilter data block
+ * Total length of the bloomfilter data.
*/
- uint32_t bloomfilter_length GNUNET_PACKED;
+ uint32_t bloomfilter_total_length GNUNET_PACKED;
/**
- * Length of the bloomfilter data
+ * Number of bits (k-value) used in encoding the bloomfilter.
*/
uint32_t bits_per_element GNUNET_PACKED;
@@ -156,26 +152,28 @@
};
-struct BFPart
+/**
+ * Last message, send to confirm the final set. Contains the element
+ * count as it is possible that the peer determined that we were done
+ * by getting the empty set, which in that case also needs to be
+ * communicated.
+ */
+struct IntersectionDoneMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF
+ * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE
*/
struct GNUNET_MessageHeader header;
/**
- * Length of the appended bloomfilter data block
+ * Final number of elements in intersection.
*/
- uint32_t chunk_length GNUNET_PACKED;
+ uint32_t final_element_count GNUNET_PACKED;
/**
- * offset in the bloolfilter data block, if multipart message
+ * XOR of all hashes over all elements remaining in the set.
*/
- uint32_t chunk_offset GNUNET_PACKED;
-
- /**
- * rest: the sender's bloomfilter
- */
+ struct GNUNET_HashCode element_xor_hash;
};
GNUNET_NETWORK_STRUCT_END
Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c 2014-11-28 12:05:53 UTC (rev
34447)
+++ gnunet/src/set/gnunet-service-set_union.c 2014-11-28 20:52:20 UTC (rev
34448)
@@ -170,8 +170,7 @@
/**
- * The key entry is used to associate an ibf key with
- * an element.
+ * The key entry is used to associate an ibf key with an element.
*/
struct KeyEntry
{
@@ -316,8 +315,8 @@
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *msg;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "union operation failed\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "union 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 (op->spec->client_request_id);
@@ -357,8 +356,7 @@
* @param cls closure
* @param key current key code
* @param value value in the hash map
- * @return #GNUNET_YES if we should continue to
- * iterate,
+ * @return #GNUNET_YES if we should continue to iterate,
* #GNUNET_NO if not.
*/
static int
@@ -390,9 +388,7 @@
* @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.
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
op_has_element_iterator (void *cls,
@@ -405,7 +401,8 @@
GNUNET_assert (NULL != k);
while (NULL != k)
{
- if (0 == GNUNET_CRYPTO_hash_cmp (&k->element->element_hash, element_hash))
+ if (0 == GNUNET_CRYPTO_hash_cmp (&k->element->element_hash,
+ element_hash))
return GNUNET_NO;
k = k->next_colliding;
}
@@ -506,12 +503,11 @@
* 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
+ * @param cls the union operation `struct Operation *`
+ * @param key unused
+ * @param value the `struct ElementEntry *` to insert
* into the key-to-element mapping
- * @return GNUNET_YES to continue iterating,
- * GNUNET_NO to stop
+ * @return #GNUNET_YES (to continue iterating)
*/
static int
init_key_to_element_iterator (void *cls,
@@ -543,7 +539,8 @@
* @param size size of the ibf to create
*/
static void
-prepare_ibf (struct Operation *op, uint16_t size)
+prepare_ibf (struct Operation *op,
+ uint16_t size)
{
if (NULL == op->state->key_to_element)
{
@@ -557,7 +554,8 @@
ibf_destroy (op->state->local_ibf);
op->state->local_ibf = ibf_create (size, SE_IBF_HASH_NUM);
GNUNET_CONTAINER_multihashmap32_iterate (op->state->key_to_element,
- prepare_ibf_iterator,
op->state->local_ibf);
+ &prepare_ibf_iterator,
+ op->state->local_ibf);
}
@@ -568,7 +566,8 @@
* @param ibf_order order of the ibf to send, size=2^order
*/
static void
-send_ibf (struct Operation *op, uint16_t ibf_order)
+send_ibf (struct Operation *op,
+ uint16_t ibf_order)
{
unsigned int buckets_sent = 0;
struct InvertibleBloomFilter *ibf;
@@ -647,7 +646,8 @@
unsigned int ibf_order;
ibf_order = 2;
- while ((1<<ibf_order) < (IBF_ALPHA * diff) || (1<<ibf_order) <
SE_IBF_HASH_NUM)
+ while ( (1<<ibf_order) < (IBF_ALPHA * diff) ||
+ ((1<<ibf_order) < SE_IBF_HASH_NUM) )
ibf_order++;
if (ibf_order > MAX_IBF_ORDER)
ibf_order = MAX_IBF_ORDER;
@@ -662,7 +662,8 @@
* @param mh the message
*/
static void
-handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
+handle_p2p_strata_estimator (void *cls,
+ const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
struct StrataEstimator *remote_se;
@@ -843,7 +844,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"transmitted all values, sending DONE\n");
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE);
GNUNET_MQ_send (op->mq, ev);
break;
}
@@ -1201,7 +1202,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"got DONE, sending final DONE after elements\n");
op->state->phase = PHASE_FINISHED;
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE);
GNUNET_MQ_send (op->mq, ev);
return;
}
@@ -1251,7 +1252,6 @@
}
msg->operation = htonl (GNUNET_SET_OPERATION_UNION);
msg->app_id = op->spec->app_id;
- msg->salt = htonl (op->spec->salt);
GNUNET_MQ_send (op->mq, ev);
if (NULL != opaque_context)
@@ -1379,7 +1379,7 @@
case GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS:
handle_p2p_element_requests (op, mh);
break;
- case GNUNET_MESSAGE_TYPE_SET_P2P_DONE:
+ case GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE:
handle_p2p_done (op, mh);
break;
default:
Modified: gnunet/src/util/crypto_hash.c
===================================================================
--- gnunet/src/util/crypto_hash.c 2014-11-28 12:05:53 UTC (rev 34447)
+++ gnunet/src/util/crypto_hash.c 2014-11-28 20:52:20 UTC (rev 34448)
@@ -375,8 +375,9 @@
* @param result set to a ^ b
*/
void
-GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode * a, const struct
GNUNET_HashCode * b,
- struct GNUNET_HashCode * result)
+GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode *a,
+ const struct GNUNET_HashCode *b,
+ struct GNUNET_HashCode *result)
{
int i;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34448 - in gnunet/src: include set util,
gnunet <=