[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27003 - gnunet/src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27003 - gnunet/src/set |
Date: |
Mon, 29 Apr 2013 11:09:01 +0200 |
Author: dold
Date: 2013-04-29 11:09:01 +0200 (Mon, 29 Apr 2013)
New Revision: 27003
Modified:
gnunet/src/set/gnunet-service-set.c
gnunet/src/set/gnunet-service-set_union.c
gnunet/src/set/set.h
Log:
fix
Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-04-27 14:24:52 UTC (rev 27002)
+++ gnunet/src/set/gnunet-service-set.c 2013-04-29 09:09:01 UTC (rev 27003)
@@ -439,6 +439,7 @@
struct AcceptMessage *msg = (struct AcceptMessage *) mh;
set = get_set (client);
+
if (NULL == set)
{
Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c 2013-04-27 14:24:52 UTC (rev
27002)
+++ gnunet/src/set/gnunet-service-set_union.c 2013-04-29 09:09:01 UTC (rev
27003)
@@ -136,12 +136,6 @@
unsigned int ibf_buckets_received;
/**
- * Current salt in use, zero unless
- * we detected a collision
- */
- uint8_t salt;
-
- /**
* order of the ibf we receive
*/
unsigned int ibf_order;
@@ -172,6 +166,11 @@
* Current state of the operation
*/
enum UnionOperationState state;
+
+ /**
+ * Salt to use for this operation.
+ */
+ uint16_t salt;
/**
* Evaluate operations are held in
@@ -214,6 +213,12 @@
*/
int generation_add;
+ unsigned int generation_added;
+
+ unsigned int generation_removed;
+
+ unsigned int generation_received;
+
/**
* Generation this element was removed.
* Operations of later generations will not consider the element.
Modified: gnunet/src/set/set.h
===================================================================
--- gnunet/src/set/set.h 2013-04-27 14:24:52 UTC (rev 27002)
+++ gnunet/src/set/set.h 2013-04-29 09:09:01 UTC (rev 27003)
@@ -135,6 +135,10 @@
*/
uint32_t request_id GNUNET_PACKED;
+ uint16_t salt;
+
+ uint16_t reserved;
+
/* rest: inner message */
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27003 - gnunet/src/set,
gnunet <=