X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_reservations.c;h=a272170b706cfe20550a89571bb1189bbe643545;hb=e871f8368c8a1f0867f68f656875e4c37c26f298;hp=2f3c1f5f1f37e2482e82f16d9bdca40c8b74da19;hpb=52ae7e53f6b8dfd26612e4e9f0830918fd1ee312;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 2f3c1f5f1..a272170b7 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -1,21 +1,19 @@ /* 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 @@ -29,7 +27,8 @@ /** * 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 @@ -39,11 +38,6 @@ */ static struct GNUNET_CONTAINER_MultiPeerMap *trackers; -/** - * Context for sending messages to performance clients without PIC. - */ -static struct GNUNET_SERVER_NotificationContext *nc; - /** * Reserve the given amount of incoming bandwidth (in bytes) from the @@ -56,16 +50,22 @@ static struct GNUNET_SERVER_NotificationContext *nc; * 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_multipeermap_get (trackers, peer); + 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); @@ -80,7 +80,9 @@ GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer, } } (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; } @@ -114,71 +116,66 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer, if (NULL == tracker) { tracker = GNUNET_new (struct GNUNET_BANDWIDTH_Tracker); - GNUNET_BANDWIDTH_tracker_init (tracker, NULL, NULL, bandwidth_in, + GNUNET_BANDWIDTH_tracker_init (tracker, + NULL, + NULL, + bandwidth_in, MAX_BANDWIDTH_CARRY_S); GNUNET_assert (GNUNET_OK == - GNUNET_CONTAINER_multipeermap_put (trackers, peer, tracker, + 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 cls unused, NULL * @param client client that sent the request - * @param message the request message + * @param msg the request message */ void -GAS_handle_reservation_request (void *cls, - struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +GAS_handle_reservation_request (struct GNUNET_SERVICE_Client *client, + const struct ReservationRequestMessage *msg) { - const struct ReservationRequestMessage *msg = - (const struct ReservationRequestMessage *) message; - struct ReservationResultMessage result; + struct GNUNET_MQ_Envelope *env; + struct ReservationResultMessage *result; int32_t amount; struct GNUNET_TIME_Relative res_delay; - GNUNET_SERVER_notification_context_add (nc, - client); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received RESERVATION_REQUEST message\n"); amount = (int32_t) ntohl (msg->amount); - res_delay = GAS_reservations_reserve (&msg->peer, amount); + res_delay = reservations_reserve (&msg->peer, amount); if (res_delay.rel_value_us > 0) amount = 0; - result.header.size = htons (sizeof (struct ReservationResultMessage)); - result.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT); - result.amount = htonl (amount); - result.peer = msg->peer; - result.res_delay = GNUNET_TIME_relative_hton (res_delay); + 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_SERVER_notification_context_unicast (nc, - client, - &result.header, - GNUNET_NO); - GNUNET_SERVER_receive_done (client, - GNUNET_OK); + GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), + env); } /** * Initialize reservations subsystem. - * - * @param server handle to our server */ void -GAS_reservations_init (struct GNUNET_SERVER_Handle *server) +GAS_reservations_init () { - trackers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO); - nc = GNUNET_SERVER_notification_context_create (server, 128); + trackers = GNUNET_CONTAINER_multipeermap_create (128, + GNUNET_NO); } @@ -192,7 +189,8 @@ GAS_reservations_init (struct GNUNET_SERVER_Handle *server) */ static int free_tracker (void *cls, - const struct GNUNET_PeerIdentity *key, void *value) + const struct GNUNET_PeerIdentity *key, + void *value) { struct GNUNET_BANDWIDTH_Tracker *tracker = value; @@ -211,9 +209,6 @@ GAS_reservations_done () &free_tracker, NULL); GNUNET_CONTAINER_multipeermap_destroy (trackers); - GNUNET_SERVER_notification_context_destroy (nc); - nc = NULL; - } /* end of gnunet-service-ats_reservations.c */