Skip to content

Commit eaefd90

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update ngtcp2 to 1.10.0
PR-URL: #56334 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent 06de0c6 commit eaefd90

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,9 @@ typedef struct ngtcp2_transport_params {
14711471
uint64_t max_udp_payload_size;
14721472
/**
14731473
* :member:`active_connection_id_limit` is the maximum number of
1474-
* Connection ID that sender can store.
1474+
* Connection ID that sender can store. If specified, it must be in
1475+
* the range of [:macro:`NGTCP2_DEFAULT_ACTIVE_CONNECTION_ID_LIMIT`,
1476+
* 8], inclusive.
14751477
*/
14761478
uint64_t active_connection_id_limit;
14771479
/**

deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*
3737
* Version number of the ngtcp2 library release.
3838
*/
39-
#define NGTCP2_VERSION "1.9.1"
39+
#define NGTCP2_VERSION "1.10.0"
4040

4141
/**
4242
* @macro
@@ -46,6 +46,6 @@
4646
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4747
* becomes 0x010203.
4848
*/
49-
#define NGTCP2_VERSION_NUM 0x010901
49+
#define NGTCP2_VERSION_NUM 0x010a00
5050

5151
#endif /* !defined(NGTCP2_VERSION_H) */

deps/ngtcp2/ngtcp2/lib/ngtcp2_conn.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -11739,7 +11739,8 @@ static ngtcp2_ssize conn_write_vmsg_wrapper(ngtcp2_conn *conn,
1173911739

1174011740
if (cstat->bytes_in_flight >= cstat->cwnd) {
1174111741
conn->rst.is_cwnd_limited = 1;
11742-
} else if ((cstat->cwnd >= cstat->ssthresh ||
11742+
} else if (conn->rst.app_limited == 0 &&
11743+
(cstat->cwnd >= cstat->ssthresh ||
1174311744
cstat->bytes_in_flight * 2 < cstat->cwnd) &&
1174411745
nwrite == 0 && conn_pacing_pkt_tx_allowed(conn, ts) &&
1174511746
(conn->flags & NGTCP2_CONN_FLAG_HANDSHAKE_COMPLETED)) {

deps/ngtcp2/ngtcp2/lib/ngtcp2_map.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include "ngtcp2_conv.h"
3333

34-
#define NGTCP2_INITIAL_TABLE_LENBITS 4
34+
#define NGTCP2_INITIAL_HASHBITS 4
3535

3636
void ngtcp2_map_init(ngtcp2_map *map, const ngtcp2_mem *mem) {
3737
map->mem = mem;
@@ -196,7 +196,7 @@ int ngtcp2_map_insert(ngtcp2_map *map, ngtcp2_map_key_type key, void *data) {
196196
return rv;
197197
}
198198
} else {
199-
rv = map_resize(map, NGTCP2_INITIAL_TABLE_LENBITS);
199+
rv = map_resize(map, NGTCP2_INITIAL_HASHBITS);
200200
if (rv != 0) {
201201
return rv;
202202
}

deps/ngtcp2/ngtcp2/lib/ngtcp2_rtb.c

+5-10
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,12 @@ static ngtcp2_ssize rtb_reclaim_frame(ngtcp2_rtb *rtb, uint8_t flags,
249249
if (!fr->stream.fin) {
250250
/* 0 length STREAM frame with offset == 0 must be
251251
retransmitted if no non-empty data are sent to this
252-
stream, and no data in this stream are acknowledged. */
252+
stream, fin flag is not set, and no data in this stream
253+
are acknowledged. */
253254
if (fr->stream.offset != 0 || fr->stream.datacnt != 0 ||
254-
strm->tx.offset || (strm->flags & NGTCP2_STRM_FLAG_ANY_ACKED)) {
255+
strm->tx.offset ||
256+
(strm->flags &
257+
(NGTCP2_STRM_FLAG_SHUT_WR | NGTCP2_STRM_FLAG_ANY_ACKED))) {
255258
continue;
256259
}
257260
} else if (strm->flags & NGTCP2_STRM_FLAG_FIN_ACKED) {
@@ -1284,14 +1287,6 @@ static int rtb_on_pkt_lost_resched_move(ngtcp2_rtb *rtb, ngtcp2_conn *conn,
12841287
return 0;
12851288
}
12861289

1287-
if (ent->flags & NGTCP2_RTB_ENTRY_FLAG_PMTUD_PROBE) {
1288-
ngtcp2_log_info(rtb->log, NGTCP2_LOG_EVENT_LDC,
1289-
"pkn=%" PRId64
1290-
" is a PMTUD probe packet, no retransmission is necessary",
1291-
ent->hd.pkt_num);
1292-
return 0;
1293-
}
1294-
12951290
if (ent->flags & NGTCP2_RTB_ENTRY_FLAG_LOST_RETRANSMITTED) {
12961291
--rtb->num_lost_pkts;
12971292

0 commit comments

Comments
 (0)