diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-30 22:01:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-30 22:01:13 +0000 |
commit | 7abf844d0d4de319f2b093d50b0334af9a9d3bda (patch) | |
tree | 212272d6aaf9e5530ce44418149b9158f1eb0f7c /src/fs/gnunet-service-fs_pe.c | |
parent | 8556fe9ebd0c4f8e63577a43155ffede20607f41 (diff) | |
download | gnunet-7abf844d0d4de319f2b093d50b0334af9a9d3bda.tar.gz gnunet-7abf844d0d4de319f2b093d50b0334af9a9d3bda.zip |
-fixing build issues in fs/set related to #3047
Diffstat (limited to 'src/fs/gnunet-service-fs_pe.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 21f028a2d..9e92be2ed 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -203,7 +203,7 @@ struct PeerPlan | |||
203 | /** | 203 | /** |
204 | * Hash map from peer identities to PeerPlans. | 204 | * Hash map from peer identities to PeerPlans. |
205 | */ | 205 | */ |
206 | static struct GNUNET_CONTAINER_MultiHashMap *plans; | 206 | static struct GNUNET_CONTAINER_MultiPeerMap *plans; |
207 | 207 | ||
208 | /** | 208 | /** |
209 | * Sum of all transmission counters (equals total delay for all plan entries). | 209 | * 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) | |||
584 | 584 | ||
585 | GNUNET_assert (NULL != cp); | 585 | GNUNET_assert (NULL != cp); |
586 | id = GSF_connected_peer_get_identity2_ (cp); | 586 | id = GSF_connected_peer_get_identity2_ (cp); |
587 | pp = GNUNET_CONTAINER_multihashmap_get (plans, &id->hashPubKey); | 587 | pp = GNUNET_CONTAINER_multipeermap_get (plans, id); |
588 | if (NULL == pp) | 588 | if (NULL == pp) |
589 | { | 589 | { |
590 | pp = GNUNET_new (struct PeerPlan); | 590 | pp = GNUNET_new (struct PeerPlan); |
@@ -594,8 +594,8 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr) | |||
594 | pp->delay_heap = | 594 | pp->delay_heap = |
595 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 595 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
596 | pp->cp = cp; | 596 | pp->cp = cp; |
597 | GNUNET_CONTAINER_multihashmap_put (plans, | 597 | GNUNET_CONTAINER_multipeermap_put (plans, |
598 | &id->hashPubKey, pp, | 598 | id, pp, |
599 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 599 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); |
600 | } | 600 | } |
601 | mpc.merged = GNUNET_NO; | 601 | mpc.merged = GNUNET_NO; |
@@ -648,11 +648,11 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp) | |||
648 | struct GSF_PendingRequestPlanBijection *bi; | 648 | struct GSF_PendingRequestPlanBijection *bi; |
649 | 649 | ||
650 | id = GSF_connected_peer_get_identity2_ (cp); | 650 | id = GSF_connected_peer_get_identity2_ (cp); |
651 | pp = GNUNET_CONTAINER_multihashmap_get (plans, &id->hashPubKey); | 651 | pp = GNUNET_CONTAINER_multipeermap_get (plans, id); |
652 | if (NULL == pp) | 652 | if (NULL == pp) |
653 | return; /* nothing was ever planned for this peer */ | 653 | return; /* nothing was ever planned for this peer */ |
654 | GNUNET_assert (GNUNET_YES == | 654 | GNUNET_assert (GNUNET_YES == |
655 | GNUNET_CONTAINER_multihashmap_remove (plans, &id->hashPubKey, | 655 | GNUNET_CONTAINER_multipeermap_remove (plans, id, |
656 | pp)); | 656 | pp)); |
657 | if (NULL != pp->pth) | 657 | if (NULL != pp->pth) |
658 | { | 658 | { |
@@ -777,7 +777,7 @@ GSF_plan_notify_request_done_ (struct GSF_PendingRequest *pr) | |||
777 | void | 777 | void |
778 | GSF_plan_init () | 778 | GSF_plan_init () |
779 | { | 779 | { |
780 | plans = GNUNET_CONTAINER_multihashmap_create (256, GNUNET_YES); | 780 | plans = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_YES); |
781 | } | 781 | } |
782 | 782 | ||
783 | 783 | ||
@@ -787,8 +787,8 @@ GSF_plan_init () | |||
787 | void | 787 | void |
788 | GSF_plan_done () | 788 | GSF_plan_done () |
789 | { | 789 | { |
790 | GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (plans)); | 790 | GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (plans)); |
791 | GNUNET_CONTAINER_multihashmap_destroy (plans); | 791 | GNUNET_CONTAINER_multipeermap_destroy (plans); |
792 | } | 792 | } |
793 | 793 | ||
794 | 794 | ||