diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-11-07 15:45:14 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-11-07 15:45:14 +0000 |
commit | 7961175bdde4e1efe2140e04caa6e600d41bcf90 (patch) | |
tree | 1d7fd0decda1cc2a135e883887caf918e6944ee3 /src/set/gnunet-service-set_union.c | |
parent | 5e4d5baa9bb49dd2a0e9b15f0687b6609ceaa52e (diff) | |
download | gnunet-7961175bdde4e1efe2140e04caa6e600d41bcf90.tar.gz gnunet-7961175bdde4e1efe2140e04caa6e600d41bcf90.zip |
added bloomfilter message struct
renamed set-union specific message types
added set-intersection specific message type
added intersection cancel API implementation
added intersection create API implementation
added intersection destroy API implementation
added intersection peer_disconnect API implementation
added intersection accept API imlementation stub
added many prototypes for intersection operation handlers
Diffstat (limited to 'src/set/gnunet-service-set_union.c')
-rw-r--r-- | src/set/gnunet-service-set_union.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 6ad985bcb..6bd86c5b5 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -609,7 +609,7 @@ send_ibf (struct Operation *op, uint16_t ibf_order) | |||
609 | buckets_in_message = MAX_BUCKETS_PER_MESSAGE; | 609 | buckets_in_message = MAX_BUCKETS_PER_MESSAGE; |
610 | 610 | ||
611 | ev = GNUNET_MQ_msg_extra (msg, buckets_in_message * IBF_BUCKET_SIZE, | 611 | ev = GNUNET_MQ_msg_extra (msg, buckets_in_message * IBF_BUCKET_SIZE, |
612 | GNUNET_MESSAGE_TYPE_SET_P2P_IBF); | 612 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF); |
613 | msg->reserved = 0; | 613 | msg->reserved = 0; |
614 | msg->order = ibf_order; | 614 | msg->order = ibf_order; |
615 | msg->offset = htons (buckets_sent); | 615 | msg->offset = htons (buckets_sent); |
@@ -638,7 +638,7 @@ send_strata_estimator (struct Operation *op) | |||
638 | 638 | ||
639 | ev = GNUNET_MQ_msg_header_extra (strata_msg, | 639 | ev = GNUNET_MQ_msg_header_extra (strata_msg, |
640 | SE_STRATA_COUNT * IBF_BUCKET_SIZE * SE_IBF_SIZE, | 640 | SE_STRATA_COUNT * IBF_BUCKET_SIZE * SE_IBF_SIZE, |
641 | GNUNET_MESSAGE_TYPE_SET_P2P_SE); | 641 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE); |
642 | strata_estimator_write (op->state->se, &strata_msg[1]); | 642 | strata_estimator_write (op->state->se, &strata_msg[1]); |
643 | GNUNET_MQ_send (op->mq, ev); | 643 | GNUNET_MQ_send (op->mq, ev); |
644 | op->state->phase = PHASE_EXPECT_IBF; | 644 | op->state->phase = PHASE_EXPECT_IBF; |
@@ -1299,10 +1299,10 @@ union_handle_p2p_message (struct Operation *op, | |||
1299 | ntohs (mh->type), ntohs (mh->size)); | 1299 | ntohs (mh->type), ntohs (mh->size)); |
1300 | switch (ntohs (mh->type)) | 1300 | switch (ntohs (mh->type)) |
1301 | { | 1301 | { |
1302 | case GNUNET_MESSAGE_TYPE_SET_P2P_IBF: | 1302 | case GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF: |
1303 | handle_p2p_ibf (op, mh); | 1303 | handle_p2p_ibf (op, mh); |
1304 | break; | 1304 | break; |
1305 | case GNUNET_MESSAGE_TYPE_SET_P2P_SE: | 1305 | case GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE: |
1306 | handle_p2p_strata_estimator (op, mh); | 1306 | handle_p2p_strata_estimator (op, mh); |
1307 | break; | 1307 | break; |
1308 | case GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS: | 1308 | case GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS: |