Skip to content

Commit c1d1ba0

Browse files
committed
Cleanup, and version update for the new APIs.
1 parent fc034ac commit c1d1ba0

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ else()
88
endif()
99

1010
project(picoquic
11-
VERSION 1.1.19.12
11+
VERSION 1.1.20.0
1212
DESCRIPTION "picoquic library"
1313
LANGUAGES C CXX)
1414

picoquic/pacing.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -151,26 +151,6 @@ static void picoquic_report_pacing_update(picoquic_pacing_t* pacing, picoquic_pa
151151
void picoquic_update_pacing_parameters(picoquic_pacing_t * pacing, double pacing_rate, uint64_t quantum, size_t send_mtu, uint64_t smoothed_rtt,
152152
picoquic_path_t * signalled_path)
153153
{
154-
#if 0
155-
const uint64_t nanosec_per_sec = 1000000000ull;
156-
157-
pacing->rate = (uint64_t)pacing_rate;
158-
159-
if (quantum > pacing->quantum_max) {
160-
pacing->quantum_max = quantum;
161-
}
162-
if (pacing->rate > pacing->rate_max) {
163-
pacing->rate_max = pacing->rate;
164-
}
165-
166-
pacing->packet_time_nanosec = picoquic_packet_time_nanosec(pacing, send_mtu);
167-
168-
pacing->bucket_max = (nanosec_per_sec * quantum) / pacing->rate;
169-
if (pacing->bucket_max <= 0) {
170-
pacing->bucket_max = 16 * pacing->packet_time_nanosec;
171-
}
172-
173-
#else
174154
double packet_time = (double)send_mtu / pacing_rate;
175155
double quantum_time = (double)quantum / pacing_rate;
176156
uint64_t rtt_nanosec = smoothed_rtt * 1000;
@@ -201,7 +181,6 @@ void picoquic_update_pacing_parameters(picoquic_pacing_t * pacing, double pacing
201181
if (pacing->bucket_max <= 0) {
202182
pacing->bucket_max = 16 * pacing->packet_time_nanosec;
203183
}
204-
#endif
205184

206185
if (pacing->bucket_nanosec > pacing->bucket_max) {
207186
pacing->bucket_nanosec = pacing->bucket_max;

picoquic/picoquic.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
extern "C" {
4141
#endif
4242

43-
#define PICOQUIC_VERSION "1.1.19.12"
43+
#define PICOQUIC_VERSION "1.1.20.0"
4444
#define PICOQUIC_ERROR_CLASS 0x400
4545
#define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
4646
#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
14991499
*
15001500
* This experimental feature will not be activated in a multipath
15011501
* environment, i.e., if more that 1 path is activated.
1502+
*
1503+
* To protect against potential abuse, the code includes a rate limiter,
1504+
* ensuring that if congestion control is blocking transmission,
1505+
* the "bypass" will not result in more than 1 Mbps of
1506+
* traffic.
15021507
*/
15031508
void picoquic_set_priority_limit_for_bypass(picoquic_cnx_t* cnx, uint8_t priority_limit);
15041509

0 commit comments

Comments
 (0)