communicate res delay in capi

2 files changed, 12 insertions, 3 deletions

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 687f131d1..74a88e7b2 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -2658,6 +2658,8 @@ refresh_bloomfilter (struct PendingRequest *pr)
  * @param peer identifies the peer
  * @param bpm_out set to the current bandwidth limit (sending) for this peer
  * @param amount set to the amount that was actually reserved or unreserved
+ * @param res_delay if the reservation could not be satisfied (amount was 0), how
+ *        long should the client wait until re-trying?
  * @param preference current traffic preference for the given peer
  */
 static void
@@ -2665,7 +2667,8 @@ target_reservation_cb (void *cls,
                        const struct
                        GNUNET_PeerIdentity * peer,
                        struct GNUNET_BANDWIDTH_Value32NBO bpm_out,
-                       int amount,
+                       int32_t amount,
+                       struct GNUNET_TIME_Relative res_delay,
                        uint64_t preference)
 {
   struct PendingRequest *pr = cls;
@@ -3175,7 +3178,9 @@ forward_request_task (void *cls,
       /* force forwarding */
       static struct GNUNET_BANDWIDTH_Value32NBO zerobw;
       target_reservation_cb (pr, &psc.target,
-                             zerobw, 0, 0.0);
+                             zerobw, 0, 
+                             GNUNET_TIME_UNIT_FOREVER_REL,
+                             0.0);
     }
 }
 
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 783bd4024..05638b657 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -330,13 +330,16 @@ peer_transmit_ready_cb (void *cls,
  * @param bandwidth_out available amount of outbound bandwidth
  * @param amount set to the amount that was actually reserved or unreserved;
  *               either the full requested amount or zero (no partial reservations)
+ * @param res_delay if the reservation could not be satisfied (amount was 0), how
+ *        long should the client wait until re-trying?
  * @param preference current traffic preference for the given peer
  */
 static void
 core_reserve_callback (void *cls,
                        const struct GNUNET_PeerIdentity *peer,
                        struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                       int amount,
+                       int32_t amount,
+                       struct GNUNET_TIME_Relative res_delay,
                        uint64_t preference)
 {
   struct GSF_ConnectedPeer *cp = cls;
@@ -347,6 +350,7 @@ core_reserve_callback (void *cls,
   if (0 == amount)
     {
       /* failed; retry! (how did we get here!?) */
+      /* FIXME: wait res_delay before re-trying! */
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _("Failed to reserve bandwidth to peer `%s'\n"),
                   GNUNET_i2s (peer));