trying to fix bandwidth calculations

5 files changed, 20 insertions, 15 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 39fb2f0f5..605cbbe1e 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -13,6 +13,7 @@ nodist_gnunetinclude_HEADERS = \
 
 gnunetinclude_HEADERS = \
   gnunet_arm_service.h \
+  gnunet_bandwidth_lib.h \
   gnunet_bio_lib.h \
   gnunet_client_lib.h \
   gnunet_common.h \
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index eb8addf5f..035cc60b9 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -35,13 +35,15 @@ extern "C"
 #endif
 #endif
 
+#include "gnunet_bandwidth_lib.h"
+
 /**
- * Amount of bytes per minute (in/out) to assume initially (before
- * either peer has communicated any particular preference).  Should be
- * rather low; set so that at least one maximum-size message can be
- * send each minute.
+ * Bandwidth (in/out) to assume initially (before either peer has
+ * communicated any particular preference).  Should be rather low; set
+ * so that at least one maximum-size message can be send roughly once
+ * per minute.
  */
-#define GNUNET_CONSTANTS_DEFAULT_BPM_IN_OUT GNUNET_SERVER_MAX_MESSAGE_SIZE
+#define GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT GNUNET_BANDWIDTH_value_init (1024)
 
 /**
  * After how long do we consider a connection to a peer dead
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index af0a4eaa9..47b8d6f98 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -281,8 +281,8 @@ typedef void
   (*GNUNET_CORE_PeerConfigurationInfoCallback) (void *cls,
                                                 const struct
                                                 GNUNET_PeerIdentity * peer,
-                                                unsigned int bpm_in,
-                                                unsigned int bpm_out,
+                                                struct GNUNET_BANDWIDTH_Value32NBO bpm_in,
+                                                struct GNUNET_BANDWIDTH_Value32NBO bpm_out,
                                                 int amount,
                                                 uint64_t preference);
 
@@ -302,11 +302,11 @@ struct GNUNET_CORE_InformationRequestContext;
  * @param peer identifies the peer
  * @param timeout after how long should we give up (and call "info" with NULL
  *                for "peer" to signal an error)?
- * @param bpm_out set to the current bandwidth limit (sending) for this peer,
+ * @param bw_out set to the current bandwidth limit (sending) for this peer,
  *                caller should set "bpm_out" to "-1" to avoid changing
- *                the current value; otherwise "bpm_out" will be lowered to
+ *                the current value; otherwise "bw_out" will be lowered to
  *                the specified value; passing a pointer to "0" can be used to force
- *                us to disconnect from the peer; "bpm_out" might not increase
+ *                us to disconnect from the peer; "bw_out" might not increase
  *                as specified since the upper bound is generally
  *                determined by the other peer!
  * @param amount reserve N bytes for receiving, negative
@@ -324,7 +324,7 @@ GNUNET_CORE_peer_change_preference (struct GNUNET_SCHEDULER_Handle *sched,
                                     const struct GNUNET_CONFIGURATION_Handle *cfg,
                                     const struct GNUNET_PeerIdentity *peer,
                                     struct GNUNET_TIME_Relative timeout,
-                                    uint32_t bpm_out,
+                                    struct GNUNET_BANDWIDTH_Value32NBO bw_out,
                                     int32_t amount,
                                     uint64_t preference,
                                     GNUNET_CORE_PeerConfigurationInfoCallback info,
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 7a3ccbf7b..47d4334bb 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -35,6 +35,7 @@ extern "C"
 #endif
 #endif
 
+#include "gnunet_bandwidth_lib.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_connection_lib.h"
@@ -153,8 +154,8 @@ void GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle);
  *
  * @param handle connection to transport service
  * @param target who's bandwidth quota is being changed
- * @param quota_in incoming bandwidth quota in bytes per ms
- * @param quota_out outgoing bandwidth quota in bytes per ms
+ * @param quota_in incoming bandwidth quota
+ * @param quota_out outgoing bandwidth quota
  * @param timeout how long to wait until signaling failure if
  *        we can not communicate the quota change
  * @param cont continuation to call when done, will be called
@@ -164,8 +165,8 @@ void GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle);
 void
 GNUNET_TRANSPORT_set_quota (struct GNUNET_TRANSPORT_Handle *handle,
                             const struct GNUNET_PeerIdentity *target,
-                            uint32_t quota_in,
-                            uint32_t quota_out,
+                            struct GNUNET_BANDWIDTH_Value32NBO quota_in,
+                            struct GNUNET_BANDWIDTH_Value32NBO quota_out,
                             struct GNUNET_TIME_Relative timeout,
                             GNUNET_SCHEDULER_Task cont, void *cont_cls);
 
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 1c5e1d7a1..e0a5b0774 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -37,6 +37,7 @@ extern "C"
 #endif
 
 #include "gnunet_common.h"
+#include "gnunet_bandwidth_lib.h"
 #include "gnunet_bio_lib.h"
 #include "gnunet_client_lib.h"
 #include "gnunet_configuration_lib.h"