first round of simplification to change preference API

1 files changed, 2 insertions, 18 deletions

diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 49b01724f..ed855c42e 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -388,25 +388,19 @@ static size_t
 peer_transmit_ready_cb (void *cls, size_t size, void *buf);
 
 
-
-
 /**
  * Function called by core upon success or failure of our bandwidth reservation request.
  *
  * @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request
  * @param peer identifies the peer
- * @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,
-                       int32_t amount, struct GNUNET_TIME_Relative res_delay,
-                       uint64_t preference);
+                       int32_t amount, struct GNUNET_TIME_Relative res_delay);
 
 
 /**
@@ -439,8 +433,6 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth)
     cp->inc_preference = 0;
     cp->irc =
         GNUNET_CORE_peer_change_preference (GSF_core, &target,
-                                            GNUNET_TIME_UNIT_FOREVER_REL,
-                                            GNUNET_BANDWIDTH_VALUE_MAX,
                                             DBLOCK_SIZE, ip,
                                             &core_reserve_callback, cp);
   }
@@ -527,8 +519,6 @@ retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   cp->inc_preference = 0;
   cp->irc =
       GNUNET_CORE_peer_change_preference (GSF_core, &target,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
-                                          GNUNET_BANDWIDTH_VALUE_MAX,
                                           DBLOCK_SIZE, ip,
                                           &core_reserve_callback, cp);
 }
@@ -539,18 +529,14 @@ retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *
  * @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request
  * @param peer identifies the peer
- * @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,
-                       int32_t amount, struct GNUNET_TIME_Relative res_delay,
-                       uint64_t preference)
+                       int32_t amount, struct GNUNET_TIME_Relative res_delay)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GSF_PeerTransmitHandle *pth;
@@ -599,8 +585,6 @@ GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer,
   cp->ppd.transmission_delay = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_ZERO);
   cp->irc =
       GNUNET_CORE_peer_change_preference (GSF_core, peer,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
-                                          GNUNET_BANDWIDTH_VALUE_MAX,
                                           DBLOCK_SIZE, 0,
                                           &core_reserve_callback, cp);
   fn = get_trust_filename (peer);