Skip to content

deps: update ngtcp2 to 1.21.0 #62051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nodejs-github-bot wants to merge 1 commit into
base: main
Choose a base branch
from
+229 −223
Open

deps: update ngtcp2 to 1.21.0 #62051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions deps/ngtcp2/ngtcp2/examples/client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,17 +1049,16 @@ ngtcp2_ssize write_pkt(ngtcp2_conn *conn, ngtcp2_path *path,
ngtcp2_ssize Client::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,
uint8_t *dest, size_t destlen,
ngtcp2_tstamp ts) {
std::array<SharedVec, 16> vec;
std::array<nghttp3_vec, 16> vec;

for (;;) {
int64_t stream_id = -1;
int fin = 0;
nghttp3_ssize sveccnt = 0;

if (httpconn_ && ngtcp2_conn_get_max_data_left(conn_)) {
sveccnt = nghttp3_conn_writev_stream(
httpconn_, &stream_id, &fin,
reinterpret_cast<nghttp3_vec *>(vec.data()), vec.size());
sveccnt = nghttp3_conn_writev_stream(httpconn_, &stream_id, &fin,
vec.data(), vec.size());
if (sveccnt < 0) {
std::cerr << "nghttp3_conn_writev_stream: "
<< nghttp3_strerror(static_cast<int>(sveccnt)) << std::endl;
Expand All @@ -1072,6 +1071,7 @@ ngtcp2_ssize Client::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,
}

ngtcp2_ssize ndatalen;
auto v = vec.data();
auto vcnt = static_cast<size_t>(sveccnt);

uint32_t flags = NGTCP2_WRITE_STREAM_FLAG_MORE;
Expand All @@ -1081,7 +1081,7 @@ ngtcp2_ssize Client::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,

auto nwrite = ngtcp2_conn_writev_stream(
conn_, path, pi, dest, destlen, &ndatalen, flags, stream_id,
reinterpret_cast<const ngtcp2_vec *>(vec.data()), vcnt, ts);
reinterpret_cast<const ngtcp2_vec *>(v), vcnt, ts);
if (nwrite < 0) {
switch (nwrite) {
case NGTCP2_ERR_STREAM_DATA_BLOCKED:
Expand Down
10 changes: 5 additions & 5 deletions deps/ngtcp2/ngtcp2/examples/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,17 +1652,16 @@ ngtcp2_ssize write_pkt(ngtcp2_conn *conn, ngtcp2_path *path,
ngtcp2_ssize Handler::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,
uint8_t *dest, size_t destlen,
ngtcp2_tstamp ts) {
std::array<SharedVec, 16> vec;
std::array<nghttp3_vec, 16> vec;

for (;;) {
int64_t stream_id = -1;
int fin = 0;
nghttp3_ssize sveccnt = 0;

if (httpconn_ && ngtcp2_conn_get_max_data_left(conn_)) {
sveccnt = nghttp3_conn_writev_stream(
httpconn_, &stream_id, &fin,
reinterpret_cast<nghttp3_vec *>(vec.data()), vec.size());
sveccnt = nghttp3_conn_writev_stream(httpconn_, &stream_id, &fin,
vec.data(), vec.size());
if (sveccnt < 0) {
std::cerr << "nghttp3_conn_writev_stream: "
<< nghttp3_strerror(static_cast<int>(sveccnt)) << std::endl;
Expand All @@ -1675,6 +1674,7 @@ ngtcp2_ssize Handler::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,
}

ngtcp2_ssize ndatalen;
auto v = vec.data();
auto vcnt = static_cast<size_t>(sveccnt);

uint32_t flags =
Expand All @@ -1685,7 +1685,7 @@ ngtcp2_ssize Handler::write_pkt(ngtcp2_path *path, ngtcp2_pkt_info *pi,

auto nwrite = ngtcp2_conn_writev_stream(
conn_, path, pi, dest, destlen, &ndatalen, flags, stream_id,
reinterpret_cast<const ngtcp2_vec *>(vec.data()), vcnt, ts);
reinterpret_cast<const ngtcp2_vec *>(v), vcnt, ts);
if (nwrite < 0) {
switch (nwrite) {
case NGTCP2_ERR_STREAM_DATA_BLOCKED:
Expand Down
6 changes: 0 additions & 6 deletions deps/ngtcp2/ngtcp2/examples/shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <span>

#include <ngtcp2/ngtcp2.h>
#include <nghttp3/nghttp3.h>

#include "network.h"

Expand Down Expand Up @@ -64,11 +63,6 @@ inline constexpr uint32_t TLS_ALERT_ECH_REQUIRED = 121;

inline constexpr size_t MAX_RECV_PKTS = 64;

union SharedVec {
ngtcp2_vec v2;
nghttp3_vec v3;
};

// msghdr_get_ecn gets ECN bits from |msg|. |family| is the address
// family from which packet is received.
uint8_t msghdr_get_ecn(msghdr *msg, int family);
Expand Down
6 changes: 3 additions & 3 deletions deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/ngtcp2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ typedef struct ngtcp2_sockaddr_in {
} ngtcp2_sockaddr_in;

typedef struct ngtcp2_in6_addr {
uint8_t in6_addr[16];
uint8_t s6_addr[16];
} ngtcp2_in6_addr;

typedef struct ngtcp2_sockaddr_in6 {
Expand Down Expand Up @@ -1866,8 +1866,8 @@ typedef struct ngtcp2_settings {
uint64_t max_stream_window;
/**
* :member:`ack_thresh` is the minimum number of the received ACK
* eliciting packets that trigger the immediate acknowledgement from
* the local endpoint.
* eliciting packets that triggers the immediate acknowledgement
* from the local endpoint.
*/
size_t ack_thresh;
/**
Expand Down
4 changes: 2 additions & 2 deletions deps/ngtcp2/ngtcp2/lib/includes/ngtcp2/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*
* Version number of the ngtcp2 library release.
*/
#define NGTCP2_VERSION "1.20.0"
#define NGTCP2_VERSION "1.21.0"

/**
* @macro
Expand All @@ -46,6 +46,6 @@
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
* becomes 0x010203.
*/
#define NGTCP2_VERSION_NUM 0x011400
#define NGTCP2_VERSION_NUM 0x011500

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