-skeletons for transport-ng

[oweals/gnunet.git] / src / ats / gnunet-service-ats_reservations.c

diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index b7e1984e57239a9f95181e320eee46d4b6b6abf5..97098c8192597c21335d2f121c40a39f49a7dd89 100644 (file)
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -1,6 +1,6 @@
 /*
      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
@@ -14,8 +14,8 @@
 
      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
@@ -29,7 +29,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
 
@@ -51,16 +52,22 @@ static struct GNUNET_CONTAINER_MultiPeerMap *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_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);
@@ -75,7 +82,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;
 }
 
@@ -109,14 +118,20 @@ 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);
 }
 
 
@@ -137,19 +152,21 @@ GAS_handle_reservation_request (void *cls,
   struct ReservationResultMessage result;
   int32_t amount;
   struct GNUNET_TIME_Relative res_delay;
+  struct GNUNET_SERVER_NotificationContext **uc;
   struct GNUNET_SERVER_NotificationContext *nc;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received RESERVATION_REQUEST message\n");
-  nc = *GNUNET_SERVER_client_get_user_context (client,
-                                               struct GNUNET_SERVER_NotificationContext *);
-  if (NULL == nc)
+  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));
@@ -179,7 +196,8 @@ GAS_handle_reservation_request (void *cls,
 void
 GAS_reservations_init (struct GNUNET_SERVER_Handle *server)
 {
-  trackers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+  trackers = GNUNET_CONTAINER_multipeermap_create (128,
+                                                   GNUNET_NO);
 }