diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-30 22:02:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-30 22:02:55 +0000 |
commit | 73fd8b4cdab17f46f08eaaf403697584b43c8d19 (patch) | |
tree | 8d28f87e3d944c10a3ffe8fe555af219b5e4c077 /src/revocation | |
parent | 7abf844d0d4de319f2b093d50b0334af9a9d3bda (diff) | |
download | gnunet-73fd8b4cdab17f46f08eaaf403697584b43c8d19.tar.gz gnunet-73fd8b4cdab17f46f08eaaf403697584b43c8d19.zip |
-fix FTBFS
Diffstat (limited to 'src/revocation')
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 8ab8f8ae1..f310429d3 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -99,7 +99,7 @@ static struct GNUNET_CORE_Handle *coreAPI; | |||
99 | /** | 99 | /** |
100 | * Map of all connected peers. | 100 | * Map of all connected peers. |
101 | */ | 101 | */ |
102 | static struct GNUNET_CONTAINER_MultiHashMap *peers; | 102 | static struct GNUNET_CONTAINER_MultiPeerMap *peers; |
103 | 103 | ||
104 | /** | 104 | /** |
105 | * The peer identity of this peer. | 105 | * The peer identity of this peer. |
@@ -227,7 +227,7 @@ handle_p2p_revoke_message (void *cls, | |||
227 | 227 | ||
228 | #if 0 | 228 | #if 0 |
229 | /* flood to rest */ | 229 | /* flood to rest */ |
230 | GNUNET_CONTAINER_multihashmap_iterate (peers, | 230 | GNUNET_CONTAINER_multipeermap_iterate (peers, |
231 | &do_flood, | 231 | &do_flood, |
232 | &ctx); | 232 | &ctx); |
233 | #endif | 233 | #endif |
@@ -253,7 +253,7 @@ handle_core_connect (void *cls, | |||
253 | peer_entry = GNUNET_new (struct PeerEntry); | 253 | peer_entry = GNUNET_new (struct PeerEntry); |
254 | peer_entry->id = *peer; | 254 | peer_entry->id = *peer; |
255 | GNUNET_assert (GNUNET_OK == | 255 | GNUNET_assert (GNUNET_OK == |
256 | GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, | 256 | GNUNET_CONTAINER_multipeermap_put (peers, peer, |
257 | peer_entry, | 257 | peer_entry, |
258 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 258 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
259 | #if 0 | 259 | #if 0 |
@@ -281,14 +281,14 @@ handle_core_disconnect (void *cls, | |||
281 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 281 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
282 | "Peer `%s' disconnected from us\n", | 282 | "Peer `%s' disconnected from us\n", |
283 | GNUNET_i2s (peer)); | 283 | GNUNET_i2s (peer)); |
284 | pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); | 284 | pos = GNUNET_CONTAINER_multipeermap_get (peers, peer); |
285 | if (NULL == pos) | 285 | if (NULL == pos) |
286 | { | 286 | { |
287 | GNUNET_break (0); | 287 | GNUNET_break (0); |
288 | return; | 288 | return; |
289 | } | 289 | } |
290 | GNUNET_assert (GNUNET_YES == | 290 | GNUNET_assert (GNUNET_YES == |
291 | GNUNET_CONTAINER_multihashmap_remove (peers, &peer->hashPubKey, | 291 | GNUNET_CONTAINER_multipeermap_remove (peers, peer, |
292 | pos)); | 292 | pos)); |
293 | #if 0 | 293 | #if 0 |
294 | if (pos->transmit_task != GNUNET_SCHEDULER_NO_TASK) | 294 | if (pos->transmit_task != GNUNET_SCHEDULER_NO_TASK) |
@@ -334,7 +334,7 @@ shutdown_task (void *cls, | |||
334 | } | 334 | } |
335 | if (NULL != peers) | 335 | if (NULL != peers) |
336 | { | 336 | { |
337 | GNUNET_CONTAINER_multihashmap_destroy (peers); | 337 | GNUNET_CONTAINER_multipeermap_destroy (peers); |
338 | peers = NULL; | 338 | peers = NULL; |
339 | } | 339 | } |
340 | } | 340 | } |
@@ -411,7 +411,7 @@ run (void *cls, | |||
411 | GNUNET_SET_OPERATION_UNION); | 411 | GNUNET_SET_OPERATION_UNION); |
412 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | 412 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
413 | NULL); | 413 | NULL); |
414 | peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); | 414 | peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO); |
415 | GNUNET_SERVER_add_handlers (srv, handlers); | 415 | GNUNET_SERVER_add_handlers (srv, handlers); |
416 | /* Connect to core service and register core handlers */ | 416 | /* Connect to core service and register core handlers */ |
417 | coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */ | 417 | coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */ |