Cleanup, and version update for the new APIs.

private-octopus · May 3, 2024 · c1d1ba0 · c1d1ba0
1 parent fc034ac
commit c1d1ba0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.19.12
+        VERSION 1.1.20.0
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 

diff --git a/picoquic/pacing.c b/picoquic/pacing.c
@@ -151,26 +151,6 @@ static void picoquic_report_pacing_update(picoquic_pacing_t* pacing, picoquic_pa
 void picoquic_update_pacing_parameters(picoquic_pacing_t * pacing, double pacing_rate, uint64_t quantum, size_t send_mtu, uint64_t smoothed_rtt,
     picoquic_path_t * signalled_path)
 {
-#if 0
-    const uint64_t nanosec_per_sec = 1000000000ull;
-
-    pacing->rate = (uint64_t)pacing_rate;
-
-    if (quantum > pacing->quantum_max) {
-        pacing->quantum_max = quantum;
-    }
-    if (pacing->rate > pacing->rate_max) {
-        pacing->rate_max = pacing->rate;
-    }
-
-    pacing->packet_time_nanosec = picoquic_packet_time_nanosec(pacing, send_mtu);
-
-    pacing->bucket_max = (nanosec_per_sec * quantum) / pacing->rate;
-    if (pacing->bucket_max <= 0) {
-        pacing->bucket_max = 16 * pacing->packet_time_nanosec;
-    }
-
-#else
     double packet_time = (double)send_mtu / pacing_rate;
     double quantum_time = (double)quantum / pacing_rate;
     uint64_t rtt_nanosec = smoothed_rtt * 1000;
@@ -201,7 +181,6 @@ void picoquic_update_pacing_parameters(picoquic_pacing_t * pacing, double pacing
     if (pacing->bucket_max <= 0) {
         pacing->bucket_max = 16 * pacing->packet_time_nanosec;
     }
-#endif
 
     if (pacing->bucket_nanosec > pacing->bucket_max) {
         pacing->bucket_nanosec = pacing->bucket_max;

diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.19.12"
+#define PICOQUIC_VERSION "1.1.20.0"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)
@@ -1499,6 +1499,11 @@ void picoquic_set_default_bbr_quantum_ratio(picoquic_quic_t* quic, double quantu
 * 
 * This experimental feature will not be activated in a multipath
 * environment, i.e., if more that 1 path is activated.
+* 
+* To protect against potential abuse, the code includes a rate limiter,
+* ensuring that if congestion control is blocking transmission, 
+* the "bypass" will not result in more than 1 Mbps of
+* traffic.
  */
 void picoquic_set_priority_limit_for_bypass(picoquic_cnx_t* cnx, uint8_t priority_limit);