From 1526a366e98d0f7ac4f82c548273c9f2c06f553f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 5 Oct 2015 23:16:17 +0000 Subject: include element type in hash --- src/set/gnunet-service-set.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/set/gnunet-service-set.c') 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); -- cgit v1.2.3