-getting core, nse, testbed, ats-tool and peerinfo-tool to compile again (part of #3047)

5 files changed, 11 insertions, 12 deletions

diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c
index 264397735..d14944362 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -56,7 +56,7 @@
 /**
  * The map to store the peer identities to allow/deny
  */
-static struct GNUNET_CONTAINER_MultiHashMap *map;
+static struct GNUNET_CONTAINER_MultiPeerMap *map;
 
 /**
  * The array of peer identities we read from whitelist/blacklist
@@ -92,9 +92,9 @@ static int mode;
  *         #GNUNET_NO if not.
  */
 static int
-iterator (void *cls, const struct GNUNET_HashCode *key, void *value)
+iterator (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
 {
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (map, key,
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (map, key,
                                                                      value));
   return GNUNET_YES;
 }
@@ -108,10 +108,10 @@ cleanup_map ()
 {
   if (NULL != map)
   {
-    GNUNET_assert (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_iterate (map,
+    GNUNET_assert (GNUNET_SYSERR != GNUNET_CONTAINER_multipeermap_iterate (map,
                                                                            &iterator,
                                                                            NULL));
-    GNUNET_CONTAINER_multihashmap_destroy (map);
+    GNUNET_CONTAINER_multipeermap_destroy (map);
     map = NULL;
   }
 }
@@ -145,7 +145,7 @@ check_access (void *cls, const struct GNUNET_PeerIdentity * pid)
   int contains;
  
   if (NULL != map)
-    contains = GNUNET_CONTAINER_multihashmap_contains (map, &(pid->hashPubKey));
+    contains = GNUNET_CONTAINER_multipeermap_contains (map, pid);
   else
     contains = GNUNET_NO;
   if (ACCESS_DENY == mode)
@@ -178,13 +178,13 @@ setup_ac (const char *fname, const struct GNUNET_CONFIGURATION_Handle *cfg)
   npeers = fsize / sizeof (struct GNUNET_PeerIdentity);
   if (0 != npeers)
   {
-    map = GNUNET_CONTAINER_multihashmap_create (npeers, GNUNET_YES);
+    map = GNUNET_CONTAINER_multipeermap_create (npeers, GNUNET_YES);
     ilist = GNUNET_malloc_large (fsize);
     GNUNET_assert (fsize == GNUNET_DISK_fn_read (fname, ilist, fsize));
   }
   for (cnt = 0; cnt < npeers; cnt++)
   {
-    if (GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put (map, &(ilist[cnt].hashPubKey),
+    if (GNUNET_SYSERR == GNUNET_CONTAINER_multipeermap_put (map, &ilist[cnt],
                                                             &ilist[cnt],
                                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
     {
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c
index a875050ac..3914a324d 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -19,7 +19,7 @@
 */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 
 /*
  * File for parsing top-level /proc entities.
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 0b36fed9f..8d85280fe 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -25,7 +25,6 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api_hosts.h"
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index e6330ea89..f781eea0d 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -657,7 +657,7 @@ struct GNUNET_TESTBED_PeerConfigurationInformationMessage
   /**
    * Identity of the peer.
    */
-  struct GNUNET_PeerIdentity peer_identity GNUNET_PACKED;
+  struct GNUNET_PeerIdentity peer_identity;
 
   /**
    * The size of configuration when uncompressed
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index f09bb61b9..3b6678c56 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -27,7 +27,7 @@
 #ifndef TESTBED_API_H
 #define TESTBED_API_H
 
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed.h"
 #include "testbed_helper.h"