communicate res delay in capi

3 files changed, 16 insertions, 15 deletions

diff --git a/src/core/core.h b/src/core/core.h
index fff4c3fa8..8a8962124 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -301,6 +301,13 @@ struct ConfigurationInfoMessage
   int32_t reserved_amount GNUNET_PACKED;
 
   /**
+   * If the reservation request could not be satisfied (reserved_amount
+   * was zero), how long should the client wait until retrying? 0 if
+   * bandwidth was reserved.
+   */
+  struct GNUNET_TIME_RelativeNBO reserve_delay;
+
+  /**
    * Unique request ID.
    */
   uint32_t rim_id GNUNET_PACKED;
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 767ee2957..3b5440135 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -422,7 +422,9 @@ disconnect_and_free_peer_entry (void *cls,
       pcic (pr->pcic_cls,
             &pr->peer,
             zero,
-            0, 0);
+            0, 
+            GNUNET_TIME_UNIT_FOREVER_REL,
+            0);
     }
   if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK)
     {
@@ -1252,6 +1254,7 @@ main_notify_handler (void *cls,
               &pr->peer,
               cim->bw_out,
               ntohl (cim->reserved_amount),
+              GNUNET_TIME_relative_ntoh (cim->reserve_delay),
               GNUNET_ntohll (cim->preference));
       break;
     default:
@@ -1810,16 +1813,6 @@ struct GNUNET_CORE_InformationRequestContext
   struct GNUNET_CORE_Handle *h;
 
   /**
-   * Function to call with the information.
-   */
-  GNUNET_CORE_PeerConfigurationInfoCallback info;
-
-  /**
-   * Closure for info.
-   */
-  void *info_cls;
-
-  /**
    * Link to control message, NULL if CM was sent.
    */ 
   struct ControlMessage *cm;
@@ -1903,8 +1896,6 @@ GNUNET_CORE_peer_change_preference (struct GNUNET_CORE_Handle *h,
   irc = GNUNET_malloc (sizeof (struct GNUNET_CORE_InformationRequestContext));
   irc->h = h;
   irc->pr = pr;
-  irc->info = info;
-  irc->info_cls = info_cls;
   cm = GNUNET_malloc (sizeof (struct ControlMessage) +
                       sizeof (struct RequestInfoMessage));
   cm->cont = &change_preference_send_continuation;
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 3068fd408..223430805 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1571,6 +1571,7 @@ handle_client_request_info (void *cls,
   int32_t want_reserv;
   int32_t got_reserv;
   unsigned long long old_preference;
+  struct GNUNET_TIME_Relative rdelay;
 
 #if DEBUG_CORE_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1621,8 +1622,9 @@ handle_client_request_info (void *cls,
         }
       else if (want_reserv > 0)
         {
-          if (GNUNET_BANDWIDTH_tracker_get_delay (&n->available_recv_window,
-                                                  want_reserv).rel_value == 0)
+          rdelay = GNUNET_BANDWIDTH_tracker_get_delay (&n->available_recv_window,
+                                                       want_reserv);
+          if (rdelay.rel_value == 0)
             got_reserv = want_reserv;
           else
             got_reserv = 0; /* all or nothing */
@@ -1647,6 +1649,7 @@ handle_client_request_info (void *cls,
                   (int) got_reserv);
 #endif
       cim.reserved_amount = htonl (got_reserv);
+      cim.reserve_delay = GNUNET_TIME_relative_hton (rdelay);
       cim.rim_id = rcm->rim_id;
       cim.bw_out = n->bw_out;
       cim.preference = n->current_preference;