X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_reservations.c;h=a272170b706cfe20550a89571bb1189bbe643545;hb=e871f8368c8a1f0867f68f656875e4c37c26f298;hp=3354c4e415292d599e439eee81eefa70d4cb07a9;hpb=a60b958f984d08525b636a2c7eae564ebec54ae6;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 3354c4e41..a272170b7 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -1,23 +1,20 @@ /* This file is part of GNUnet. - (C) 2011 Christian Grothoff (and other contributing authors) + Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ - /** * @file ats/gnunet-service-ats_reservations.c * @brief ats service, inbound bandwidth reservation management @@ -25,18 +22,21 @@ */ #include "platform.h" #include "gnunet-service-ats_reservations.h" +#include "gnunet-service-ats.h" +#include "ats.h" /** * Number of seconds that available bandwidth carries over - * (can accumulate). + * (can accumulate). Note that the + * test_ats_reservation_api test depends on this value! */ #define MAX_BANDWIDTH_CARRY_S 5 /** - * Map of peer identities to 'struct GNUNET_BANDWIDTH_Tracker *'s + * Map of peer identities to `struct GNUNET_BANDWIDTH_Tracker *`s */ -static struct GNUNET_CONTAINER_MultiHashMap *trackers; +static struct GNUNET_CONTAINER_MultiPeerMap *trackers; /** @@ -50,29 +50,39 @@ static struct GNUNET_CONTAINER_MultiHashMap *trackers; * peer is not connected, otherwise the time to wait * until the reservation might succeed */ -struct GNUNET_TIME_Relative -GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer, - int32_t amount) +static struct GNUNET_TIME_Relative +reservations_reserve (const struct GNUNET_PeerIdentity *peer, + int32_t amount) { struct GNUNET_BANDWIDTH_Tracker *tracker; struct GNUNET_TIME_Relative ret; - tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey); + tracker = GNUNET_CONTAINER_multipeermap_get (trackers, + peer); if (NULL == tracker) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Not connected, allowing reservation of %d bytes\n", + (int) amount); return GNUNET_TIME_UNIT_ZERO; /* not connected, satisfy now */ + } if (amount >= 0) { ret = GNUNET_BANDWIDTH_tracker_get_delay (tracker, amount); - if (ret.rel_value > 0) + if (ret.rel_value_us > 0) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Delay to satisfy reservation for %d bytes is %llu ms\n", - (int) amount, (unsigned long long) ret.rel_value); + "Delay to satisfy reservation for %d bytes is %s\n", + (int) amount, + GNUNET_STRINGS_relative_time_to_string (ret, + GNUNET_YES)); return ret; } } (void) GNUNET_BANDWIDTH_tracker_consume (tracker, amount); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reserved %d bytes\n", (int) amount); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Reserved %d bytes\n", + (int) amount); return GNUNET_TIME_UNIT_ZERO; } @@ -91,28 +101,70 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer, { struct GNUNET_BANDWIDTH_Tracker *tracker; - tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey); + tracker = GNUNET_CONTAINER_multipeermap_get (trackers, peer); if (0 == ntohl (bandwidth_in.value__)) { if (NULL == tracker) return; GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (trackers, - &peer->hashPubKey, + GNUNET_CONTAINER_multipeermap_remove (trackers, + peer, tracker)); GNUNET_free (tracker); return; } if (NULL == tracker) { - tracker = GNUNET_malloc (sizeof (struct GNUNET_BANDWIDTH_Tracker)); - GNUNET_BANDWIDTH_tracker_init (tracker, bandwidth_in, + tracker = GNUNET_new (struct GNUNET_BANDWIDTH_Tracker); + GNUNET_BANDWIDTH_tracker_init (tracker, + NULL, + NULL, + bandwidth_in, MAX_BANDWIDTH_CARRY_S); - GNUNET_CONTAINER_multihashmap_put (trackers, &peer->hashPubKey, tracker, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (trackers, + peer, + tracker, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); return; } - GNUNET_BANDWIDTH_tracker_update_quota (tracker, bandwidth_in); + GNUNET_BANDWIDTH_tracker_update_quota (tracker, + bandwidth_in); +} + + +/** + * Handle 'reservation request' messages from clients. + * + * @param client client that sent the request + * @param msg the request message + */ +void +GAS_handle_reservation_request (struct GNUNET_SERVICE_Client *client, + const struct ReservationRequestMessage *msg) +{ + struct GNUNET_MQ_Envelope *env; + struct ReservationResultMessage *result; + int32_t amount; + struct GNUNET_TIME_Relative res_delay; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received RESERVATION_REQUEST message\n"); + amount = (int32_t) ntohl (msg->amount); + res_delay = reservations_reserve (&msg->peer, amount); + if (res_delay.rel_value_us > 0) + amount = 0; + env = GNUNET_MQ_msg (result, + GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT); + result->amount = htonl (amount); + result->peer = msg->peer; + result->res_delay = GNUNET_TIME_relative_hton (res_delay); + GNUNET_STATISTICS_update (GSA_stats, + "# reservation requests processed", + 1, + GNUNET_NO); + GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), + env); } @@ -122,7 +174,8 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer, void GAS_reservations_init () { - trackers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); + trackers = GNUNET_CONTAINER_multipeermap_create (128, + GNUNET_NO); } @@ -131,11 +184,13 @@ GAS_reservations_init () * * @param cls NULL * @param key peer identity (unused) - * @param value the 'struct GNUNET_BANDWIDTH_Tracker' to free - * @return GNUNET_OK (continue to iterate) + * @param value the `struct GNUNET_BANDWIDTH_Tracker` to free + * @return #GNUNET_OK (continue to iterate) */ static int -free_tracker (void *cls, const struct GNUNET_HashCode * key, void *value) +free_tracker (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { struct GNUNET_BANDWIDTH_Tracker *tracker = value; @@ -150,8 +205,10 @@ free_tracker (void *cls, const struct GNUNET_HashCode * key, void *value) void GAS_reservations_done () { - GNUNET_CONTAINER_multihashmap_iterate (trackers, &free_tracker, NULL); - GNUNET_CONTAINER_multihashmap_destroy (trackers); + GNUNET_CONTAINER_multipeermap_iterate (trackers, + &free_tracker, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (trackers); } /* end of gnunet-service-ats_reservations.c */