work on consensus and set

- evil peers for consensus
- various fixes for consensus and set

2 files changed, 41 insertions, 5 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 2f1578514..986f52982 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -844,6 +844,11 @@ execute_add (struct Set *set,
     ee->mutations = NULL;
     ee->mutations_size = 0;
     ee->element_hash = hash;
+    GNUNET_break (GNUNET_YES ==
+                  GNUNET_CONTAINER_multihashmap_put (set->content->elements,
+                                                     &ee->element_hash,
+                                                     ee,
+                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   }
   else if (GNUNET_YES == _GSS_is_element_of_set (ee, set))
   {
@@ -859,11 +864,6 @@ execute_add (struct Set *set,
     GNUNET_array_append (ee->mutations, ee->mutations_size, mut);
   }
 
-  GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap_put (set->content->elements,
-                                                   &ee->element_hash,
-                                                   ee,
-                                                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   set->vt->add (set->state, ee);
 }
 
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 16aa87cd0..6cbee9a57 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -1112,4 +1112,40 @@ GNUNET_SET_copy_lazy (struct GNUNET_SET_Handle *set,
 }
 
 
+/**
+ * Create a copy of an element.  The copy
+ * must be GNUNET_free-d by the caller.
+ *
+ * @param element the element to copy
+ * @return the copied element
+ */
+struct GNUNET_SET_Element *
+GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element)
+{
+  struct GNUNET_SET_Element *copy;
+
+  copy = GNUNET_malloc (element->size + sizeof (struct GNUNET_SET_Element));
+  copy->size = element->size;
+  copy->element_type = element->element_type;
+  copy->data = &copy[1];
+  memcpy ((void *) copy->data, element->data, copy->size);
+
+  return copy;
+}
+
+
+/**
+ * Hash a set element.
+ *
+ * @param element the element that should be hashed
+ * @param ret_hash a pointer to where the hash of @a element
+ *        should be stored
+ */
+void
+GNUNET_SET_element_hash (const struct GNUNET_SET_Element *element, struct GNUNET_HashCode *ret_hash)
+{
+  /* FIXME: The element type should also be hashed. */
+  GNUNET_CRYPTO_hash (element->data, element->size, ret_hash);
+}
+
 /* end of set_api.c */