[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36485 - gnunet/src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36485 - gnunet/src/set |
Date: |
Thu, 8 Oct 2015 14:12:26 +0200 |
Author: grothoff
Date: 2015-10-08 14:12:25 +0200 (Thu, 08 Oct 2015)
New Revision: 36485
Modified:
gnunet/src/set/gnunet-service-set.c
gnunet/src/set/gnunet-service-set_union.c
gnunet/src/set/gnunet-service-set_union_strata_estimator.c
gnunet/src/set/set.conf.in
Log:
-fix
Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2015-10-08 11:54:50 UTC (rev 36484)
+++ gnunet/src/set/gnunet-service-set.c 2015-10-08 12:12:25 UTC (rev 36485)
@@ -1988,6 +1988,7 @@
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENT_REQUESTS, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, 0},
{ &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, 0},
+ { &dispatch_p2p_message, GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, 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_DONE, 0},
Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c 2015-10-08 11:54:50 UTC (rev
36484)
+++ gnunet/src/set/gnunet-service-set_union.c 2015-10-08 12:12:25 UTC (rev
36485)
@@ -689,8 +689,7 @@
}
len = ntohs (mh->size) - sizeof (struct GNUNET_MessageHeader);
if ( (GNUNET_NO == is_compressed) &&
- (len !=
- SE_STRATA_COUNT * SE_IBF_SIZE * IBF_BUCKET_SIZE) )
+ (len != SE_STRATA_COUNT * SE_IBF_SIZE * IBF_BUCKET_SIZE) )
{
fail_union_operation (op);
GNUNET_break (0);
Modified: gnunet/src/set/gnunet-service-set_union_strata_estimator.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union_strata_estimator.c 2015-10-08
11:54:50 UTC (rev 36484)
+++ gnunet/src/set/gnunet-service-set_union_strata_estimator.c 2015-10-08
12:12:25 UTC (rev 36485)
@@ -33,7 +33,7 @@
* Should we try compressing the strata estimator? This will
* break compatibility with the 0.10.1-network.
*/
-#define FAIL_10_1_COMPATIBILTIY 1
+#define FAIL_10_1_COMPATIBILTIY 0
/**
@@ -123,6 +123,7 @@
GNUNET_free_non_null (dbuf);
return GNUNET_SYSERR;
}
+
for (i = 0; i < se->strata_count; i++)
{
ibf_read_slice (buf, 0, se->ibf_size, se->strata[i]);
@@ -202,6 +203,8 @@
se->strata[i] = ibf_create (ibf_size, ibf_hashnum);
if (NULL == se->strata[i])
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to allocate memory for strata estimator\n");
for (j = 0; j < i; j++)
ibf_destroy (se->strata[i]);
GNUNET_free (se);
@@ -277,7 +280,8 @@
c = GNUNET_new (struct StrataEstimator);
c->strata_count = se->strata_count;
c->ibf_size = se->ibf_size;
- c->strata = GNUNET_malloc (sizeof (struct InvertibleBloomFilter *) *
se->strata_count);
+ c->strata = GNUNET_new_array (se->strata_count,
+ struct InvertibleBloomFilter *);
for (i = 0; i < se->strata_count; i++)
c->strata[i] = ibf_dup (se->strata[i]);
return c;
Modified: gnunet/src/set/set.conf.in
===================================================================
--- gnunet/src/set/set.conf.in 2015-10-08 11:54:50 UTC (rev 36484)
+++ gnunet/src/set/set.conf.in 2015-10-08 12:12:25 UTC (rev 36485)
@@ -9,4 +9,4 @@
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
-PREFIX = valgrind
+# PREFIX = valgrind
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36485 - gnunet/src/set,
gnunet <=