From 3042006a4c995ffaa8389e7c4106ada1fed69fed Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 29 Apr 2013 09:09:01 +0000
Subject: [PATCH] fix

---
 src/set/gnunet-service-set.c       |  1 +
 src/set/gnunet-service-set_union.c | 17 +++++++++++------
 src/set/set.h                      |  4 ++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 314e7719d..6c91e42d0 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -439,6 +439,7 @@ handle_client_accept (void *cls,
   struct AcceptMessage *msg = (struct AcceptMessage *) mh;
 
   set = get_set (client);
+  
 
   if (NULL == set)
   {
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 4903ce605..d94928cdd 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -135,12 +135,6 @@ struct UnionEvaluateOperation
    */
   unsigned int ibf_buckets_received;
 
-  /**
-   * Current salt in use, zero unless
-   * we detected a collision
-   */
-  uint8_t salt;
-
   /**
    * order of the ibf we receive
    */
@@ -172,6 +166,11 @@ struct UnionEvaluateOperation
    * 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 @@ struct ElementEntry
    */
   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.
diff --git a/src/set/set.h b/src/set/set.h
index 10e607982..0bf1f2d05 100644
--- a/src/set/set.h
+++ b/src/set/set.h
@@ -135,6 +135,10 @@ struct EvaluateMessage
    */
   uint32_t request_id GNUNET_PACKED;
 
+  uint16_t salt;
+
+  uint16_t reserved;
+
   /* rest: inner message */
 };
 
-- 
2.25.1