summaryrefslogtreecommitdiffstats
path: root/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c')
-rw-r--r--src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c b/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c
index 89a0cb5..fc79287 100644
--- a/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c
+++ b/src/contrib/libngtcp2/ngtcp2/lib/ngtcp2_rtb.c
@@ -579,9 +579,11 @@ static int rtb_process_acked_pkt(ngtcp2_rtb *rtb, ngtcp2_rtb_entry *ent,
conn->pmtud->tx_pkt_num <= ent->hd.pkt_num) {
ngtcp2_pmtud_probe_success(conn->pmtud, ent->pktlen);
- conn->dcid.current.max_udp_payload_size =
- conn->cstat.max_tx_udp_payload_size =
- ngtcp2_max(conn->dcid.current.max_udp_payload_size, ent->pktlen);
+ if (conn->dcid.current.max_udp_payload_size < ent->pktlen) {
+ conn->dcid.current.max_udp_payload_size = ent->pktlen;
+ conn->cstat.max_tx_udp_payload_size =
+ ngtcp2_conn_get_path_max_tx_udp_payload_size(conn);
+ }
if (ngtcp2_pmtud_finished(conn->pmtud)) {
ngtcp2_conn_stop_pmtud(conn);
@@ -985,8 +987,8 @@ static int rtb_pkt_lost(ngtcp2_rtb *rtb, ngtcp2_conn_stat *cstat,
static ngtcp2_duration compute_pkt_loss_delay(const ngtcp2_conn_stat *cstat) {
/* 9/8 is kTimeThreshold */
ngtcp2_duration loss_delay =
- ngtcp2_max(cstat->latest_rtt, cstat->smoothed_rtt) * 9 / 8;
- return ngtcp2_max(loss_delay, NGTCP2_GRANULARITY);
+ ngtcp2_max_uint64(cstat->latest_rtt, cstat->smoothed_rtt) * 9 / 8;
+ return ngtcp2_max_uint64(loss_delay, NGTCP2_GRANULARITY);
}
/*
@@ -1024,8 +1026,8 @@ static int rtb_detect_lost_pkt(ngtcp2_rtb *rtb, uint64_t *ppkt_lost,
uint64_t bytes_lost = 0;
ngtcp2_duration max_ack_delay;
- pkt_thres = ngtcp2_max(pkt_thres, NGTCP2_PKT_THRESHOLD);
- pkt_thres = ngtcp2_min(pkt_thres, 256);
+ pkt_thres = ngtcp2_max_uint64(pkt_thres, NGTCP2_PKT_THRESHOLD);
+ pkt_thres = ngtcp2_min_uint64(pkt_thres, 256);
cstat->loss_time[rtb->pktns_id] = UINT64_MAX;
loss_delay = compute_pkt_loss_delay(cstat);
@@ -1053,8 +1055,8 @@ static int rtb_detect_lost_pkt(ngtcp2_rtb *rtb, uint64_t *ppkt_lost,
max_ack_delay) *
NGTCP2_PERSISTENT_CONGESTION_THRESHOLD;
- start_ts = ngtcp2_max(rtb->persistent_congestion_start_ts,
- cstat->first_rtt_sample_ts);
+ start_ts = ngtcp2_max_uint64(rtb->persistent_congestion_start_ts,
+ cstat->first_rtt_sample_ts);
for (; !ngtcp2_ksl_it_end(&it);) {
ent = ngtcp2_ksl_it_get(&it);