include element type in hash

5 files changed, 21 insertions, 16 deletions

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index b7617db25..47c9231c2 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -53,6 +53,7 @@ gnunet_service_set_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/set/libgnunetset.la \
   $(GN_LIBINTL)
 
 libgnunetset_la_SOURCES = \
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 986f52982..0557bc1f2 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -825,9 +825,8 @@ execute_add (struct Set *set,
               "Client inserts element of size %u\n",
               el.size);
   el.data = &msg[1];
-  GNUNET_CRYPTO_hash (el.data,
-                      el.size,
-                      &hash);
+  el.element_type = ntohs (msg->element_type);
+  GNUNET_SET_element_hash (&el, &hash);
 
   ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements,
                                           &hash);
@@ -840,6 +839,7 @@ execute_add (struct Set *set,
             el.data,
             el.size);
     ee->element.data = &ee[1];
+    ee->element.element_type = el.element_type;
     ee->remote = GNUNET_NO;
     ee->mutations = NULL;
     ee->mutations_size = 0;
@@ -885,9 +885,8 @@ execute_remove (struct Set *set,
               "Client removes element of size %u\n",
               el.size);
   el.data = &msg[1];
-  GNUNET_CRYPTO_hash (el.data,
-                      el.size,
-                      &hash);
+  el.element_type = ntohs (msg->element_type);
+  GNUNET_SET_element_hash (&el, &hash);
   ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements,
                                           &hash);
   if (NULL == ee)
@@ -1009,7 +1008,7 @@ again:
     memcpy (&msg[1],
             ee->element.data,
             ee->element.size);
-    msg->element_type = ee->element.element_type;
+    msg->element_type = htons (ee->element.element_type);
     msg->iteration_id = htons (set->iteration_id);
   }
   GNUNET_MQ_send (set->client_mq, ev);
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index c32acc1e6..2940c3c2d 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1078,9 +1078,7 @@ handle_p2p_elements (void *cls,
   ee->element.data = &ee[1];
   ee->element.element_type = ntohs (emsg->element_type);
   ee->remote = GNUNET_YES;
-  GNUNET_CRYPTO_hash (ee->element.data,
-                      ee->element.size,
-                      &ee->element_hash);
+  GNUNET_SET_element_hash (&ee->element, &ee->element_hash);
 
   if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_remove (op->state->demanded_hashes, &ee->element_hash, NULL))
   {
diff --git a/src/set/set.h b/src/set/set.h
index 0dccf2a51..2df1b5926 100644
--- a/src/set/set.h
+++ b/src/set/set.h
@@ -28,6 +28,7 @@
 
 #include "platform.h"
 #include "gnunet_common.h"
+#include "gnunet_set_service.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 6cbee9a57..cd880f688 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -330,7 +330,7 @@ handle_iter_element (void *cls,
   if (NULL != iter)
   {
     element.size = msize - sizeof (struct GNUNET_SET_IterResponseMessage);
-    element.element_type = htons (msg->element_type);
+    element.element_type = ntohs (msg->element_type);
     element.data = &msg[1];
     iter (set->iterator_cls,
           &element);
@@ -443,7 +443,7 @@ do_element:
        "Treating result as element\n");
   e.data = &msg[1];
   e.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_ResultMessage);
-  e.element_type = msg->element_type;
+  e.element_type = ntohs (msg->element_type);
   if (NULL != oh->result_cb)
     oh->result_cb (oh->result_cls,
                    &e,
@@ -655,7 +655,7 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set,
   }
   mqm = GNUNET_MQ_msg_extra (msg, element->size,
                              GNUNET_MESSAGE_TYPE_SET_ADD);
-  msg->element_type = element->element_type;
+  msg->element_type = htons (element->element_type);
   memcpy (&msg[1],
           element->data,
           element->size);
@@ -697,7 +697,7 @@ GNUNET_SET_remove_element (struct GNUNET_SET_Handle *set,
   mqm = GNUNET_MQ_msg_extra (msg,
                              element->size,
                              GNUNET_MESSAGE_TYPE_SET_REMOVE);
-  msg->element_type = element->element_type;
+  msg->element_type = htons (element->element_type);
   memcpy (&msg[1],
           element->data,
           element->size);
@@ -1144,8 +1144,14 @@ GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element)
 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);
+  struct GNUNET_HashContext *ctx = GNUNET_CRYPTO_hash_context_start ();
+
+  /* It's not guaranteed that the element data is always after the element header,
+     so we need to hash the chunks separately. */
+  GNUNET_CRYPTO_hash_context_read (ctx, &element->size, sizeof (uint16_t));
+  GNUNET_CRYPTO_hash_context_read (ctx, &element->element_type, sizeof (uint16_t));
+  GNUNET_CRYPTO_hash_context_read (ctx, element->data, element->size);
+  GNUNET_CRYPTO_hash_context_finish (ctx, ret_hash);
 }
 
 /* end of set_api.c */