Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
- * @file set/gnunet-service-set.c
+ * @file set/gnunet-service-set_union.c
* @brief two-peer set operations
* @author Florian Dold
*/
#include "gnunet_util_lib.h"
#include "gnunet-service-set.h"
#include "ibf.h"
-#include "strata_estimator.h"
-#include "set_protocol.h"
+#include "gnunet-service-set_union_strata_estimator.h"
+#include "gnunet-service-set_protocol.h"
#include <gcrypt.h>
* We sent the request message, and expect a strata estimator
*/
PHASE_EXPECT_SE,
+
/**
- * We sent the strata estimator, and expect an IBF. This phase is entered once
- * upon initialization and later via PHASE_EXPECT_ELEMENTS_AND_REQUESTS.
- *
- * After receiving the complete IBF, we enter PHASE_EXPECT_ELEMENTS
+ * We sent the strata estimator, and expect an IBF. This phase is entered once
+ * upon initialization and later via #PHASE_EXPECT_ELEMENTS_AND_REQUESTS.
+ *
+ * After receiving the complete IBF, we enter #PHASE_EXPECT_ELEMENTS
*/
PHASE_EXPECT_IBF,
+
/**
* Continuation for multi part IBFs.
*/
PHASE_EXPECT_IBF_CONT,
+
/**
* We are sending request and elements,
* and thus only expect elements from the other peer.
- *
+ *
* We are currently decoding an IBF until it can no longer be decoded,
* we currently send requests and expect elements
- * The remote peer is in PHASE_EXPECT_ELEMENTS_AND_REQUESTS
+ * The remote peer is in #PHASE_EXPECT_ELEMENTS_AND_REQUESTS
*/
PHASE_EXPECT_ELEMENTS,
+
/**
* We are expecting elements and requests, and send
* requested elements back to the other peer.
- *
+ *
* We are in this phase if we have SENT an IBF for the remote peer to decode.
* We expect requests, send elements or could receive an new IBF, which takes
- * us via PHASE_EXPECT_IBF to phase PHASE_EXPECT_ELEMENTS
- *
+ * us via #PHASE_EXPECT_IBF to phase #PHASE_EXPECT_ELEMENTS
+ *
* The remote peer is thus in:
- * PHASE_EXPECT_ELEMENTS
+ * #PHASE_EXPECT_ELEMENTS
*/
PHASE_EXPECT_ELEMENTS_AND_REQUESTS,
+
/**
* The protocol is over.
* Results may still have to be sent to the client.
/**
- * State of an evaluate operation
- * with another peer.
+ * State of an evaluate operation with another peer.
*/
struct OperationState
{
- /**
- * Number of ibf buckets received
- */
- unsigned int ibf_buckets_received;
/**
* Copy of the set's strata estimator at the time of
* Did we send the client that we are done?
*/
int client_done_sent;
+
+ /**
+ * Number of ibf buckets received
+ */
+ unsigned int ibf_buckets_received;
+
};
/**
- * 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
{
/**
- * Iterator over hash map entries.
+ * Iterator over hash map entries, called to
+ * destroy the linked list of colliding ibf key entries.
*
* @param cls closure
* @param key current key code
void *value)
{
struct KeyEntry *k = value;
- /* destroy the linked list of colliding ibf key entries */
+
while (NULL != k)
{
struct KeyEntry *k_tmp = k;
/**
- * Destroy the union operation. Only things specific to the union operation are destroyed.
- *
+ * Destroy the union operation. Only things specific to the union
+ * operation are destroyed.
+ *
* @param op union operation to destroy
*/
static void
union_op_cancel (struct Operation *op)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying union op\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "destroying union op\n");
/* check if the op was canceled twice */
GNUNET_assert (NULL != op->state);
if (NULL != op->state->remote_ibf)
}
if (NULL != op->state->key_to_element)
{
- GNUNET_CONTAINER_multihashmap32_iterate (op->state->key_to_element, destroy_key_to_element_iter, NULL);
+ GNUNET_CONTAINER_multihashmap32_iterate (op->state->key_to_element,
+ &destroy_key_to_element_iter,
+ NULL);
GNUNET_CONTAINER_multihashmap32_destroy (op->state->key_to_element);
op->state->key_to_element = NULL;
}
GNUNET_free (op->state);
op->state = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying union op done\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "destroying union op done\n");
}
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);
msg->element_type = htons (0);
GNUNET_MQ_send (op->spec->set->client_mq, ev);
- _GSS_operation_destroy (op);
+ _GSS_operation_destroy (op, GNUNET_YES);
}
* @return the derived IBF key
*/
static struct IBF_Key
-get_ibf_key (const struct GNUNET_HashCode *src, uint16_t salt)
+get_ibf_key (const struct GNUNET_HashCode *src,
+ uint16_t salt)
{
struct IBF_Key key;
}
-/**
- * Send a request for the evaluate operation to a remote peer
- *
- * @param op operation with the other peer
- */
-static void
-send_operation_request (struct Operation *op)
-{
- struct GNUNET_MQ_Envelope *ev;
- struct OperationRequestMessage *msg;
-
- ev = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
- op->spec->context_msg);
-
- if (NULL == ev)
- {
- /* the context message is too large */
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (op->spec->set->client);
- return;
- }
- 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 != 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");
-
- if (NULL != op->spec->context_msg)
- {
- GNUNET_free (op->spec->context_msg);
- op->spec->context_msg = NULL;
- }
-}
-
-
/**
* 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,
+ * @return #GNUNET_YES if we should continue to iterate,
* #GNUNET_NO if not.
*/
static int
* @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,
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;
}
* @return #GNUNET_YES if the element has been found, #GNUNET_NO otherwise
*/
static int
-op_has_element (struct Operation *op, const struct GNUNET_HashCode *element_hash)
+op_has_element (struct Operation *op,
+ const struct GNUNET_HashCode *element_hash)
{
int ret;
struct IBF_Key ibf_key;
ibf_key = get_ibf_key (element_hash, op->spec->salt);
ret = GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element,
(uint32_t) ibf_key.key_val,
- op_has_element_iterator, (void *) element_hash);
+ op_has_element_iterator,
+ (void *) element_hash);
/* was the iteration aborted because we found the element? */
if (GNUNET_SYSERR == ret)
* @param ee the element entry
*/
static void
-op_register_element (struct Operation *op, struct ElementEntry *ee)
+op_register_element (struct Operation *op,
+ struct ElementEntry *ee)
{
int ret;
struct IBF_Key ibf_key;
k->ibf_key = ibf_key;
ret = GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element,
(uint32_t) ibf_key.key_val,
- op_register_element_iterator, k);
+ op_register_element_iterator,
+ k);
/* was the element inserted into a colliding bucket? */
if (GNUNET_SYSERR == ret)
return;
-
- GNUNET_CONTAINER_multihashmap32_put (op->state->key_to_element, (uint32_t) ibf_key.key_val, k,
+ GNUNET_CONTAINER_multihashmap32_put (op->state->key_to_element,
+ (uint32_t) ibf_key.key_val,
+ k,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
struct InvertibleBloomFilter *ibf = cls;
struct KeyEntry *ke = value;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "inserting %x into ibf\n", ke->ibf_key.key_val);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "inserting %x into ibf\n",
+ ke->ibf_key.key_val);
ibf_insert (ibf, ke->ibf_key);
return GNUNET_YES;
}
* Iterator for initializing the
* key-to-element mapping of a union operation
*
- * @param cls the union operation
- * @param key unised
- * @param value the element entry to insert
+ * @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,
* @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)
{
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);
}
* @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;
prepare_ibf (op, 1<<ibf_order);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending ibf of size %u\n", 1<<ibf_order);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending ibf of size %u\n",
+ 1<<ibf_order);
ibf = op->state->local_ibf;
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_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ibf chunk size %u, %u/%u sent\n",
+ buckets_in_message,
+ buckets_sent,
+ 1<<ibf_order);
GNUNET_MQ_send (op->mq, ev);
}
strata_estimator_write (op->state->se, &strata_msg[1]);
GNUNET_MQ_send (op->mq, ev);
op->state->phase = PHASE_EXPECT_IBF;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sent SE, expecting IBF\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sent SE, expecting IBF\n");
}
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;
* @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;
strata_estimator_destroy (remote_se);
strata_estimator_destroy (op->state->se);
op->state->se = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got se diff=%d, using ibf size %d\n",
- diff, 1<<get_order_from_difference (diff));
- send_ibf (op, get_order_from_difference (diff));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "got se diff=%d, using ibf size %d\n",
+ diff,
+ 1<<get_order_from_difference (diff));
+ send_ibf (op,
+ get_order_from_difference (diff));
}
struct GNUNET_MessageHeader *mh;
GNUNET_assert (ke->ibf_key.key_val == ibf_key.key_val);
- ev = GNUNET_MQ_msg_header_extra (mh, element->size, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS);
+ ev = GNUNET_MQ_msg_header_extra (mh,
+ element->size,
+ GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS);
if (NULL == ev)
{
/* element too large */
GNUNET_break (0);
continue;
}
- memcpy (&mh[1], element->data, element->size);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (%s) to peer\n",
+ memcpy (&mh[1],
+ element->data,
+ element->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending element (%s) to peer\n",
GNUNET_h2s (&ke->element->element_hash));
GNUNET_MQ_send (op->mq, ev);
ke = ke->next_colliding;
return GNUNET_NO;
}
+
/**
* Send all elements that have the specified IBF key
* to the remote peer of the union operation
send_cls.ibf_key = ibf_key;
send_cls.op = op;
- GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element, (uint32_t) ibf_key.key_val,
- &send_element_iterator, &send_cls);
+ (void) GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element,
+ (uint32_t) ibf_key.key_val,
+ &send_element_iterator, &send_cls);
}
ibf_destroy (op->state->remote_ibf);
op->state->remote_ibf = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoding IBF (size=%u)\n", diff_ibf->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "decoding IBF (size=%u)\n",
+ diff_ibf->size);
num_decoded = 0;
last_key.key_val = 0;
res = ibf_decode (diff_ibf, &side, &key);
if (res == GNUNET_OK)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoded ibf key %lx\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "decoded ibf key %lx\n",
key.key_val);
num_decoded += 1;
- if (num_decoded > diff_ibf->size || (num_decoded > 1 && last_key.key_val == key.key_val))
+ if ( (num_decoded > diff_ibf->size) ||
+ (num_decoded > 1 && last_key.key_val == key.key_val) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "detected cyclic ibf (decoded %u/%u)\n",
- num_decoded, diff_ibf->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "detected cyclic ibf (decoded %u/%u)\n",
+ num_decoded,
+ diff_ibf->size);
cycle_detected = GNUNET_YES;
}
}
- if ((GNUNET_SYSERR == res) || (GNUNET_YES == cycle_detected))
+ if ( (GNUNET_SYSERR == res) ||
+ (GNUNET_YES == cycle_detected) )
{
int next_order;
next_order = 0;
next_order++;
if (next_order <= MAX_IBF_ORDER)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"decoding failed, sending larger ibf (size %u)\n",
1<<next_order);
send_ibf (op, next_order);
{
struct GNUNET_MQ_Envelope *ev;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "transmitted all values, sending DONE\n");
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_P2P_DONE);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "transmitted all values, sending DONE\n");
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE);
GNUNET_MQ_send (op->mq, ev);
break;
}
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_MessageHeader *msg;
- /* It may be nice to merge multiple requests, but with mesh's corking it is not worth
+ /* It may be nice to merge multiple requests, but with cadet's corking it is not worth
* the effort additional complexity. */
ev = GNUNET_MQ_msg_header_extra (msg, sizeof (struct IBF_Key),
GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS);
*(struct IBF_Key *) &msg[1] = key;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element request\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending element request\n");
GNUNET_MQ_send (op->mq, ev);
}
else
{
op->state->phase = PHASE_EXPECT_IBF_CONT;
GNUNET_assert (NULL == op->state->remote_ibf);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "creating new ibf of size %u\n", 1<<msg->order);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "creating new ibf of size %u\n",
+ 1<<msg->order);
op->state->remote_ibf = ibf_create (1<<msg->order, SE_IBF_HASH_NUM);
op->state->ibf_buckets_received = 0;
if (0 != ntohs (msg->offset))
return;
}
- ibf_read_slice (&msg[1], op->state->ibf_buckets_received, buckets_in_message, op->state->remote_ibf);
+ ibf_read_slice (&msg[1],
+ op->state->ibf_buckets_received,
+ buckets_in_message,
+ op->state->remote_ibf);
op->state->ibf_buckets_received += buckets_in_message;
if (op->state->ibf_buckets_received == op->state->remote_ibf->size)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received full ibf\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "received full ibf\n");
op->state->phase = PHASE_EXPECT_ELEMENTS;
decode_and_send (op);
}
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *rm;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (size %u) to client\n", element->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending element (size %u) to client\n",
+ element->size);
GNUNET_assert (0 != op->spec->client_request_id);
ev = GNUNET_MQ_msg_extra (rm, element->size, GNUNET_MESSAGE_TYPE_SET_RESULT);
if (NULL == ev)
}
rm->result_status = htons (GNUNET_SET_STATUS_OK);
rm->request_id = htonl (op->spec->client_request_id);
- rm->element_type = element->type;
+ rm->element_type = element->element_type;
memcpy (&rm[1], element->data, element->size);
GNUNET_MQ_send (op->spec->set->client_mq, ev);
}
struct Operation *op = cls;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *rm;
+ int keep = op->keep;
+
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);
+ _GSS_operation_destroy (op, GNUNET_YES);
+ if (GNUNET_YES == keep)
+ GNUNET_free (op);
}
struct KeyEntry *ke;
int res;
- res = GNUNET_CONTAINER_multihashmap32_iterator_next (op->state->full_result_iter, NULL, (const void **) &ke);
+ res = GNUNET_CONTAINER_multihashmap32_iterator_next (op->state->full_result_iter,
+ NULL,
+ (const void **) &ke);
if (GNUNET_NO == res)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending done and destroy because iterator ran out\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending done and destroy because iterator ran out\n");
send_done_and_destroy (op);
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending elements from key entry\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending elements from key entry\n");
while (1)
{
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_Element *element;
element = &ke->element->element;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element (size %u) to client (full set)\n", element->size);
+ 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);
if (NULL == ev)
}
rm->result_status = htons (GNUNET_SET_STATUS_OK);
rm->request_id = htonl (op->spec->client_request_id);
- rm->element_type = element->type;
+ rm->element_type = element->element_type;
memcpy (&rm[1], element->data, element->size);
- if (ke->next_colliding == NULL)
+ if (NULL == ke->next_colliding)
{
GNUNET_MQ_notify_sent (ev, send_remaining_elements, op);
GNUNET_MQ_send (op->spec->set->client_mq, ev);
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);
+ /* prevent that the op is free'd by the tunnel end handler */
+ op->keep = GNUNET_YES;
+ 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->key_to_element);
send_remaining_elements (op);
* @param mh the message
*/
static void
-handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
+handle_p2p_elements (void *cls,
+ const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
struct ElementEntry *ee;
uint16_t element_size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got element from peer\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "got element from peer\n");
if ( (op->state->phase != PHASE_EXPECT_ELEMENTS) &&
(op->state->phase != PHASE_EXPECT_ELEMENTS_AND_REQUESTS) )
return;
}
element_size = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
- ee = GNUNET_malloc (sizeof *ee + element_size);
+ ee = GNUNET_malloc (sizeof (struct ElementEntry) + element_size);
memcpy (&ee[1], &mh[1], element_size);
ee->element.size = element_size;
ee->element.data = &ee[1];
ee->remote = GNUNET_YES;
- GNUNET_CRYPTO_hash (ee->element.data, ee->element.size, &ee->element_hash);
+ GNUNET_CRYPTO_hash (ee->element.data,
+ ee->element.size,
+ &ee->element_hash);
if (GNUNET_YES == op_has_element (op, &ee->element_hash))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got existing element from peer\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "got existing element from peer\n");
GNUNET_free (ee);
return;
}
* @param mh the message
*/
static void
-handle_p2p_element_requests (void *cls, const struct GNUNET_MessageHeader *mh)
+handle_p2p_element_requests (void *cls,
+ const struct GNUNET_MessageHeader *mh)
{
struct Operation *op = cls;
struct IBF_Key *ibf_key;
{
/* 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");
+ 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;
}
if (op->state->phase == PHASE_EXPECT_ELEMENTS)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got final DONE\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "got final DONE\n");
op->state->phase = PHASE_FINISHED;
finish_and_destroy (op);
return;
/**
- * Evaluate a union operation with
- * a remote peer.
+ * Initiate operation to evaluate a set union with a remote peer.
*
- * @param op operation to evaluate
+ * @param op operation to perform (to be initialized)
+ * @param opaque_context message to be transmitted to the listener
+ * to convince him to accept, may be NULL
*/
static void
-union_evaluate (struct Operation *op)
+union_evaluate (struct Operation *op,
+ const struct GNUNET_MessageHeader *opaque_context)
{
+ struct GNUNET_MQ_Envelope *ev;
+ struct OperationRequestMessage *msg;
+
op->state = GNUNET_new (struct OperationState);
- // copy the current generation's strata estimator for this operation
+ /* copy the current generation's strata estimator for this operation */
op->state->se = strata_estimator_dup (op->spec->set->state->se);
/* we started the operation, thus we have to send the operation request */
op->state->phase = PHASE_EXPECT_SE;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "evaluating union operation");
- send_operation_request (op);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Initiating union operation evaluation\n");
+ ev = GNUNET_MQ_msg_nested_mh (msg,
+ GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
+ opaque_context);
+ if (NULL == ev)
+ {
+ /* the context message is too large */
+ GNUNET_break (0);
+ GNUNET_SERVER_client_disconnect (op->spec->set->client);
+ return;
+ }
+ msg->operation = htonl (GNUNET_SET_OPERATION_UNION);
+ msg->app_id = op->spec->app_id;
+ GNUNET_MQ_send (op->mq, ev);
+
+ if (NULL != opaque_context)
+ 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");
}
static void
union_accept (struct Operation *op)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "accepting set union operation\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "accepting set union operation\n");
op->state = GNUNET_new (struct OperationState);
op->state->se = strata_estimator_dup (op->spec->set->state->se);
/* kick off the operation */
/**
* Create a new set supporting the union operation
- *
+ *
* We maintain one strata estimator per set and then manipulate it over the
* lifetime of the set, as recreating a strata estimator would be expensive.
- *
+ *
* @return the newly created set
*/
static struct SetState *
{
struct SetState *set_state;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "union set created\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "union set created\n");
set_state = GNUNET_new (struct SetState);
set_state->se = strata_estimator_create (SE_STRATA_COUNT,
- SE_IBF_SIZE, SE_IBF_HASH_NUM);
+ SE_IBF_SIZE, SE_IBF_HASH_NUM);
return set_state;
}
static void
union_add (struct SetState *set_state, struct ElementEntry *ee)
{
- strata_estimator_insert (set_state->se, get_ibf_key (&ee->element_hash, 0));
+ strata_estimator_insert (set_state->se,
+ get_ibf_key (&ee->element_hash, 0));
}
static void
union_remove (struct SetState *set_state, struct ElementEntry *ee)
{
- strata_estimator_remove (set_state->se, get_ibf_key (&ee->element_hash, 0));
+ strata_estimator_remove (set_state->se,
+ get_ibf_key (&ee->element_hash, 0));
}
union_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));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "received p2p message (t: %u, s: %u)\n",
+ ntohs (mh->type),
+ ntohs (mh->size));
switch (ntohs (mh->type))
{
case GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF:
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:
- /* something wrong with mesh's message handlers? */
+ /* something wrong with cadet's message handlers? */
GNUNET_assert (0);
}
return GNUNET_OK;
}
/**
- * handler for peer-disconnects, notifies the client
+ * handler for peer-disconnects, notifies the client
* about the aborted operation in case the op was not concluded
- *
+ *
* @param op the destroyed operation
*/
static void
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);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "other peer disconnected prematurely\n");
+ _GSS_operation_destroy (op, GNUNET_YES);
return;
}
// else: the session has already been concluded
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "other peer disconnected (finished)\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "other peer disconnected (finished)\n");
if (GNUNET_NO == op->state->client_done_sent)
finish_and_destroy (op);
}
/**
* Get the table with implementing functions for
* set union.
- *
+ *
* @return the operation specific VTable
*/
const struct SetVT *
projects / oweals / gnunet.git / blobdiff