Commit eaefd90
File tree
- deps/ngtcp2/ngtcp2/lib
- includes/ngtcp2
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1471,7 +1471,9 @@ typedef struct ngtcp2_transport_params { | |||
| 1471 | 1471 | uint64_t max_udp_payload_size; | |
| 1472 | 1472 | /** | |
| 1473 | 1473 | * :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. | ||
| 1475 | 1477 | */ | |
| 1476 | 1478 | uint64_t active_connection_id_limit; | |
| 1477 | 1479 | /** | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | * | |
| 37 | 37 | * Version number of the ngtcp2 library release. | |
| 38 | 38 | */ | |
| 39 | - #define NGTCP2_VERSION "1.9.1" | ||
| 39 | + #define NGTCP2_VERSION "1.10.0" | ||
| 40 | 40 | ||
| 41 | 41 | /** | |
| 42 | 42 | * @macro | |
@@ -46,6 +46,6 @@ | |||
| 46 | 46 | * number, 8 bits for minor and 8 bits for patch. Version 1.2.3 | |
| 47 | 47 | * becomes 0x010203. | |
| 48 | 48 | */ | |
| 49 | - #define NGTCP2_VERSION_NUM 0x010901 | ||
| 49 | + #define NGTCP2_VERSION_NUM 0x010a00 | ||
| 50 | 50 | ||
| 51 | 51 | #endif /* !defined(NGTCP2_VERSION_H) */ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11739,7 +11739,8 @@ static ngtcp2_ssize conn_write_vmsg_wrapper(ngtcp2_conn *conn, | |||
| 11739 | 11739 | ||
| 11740 | 11740 | if (cstat->bytes_in_flight >= cstat->cwnd) { | |
| 11741 | 11741 | 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 || | ||
| 11743 | 11744 | cstat->bytes_in_flight * 2 < cstat->cwnd) && | |
| 11744 | 11745 | nwrite == 0 && conn_pacing_pkt_tx_allowed(conn, ts) && | |
| 11745 | 11746 | (conn->flags & NGTCP2_CONN_FLAG_HANDSHAKE_COMPLETED)) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | 32 | #include "ngtcp2_conv.h" | |
| 33 | 33 | ||
| 34 | - #define NGTCP2_INITIAL_TABLE_LENBITS 4 | ||
| 34 | + #define NGTCP2_INITIAL_HASHBITS 4 | ||
| 35 | 35 | ||
| 36 | 36 | void ngtcp2_map_init(ngtcp2_map *map, const ngtcp2_mem *mem) { | |
| 37 | 37 | map->mem = mem; | |
@@ -196,7 +196,7 @@ int ngtcp2_map_insert(ngtcp2_map *map, ngtcp2_map_key_type key, void *data) { | |||
| 196 | 196 | return rv; | |
| 197 | 197 | } | |
| 198 | 198 | } else { | |
| 199 | - rv = map_resize(map, NGTCP2_INITIAL_TABLE_LENBITS); | ||
| 199 | + rv = map_resize(map, NGTCP2_INITIAL_HASHBITS); | ||
| 200 | 200 | if (rv != 0) { | |
| 201 | 201 | return rv; | |
| 202 | 202 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -249,9 +249,12 @@ static ngtcp2_ssize rtb_reclaim_frame(ngtcp2_rtb *rtb, uint8_t flags, | |||
| 249 | 249 | if (!fr->stream.fin) { | |
| 250 | 250 | /* 0 length STREAM frame with offset == 0 must be | |
| 251 | 251 | 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. */ | ||
| 253 | 254 | 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))) { | ||
| 255 | 258 | continue; | |
| 256 | 259 | } | |
| 257 | 260 | } 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, | |||
| 1284 | 1287 | return 0; | |
| 1285 | 1288 | } | |
| 1286 | 1289 | ||
| 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 | - | ||
| 1295 | 1290 | if (ent->flags & NGTCP2_RTB_ENTRY_FLAG_LOST_RETRANSMITTED) { | |
| 1296 | 1291 | --rtb->num_lost_pkts; | |
| 1297 | 1292 | ||
0 commit comments