/*
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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
/**
* @file ats/gnunet-service-ats_reservations.c
* @brief ats service, inbound bandwidth reservation management
/**
* 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_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
* 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);
}
}
(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;
}
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);
}
struct ReservationResultMessage result;
int32_t amount;
struct GNUNET_TIME_Relative res_delay;
+ struct GNUNET_SERVER_NotificationContext **uc;
+ struct GNUNET_SERVER_NotificationContext *nc;
- GNUNET_SERVER_notification_context_add (nc,
- client);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received RESERVATION_REQUEST message\n");
+ uc = GNUNET_SERVER_client_get_user_context (client,
+ struct GNUNET_SERVER_NotificationContext *);
+ if (NULL == uc)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ nc = *uc;
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));
"# reservation requests processed",
1,
GNUNET_NO);
+
GNUNET_SERVER_notification_context_unicast (nc,
client,
&result.header,
void
GAS_reservations_init (struct GNUNET_SERVER_Handle *server)
{
- trackers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
- nc = GNUNET_SERVER_notification_context_create (server, 128);
+ trackers = GNUNET_CONTAINER_multipeermap_create (128,
+ GNUNET_NO);
}
&free_tracker,
NULL);
GNUNET_CONTAINER_multipeermap_destroy (trackers);
- GNUNET_SERVER_notification_context_destroy (nc);
- nc = NULL;
-
}
/* end of gnunet-service-ats_reservations.c */