diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-30 21:03:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-30 21:03:31 +0000 |
commit | 6d5b099541c60303b664547f18f4aaa864e33d68 (patch) | |
tree | 3169f571d3f66ec23ab540d17c012f00103688f2 /src/testbed | |
parent | a0ba5b741b56036bd35bd9ba88164324b2ff7ada (diff) | |
download | gnunet-6d5b099541c60303b664547f18f4aaa864e33d68.tar.gz gnunet-6d5b099541c60303b664547f18f4aaa864e33d68.zip |
-getting core, nse, testbed, ats-tool and peerinfo-tool to compile again (part of #3047)
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/gnunet-daemon-testbed-blacklist.c | 16 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_meminfo.c | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-testbed-profiler.c | 1 | ||||
-rw-r--r-- | src/testbed/testbed.h | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api.h | 2 |
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 @@ | |||
56 | /** | 56 | /** |
57 | * The map to store the peer identities to allow/deny | 57 | * The map to store the peer identities to allow/deny |
58 | */ | 58 | */ |
59 | static struct GNUNET_CONTAINER_MultiHashMap *map; | 59 | static struct GNUNET_CONTAINER_MultiPeerMap *map; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * The array of peer identities we read from whitelist/blacklist | 62 | * The array of peer identities we read from whitelist/blacklist |
@@ -92,9 +92,9 @@ static int mode; | |||
92 | * #GNUNET_NO if not. | 92 | * #GNUNET_NO if not. |
93 | */ | 93 | */ |
94 | static int | 94 | static int |
95 | iterator (void *cls, const struct GNUNET_HashCode *key, void *value) | 95 | iterator (void *cls, const struct GNUNET_PeerIdentity *key, void *value) |
96 | { | 96 | { |
97 | GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (map, key, | 97 | GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (map, key, |
98 | value)); | 98 | value)); |
99 | return GNUNET_YES; | 99 | return GNUNET_YES; |
100 | } | 100 | } |
@@ -108,10 +108,10 @@ cleanup_map () | |||
108 | { | 108 | { |
109 | if (NULL != map) | 109 | if (NULL != map) |
110 | { | 110 | { |
111 | GNUNET_assert (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_iterate (map, | 111 | GNUNET_assert (GNUNET_SYSERR != GNUNET_CONTAINER_multipeermap_iterate (map, |
112 | &iterator, | 112 | &iterator, |
113 | NULL)); | 113 | NULL)); |
114 | GNUNET_CONTAINER_multihashmap_destroy (map); | 114 | GNUNET_CONTAINER_multipeermap_destroy (map); |
115 | map = NULL; | 115 | map = NULL; |
116 | } | 116 | } |
117 | } | 117 | } |
@@ -145,7 +145,7 @@ check_access (void *cls, const struct GNUNET_PeerIdentity * pid) | |||
145 | int contains; | 145 | int contains; |
146 | 146 | ||
147 | if (NULL != map) | 147 | if (NULL != map) |
148 | contains = GNUNET_CONTAINER_multihashmap_contains (map, &(pid->hashPubKey)); | 148 | contains = GNUNET_CONTAINER_multipeermap_contains (map, pid); |
149 | else | 149 | else |
150 | contains = GNUNET_NO; | 150 | contains = GNUNET_NO; |
151 | if (ACCESS_DENY == mode) | 151 | if (ACCESS_DENY == mode) |
@@ -178,13 +178,13 @@ setup_ac (const char *fname, const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
178 | npeers = fsize / sizeof (struct GNUNET_PeerIdentity); | 178 | npeers = fsize / sizeof (struct GNUNET_PeerIdentity); |
179 | if (0 != npeers) | 179 | if (0 != npeers) |
180 | { | 180 | { |
181 | map = GNUNET_CONTAINER_multihashmap_create (npeers, GNUNET_YES); | 181 | map = GNUNET_CONTAINER_multipeermap_create (npeers, GNUNET_YES); |
182 | ilist = GNUNET_malloc_large (fsize); | 182 | ilist = GNUNET_malloc_large (fsize); |
183 | GNUNET_assert (fsize == GNUNET_DISK_fn_read (fname, ilist, fsize)); | 183 | GNUNET_assert (fsize == GNUNET_DISK_fn_read (fname, ilist, fsize)); |
184 | } | 184 | } |
185 | for (cnt = 0; cnt < npeers; cnt++) | 185 | for (cnt = 0; cnt < npeers; cnt++) |
186 | { | 186 | { |
187 | if (GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put (map, &(ilist[cnt].hashPubKey), | 187 | if (GNUNET_SYSERR == GNUNET_CONTAINER_multipeermap_put (map, &ilist[cnt], |
188 | &ilist[cnt], | 188 | &ilist[cnt], |
189 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) | 189 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) |
190 | { | 190 | { |
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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "platform.h" | 21 | #include "platform.h" |
22 | #include "gnunet_common.h" | 22 | #include "gnunet_util_lib.h" |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * File for parsing top-level /proc entities. | 25 | * 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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_common.h" | ||
29 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_testbed_service.h" | 29 | #include "gnunet_testbed_service.h" |
31 | #include "testbed_api_hosts.h" | 30 | #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 | |||
657 | /** | 657 | /** |
658 | * Identity of the peer. | 658 | * Identity of the peer. |
659 | */ | 659 | */ |
660 | struct GNUNET_PeerIdentity peer_identity GNUNET_PACKED; | 660 | struct GNUNET_PeerIdentity peer_identity; |
661 | 661 | ||
662 | /** | 662 | /** |
663 | * The size of configuration when uncompressed | 663 | * 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 @@ | |||
27 | #ifndef TESTBED_API_H | 27 | #ifndef TESTBED_API_H |
28 | #define TESTBED_API_H | 28 | #define TESTBED_API_H |
29 | 29 | ||
30 | #include "gnunet_scheduler_lib.h" | 30 | #include "gnunet_util_lib.h" |
31 | #include "gnunet_testbed_service.h" | 31 | #include "gnunet_testbed_service.h" |
32 | #include "testbed.h" | 32 | #include "testbed.h" |
33 | #include "testbed_helper.h" | 33 | #include "testbed_helper.h" |