aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/fs/fs.h2
-rw-r--r--src/fs/fs_api.h2
-rw-r--r--src/fs/fs_download.c2
-rw-r--r--src/fs/fs_uri.c14
-rw-r--r--src/fs/gnunet-service-fs_cp.c52
-rw-r--r--src/fs/gnunet-service-fs_mesh_client.c22
-rw-r--r--src/fs/gnunet-service-fs_pe.c18
-rw-r--r--src/fs/gnunet-service-fs_pr.c1
-rw-r--r--src/fs/gnunet-service-fs_push.c4
-rw-r--r--src/include/gnunet_dns_service.h5
-rw-r--r--src/lockmanager/gnunet-service-lockmanager.c5
-rw-r--r--src/lockmanager/lockmanager_api.c5
-rw-r--r--src/set/gnunet-service-set.h3
-rw-r--r--src/set/gnunet-service-set_union.c6
-rw-r--r--src/set/gnunet-set-ibf-profiler.c3
-rw-r--r--src/set/gnunet-set-profiler.c1
-rw-r--r--src/set/ibf.h1
-rw-r--r--src/set/strata_estimator.c2
18 files changed, 71 insertions, 77 deletions
diff --git a/src/fs/fs.h b/src/fs/fs.h
index c4a3e00ae5..ae6ca489a0 100644
--- a/src/fs/fs.h
+++ b/src/fs/fs.h
@@ -240,7 +240,7 @@ struct SearchMessage
* <p>
* Otherwise, "target" must be all zeros.
*/
- struct GNUNET_HashCode target;
+ struct GNUNET_PeerIdentity target;
/**
* Hash of the public key for UBLOCKs; Hash of
diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index 5cc9d6ed92..d8ea21c546 100644
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -120,7 +120,7 @@ struct Location
/**
* Identity of the peer sharing the file.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey peer;
+ struct GNUNET_PeerIdentity peer;
/**
* Time when this location URI expires.
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 282198cd32..49c83bdc6e 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1325,7 +1325,7 @@ transmit_download_request (void *cls, size_t size, void *buf)
else
sm->type = htonl (GNUNET_BLOCK_TYPE_FS_IBLOCK);
sm->anonymity_level = htonl (dc->anonymity);
- sm->target = dc->target.hashPubKey;
+ sm->target = dc->target;
sm->query = dr->chk.query;
GNUNET_CONTAINER_DLL_remove (dc->pending_head, dc->pending_tail, dr);
dr->is_pending = GNUNET_NO;
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 67ce6d530c..4b25e91ea8 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -532,7 +532,7 @@ struct LocUriAssembly
/**
* Peer offering the file.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey peer;
+ struct GNUNET_PeerIdentity peer;
};
GNUNET_NETWORK_STRUCT_END
@@ -642,7 +642,7 @@ uri_loc_parse (const char *s, char **emsg)
ass.exptime = GNUNET_TIME_absolute_hton (et);
if (GNUNET_OK !=
GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
- &ass.purpose, &sig, &ass.peer))
+ &ass.purpose, &sig, &ass.peer.public_key))
{
*emsg =
GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
@@ -832,7 +832,7 @@ GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
*
* @param uri the location URI to inspect
* @param peer where to store the identify of the peer (presumably) offering the content
- * @return GNUNET_SYSERR if this is not a location URI, otherwise GNUNET_OK
+ * @return #GNUNET_SYSERR if this is not a location URI, otherwise #GNUNET_OK
*/
int
GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
@@ -840,9 +840,7 @@ GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
{
if (uri->type != GNUNET_FS_URI_LOC)
return GNUNET_SYSERR;
- GNUNET_CRYPTO_hash (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
- &peer->hashPubKey);
+ *peer = uri->data.loc.peer;
return GNUNET_OK;
}
@@ -927,12 +925,12 @@ GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri,
ass.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
ass.exptime = GNUNET_TIME_absolute_hton (et);
ass.fi = baseUri->data.chk;
- ass.peer = my_public_key;
+ ass.peer.public_key = my_public_key;
uri = GNUNET_new (struct GNUNET_FS_Uri);
uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = baseUri->data.chk;
uri->data.loc.expirationTime = et;
- uri->data.loc.peer = my_public_key;
+ uri->data.loc.peer.public_key = my_public_key;
GNUNET_assert (GNUNET_OK ==
GNUNET_CRYPTO_ecc_sign (my_private_key, &ass.purpose,
&uri->data.loc.contentSignature));
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index f5b5213bc1..a9e9503632 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -24,6 +24,7 @@
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_load_lib.h"
#include "gnunet-service-fs.h"
#include "gnunet-service-fs_cp.h"
@@ -307,7 +308,7 @@ struct GSF_ConnectedPeer
/**
* Map from peer identities to 'struct GSF_ConnectPeer' entries.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *cp_map;
+static struct GNUNET_CONTAINER_MultiPeerMap *cp_map;
/**
* Where do we store respect information?
@@ -325,11 +326,13 @@ static char *respectDirectory;
static char *
get_respect_filename (const struct GNUNET_PeerIdentity *id)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded fil;
char *fn;
- GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
- GNUNET_asprintf (&fn, "%s%s%s", respectDirectory, DIR_SEPARATOR_STR, &fil);
+ GNUNET_asprintf (&fn,
+ "%s%s%s",
+ respectDirectory,
+ DIR_SEPARATOR_STR,
+ GNUNET_i2s_full (id));
return fn;
}
@@ -594,12 +597,12 @@ GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer)
GNUNET_free (fn);
cp->request_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (cp_map,
- &GSF_connected_peer_get_identity2_ (cp)->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (cp_map,
+ GSF_connected_peer_get_identity2_ (cp),
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
- GNUNET_CONTAINER_multihashmap_size (cp_map),
+ GNUNET_CONTAINER_multipeermap_size (cp_map),
GNUNET_NO);
GSF_push_start_ (cp);
return cp;
@@ -643,7 +646,7 @@ GSF_peer_get_ (const struct GNUNET_PeerIdentity *peer)
{
if (NULL == cp_map)
return NULL;
- return GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey);
+ return GNUNET_CONTAINER_multipeermap_get (cp_map, peer);
}
@@ -1490,10 +1493,11 @@ GSF_peer_disconnect_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer)
return; /* must have been disconnect from core with
* 'peer' == my_id, ignore */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (cp_map,
- &peer->hashPubKey, cp));
+ GNUNET_CONTAINER_multipeermap_remove (cp_map,
+ peer,
+ cp));
GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
- GNUNET_CONTAINER_multihashmap_size (cp_map),
+ GNUNET_CONTAINER_multipeermap_size (cp_map),
GNUNET_NO);
if (NULL != cp->migration_pth)
{
@@ -1579,7 +1583,7 @@ struct IterationContext
* @return #GNUNET_YES to continue iteration
*/
static int
-call_iterator (void *cls, const struct GNUNET_HashCode * key, void *value)
+call_iterator (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct IterationContext *ic = cls;
struct GSF_ConnectedPeer *cp = value;
@@ -1602,7 +1606,7 @@ GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it, void *it_cls)
ic.it = it;
ic.it_cls = it_cls;
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &call_iterator, &ic);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &call_iterator, &ic);
}
@@ -1709,7 +1713,7 @@ GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp,
* @return GNUNET_OK to continue iteration
*/
static int
-flush_respect (void *cls, const struct GNUNET_HashCode * key, void *value)
+flush_respect (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct GSF_ConnectedPeer *cp = value;
char *fn;
@@ -1772,7 +1776,7 @@ cron_flush_respect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
if (NULL == cp_map)
return;
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &flush_respect, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &flush_respect, NULL);
if (NULL == tc)
return;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
@@ -1789,7 +1793,7 @@ cron_flush_respect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
void
GSF_connected_peer_init_ ()
{
- cp_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_YES);
+ cp_map = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_filename (GSF_cfg, "fs",
"RESPECT",
@@ -1809,9 +1813,11 @@ GSF_connected_peer_init_ ()
* @return #GNUNET_YES (we should continue to iterate)
*/
static int
-clean_peer (void *cls, const struct GNUNET_HashCode * key, void *value)
+clean_peer (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- GSF_peer_disconnect_handler_ (NULL, (const struct GNUNET_PeerIdentity *) key);
+ GSF_peer_disconnect_handler_ (NULL, key);
return GNUNET_YES;
}
@@ -1823,8 +1829,8 @@ void
GSF_connected_peer_done_ ()
{
cron_flush_respect (NULL, NULL);
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &clean_peer, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (cp_map);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_peer, NULL);
+ GNUNET_CONTAINER_multipeermap_destroy (cp_map);
cp_map = NULL;
GNUNET_free (respectDirectory);
respectDirectory = NULL;
@@ -1840,7 +1846,9 @@ GSF_connected_peer_done_ ()
* @return #GNUNET_YES (we should continue to iterate)
*/
static int
-clean_local_client (void *cls, const struct GNUNET_HashCode * key, void *value)
+clean_local_client (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
const struct GSF_LocalClient *lc = cls;
struct GSF_ConnectedPeer *cp = value;
@@ -1864,7 +1872,7 @@ GSF_handle_local_client_disconnect_ (const struct GSF_LocalClient *lc)
{
if (NULL == cp_map)
return; /* already cleaned up */
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &clean_local_client,
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_local_client,
(void *) lc);
}
diff --git a/src/fs/gnunet-service-fs_mesh_client.c b/src/fs/gnunet-service-fs_mesh_client.c
index d315098578..ffc3c61794 100644
--- a/src/fs/gnunet-service-fs_mesh_client.c
+++ b/src/fs/gnunet-service-fs_mesh_client.c
@@ -161,7 +161,7 @@ static struct GNUNET_MESH_Handle *mesh_handle;
* Map from peer identities to 'struct MeshHandles' with mesh
* tunnels to those peers.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *mesh_map;
+static struct GNUNET_CONTAINER_MultiPeerMap *mesh_map;
/* ********************* client-side code ************************* */
@@ -504,8 +504,8 @@ get_mesh (const struct GNUNET_PeerIdentity *target)
{
struct MeshHandle *mh;
- mh = GNUNET_CONTAINER_multihashmap_get (mesh_map,
- &target->hashPubKey);
+ mh = GNUNET_CONTAINER_multipeermap_get (mesh_map,
+ target);
if (NULL != mh)
{
if (GNUNET_SCHEDULER_NO_TASK != mh->timeout_task)
@@ -531,8 +531,8 @@ get_mesh (const struct GNUNET_PeerIdentity *target)
GNUNET_NO,
GNUNET_YES);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (mesh_map,
- &mh->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (mesh_map,
+ &mh->target,
mh,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return mh;
@@ -669,8 +669,8 @@ cleaner_cb (void *cls,
if (GNUNET_SCHEDULER_NO_TASK != mh->reset_task)
GNUNET_SCHEDULER_cancel (mh->reset_task);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_remove (mesh_map,
- &mh->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (mesh_map,
+ &mh->target,
mh));
GNUNET_CONTAINER_multihashmap_destroy (mh->waiting_map);
GNUNET_free (mh);
@@ -688,7 +688,7 @@ GSF_mesh_start_client ()
{ NULL, 0, 0 }
};
- mesh_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_YES);
+ mesh_map = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
mesh_handle = GNUNET_MESH_connect (GSF_cfg,
NULL,
NULL,
@@ -708,7 +708,7 @@ GSF_mesh_start_client ()
*/
static int
release_meshs (void *cls,
- const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct MeshHandle *mh = value;
@@ -731,10 +731,10 @@ release_meshs (void *cls,
void
GSF_mesh_stop_client ()
{
- GNUNET_CONTAINER_multihashmap_iterate (mesh_map,
+ GNUNET_CONTAINER_multipeermap_iterate (mesh_map,
&release_meshs,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (mesh_map);
+ GNUNET_CONTAINER_multipeermap_destroy (mesh_map);
mesh_map = NULL;
if (NULL != mesh_handle)
{
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index 21f028a2dc..9e92be2edb 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -203,7 +203,7 @@ struct PeerPlan
/**
* Hash map from peer identities to PeerPlans.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *plans;
+static struct GNUNET_CONTAINER_MultiPeerMap *plans;
/**
* Sum of all transmission counters (equals total delay for all plan entries).
@@ -584,7 +584,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
GNUNET_assert (NULL != cp);
id = GSF_connected_peer_get_identity2_ (cp);
- pp = GNUNET_CONTAINER_multihashmap_get (plans, &id->hashPubKey);
+ pp = GNUNET_CONTAINER_multipeermap_get (plans, id);
if (NULL == pp)
{
pp = GNUNET_new (struct PeerPlan);
@@ -594,8 +594,8 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
pp->delay_heap =
GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
pp->cp = cp;
- GNUNET_CONTAINER_multihashmap_put (plans,
- &id->hashPubKey, pp,
+ GNUNET_CONTAINER_multipeermap_put (plans,
+ id, pp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
mpc.merged = GNUNET_NO;
@@ -648,11 +648,11 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
struct GSF_PendingRequestPlanBijection *bi;
id = GSF_connected_peer_get_identity2_ (cp);
- pp = GNUNET_CONTAINER_multihashmap_get (plans, &id->hashPubKey);
+ pp = GNUNET_CONTAINER_multipeermap_get (plans, id);
if (NULL == pp)
return; /* nothing was ever planned for this peer */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (plans, &id->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (plans, id,
pp));
if (NULL != pp->pth)
{
@@ -777,7 +777,7 @@ GSF_plan_notify_request_done_ (struct GSF_PendingRequest *pr)
void
GSF_plan_init ()
{
- plans = GNUNET_CONTAINER_multihashmap_create (256, GNUNET_YES);
+ plans = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_YES);
}
@@ -787,8 +787,8 @@ GSF_plan_init ()
void
GSF_plan_done ()
{
- GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (plans));
- GNUNET_CONTAINER_multihashmap_destroy (plans);
+ GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (plans));
+ GNUNET_CONTAINER_multipeermap_destroy (plans);
}
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 627d376eff..b624f536ce 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -24,6 +24,7 @@
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_load_lib.h"
#include "gnunet-service-fs.h"
#include "gnunet-service-fs_cp.h"
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index 70c13f49fb..c80dc8b085 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -329,6 +329,7 @@ score_content (struct MigrationReadyPeer *peer,
unsigned int i;
struct GSF_PeerPerformanceData *ppd;
struct GNUNET_PeerIdentity id;
+ struct GNUNET_HashCode hc;
uint32_t dist;
ppd = GSF_get_peer_performance_data_ (peer->peer);
@@ -337,7 +338,8 @@ score_content (struct MigrationReadyPeer *peer,
return -1;
GNUNET_assert (0 != ppd->pid);
GNUNET_PEER_resolve (ppd->pid, &id);
- dist = GNUNET_CRYPTO_hash_distance_u32 (&block->query, &id.hashPubKey);
+ GNUNET_CRYPTO_hash (&id, sizeof (struct GNUNET_PeerIdentity), &hc);
+ dist = GNUNET_CRYPTO_hash_distance_u32 (&block->query, &hc);
/* closer distance, higher score: */
return UINT32_MAX - dist;
}
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index 16c3c80e91..d9a43ff8b3 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -23,10 +23,9 @@
* @brief API to access the DNS service.
* @author Christian Grothoff
*/
-#ifndef GNUNET_DNS_SERVICE_NEW_H
-#define GNUNET_DNS_SERVICE_NEW_H
+#ifndef GNUNET_DNS_SERVICE_H
+#define GNUNET_DNS_SERVICE_H
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
diff --git a/src/lockmanager/gnunet-service-lockmanager.c b/src/lockmanager/gnunet-service-lockmanager.c
index 0819ebad46..fde32ed60a 100644
--- a/src/lockmanager/gnunet-service-lockmanager.c
+++ b/src/lockmanager/gnunet-service-lockmanager.c
@@ -25,11 +25,8 @@
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_server_lib.h"
#include "lockmanager.h"
diff --git a/src/lockmanager/lockmanager_api.c b/src/lockmanager/lockmanager_api.c
index 52617863ed..8f66cf00bf 100644
--- a/src/lockmanager/lockmanager_api.c
+++ b/src/lockmanager/lockmanager_api.c
@@ -26,10 +26,7 @@
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
#include "gnunet_protocols.h"
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index b6ef113ebb..63b743ec4e 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -28,10 +28,9 @@
#define GNUNET_SERVICE_SET_H_PRIVATE
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_applications.h"
-#include "gnunet_util_lib.h"
#include "gnunet_core_service.h"
#include "gnunet_mesh_service.h"
#include "gnunet_set_service.h"
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 7e7bddf792..b70436635a 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -23,11 +23,9 @@
* @brief two-peer set operations
* @author Florian Dold
*/
-
-
+#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet-service-set.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
#include "ibf.h"
#include "strata_estimator.h"
#include "set_protocol.h"
diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c
index 92feb3db4d..c3a16d1651 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -24,10 +24,7 @@
* @author Florian Dold
*/
-
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
#include "gnunet_util_lib.h"
#include "ibf.h"
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index f19776f79a..18bea8d7c9 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -24,7 +24,6 @@
* @author Florian Dold
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_set_service.h"
#include "gnunet_testbed_service.h"
diff --git a/src/set/ibf.h b/src/set/ibf.h
index c5a979bfed..a020c713f7 100644
--- a/src/set/ibf.h
+++ b/src/set/ibf.h
@@ -28,7 +28,6 @@
#define GNUNET_CONSENSUS_IBF_H
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#ifdef __cplusplus
diff --git a/src/set/strata_estimator.c b/src/set/strata_estimator.c
index a775b1fa25..0f92ea4d98 100644
--- a/src/set/strata_estimator.c
+++ b/src/set/strata_estimator.c
@@ -25,7 +25,7 @@
*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "ibf.h"
#include "strata_estimator.h"
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-22 08:33:34 +0000