walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compile with latest ngtcp2

This commit is contained in:
Tatsuhiro Tsujikawa 2020-06-07 22:49:34 +09:00
parent acb661df72
commit 813d5e1ddf
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/h2load.h
View File

@ -458,8 +458,8 @@ struct Client {
int quic_recv_crypto_data(ngtcp2_crypto_level crypto_level, int quic_recv_crypto_data(ngtcp2_crypto_level crypto_level,
const uint8_t *data, size_t datalen); const uint8_t *data, size_t datalen);
int quic_handshake_completed(); int quic_handshake_completed();
int quic_recv_stream_data(int64_t stream_id, int fin, const uint8_t *data, int quic_recv_stream_data(uint32_t flags, int64_t stream_id,
size_t datalen); const uint8_t *data, size_t datalen);
int quic_acked_stream_data_offset(int64_t stream_id, size_t datalen); int quic_acked_stream_data_offset(int64_t stream_id, size_t datalen);
int quic_stream_close(int64_t stream_id, uint64_t app_error_code); int quic_stream_close(int64_t stream_id, uint64_t app_error_code);
int quic_stream_reset(int64_t stream_id, uint64_t app_error_code); int quic_stream_reset(int64_t stream_id, uint64_t app_error_code);

8
src/h2load_http3_session.cc
View File

@ -343,10 +343,10 @@ int Http3Session::init_conn() {
return 0; return 0;
} }
ssize_t Http3Session::read_stream(int64_t stream_id, const uint8_t *data, ssize_t Http3Session::read_stream(uint32_t flags, int64_t stream_id,
size_t datalen, int fin) { const uint8_t *data, size_t datalen) {
auto nconsumed = auto nconsumed = nghttp3_conn_read_stream(
nghttp3_conn_read_stream(conn_, stream_id, data, datalen, fin); conn_, stream_id, data, datalen, flags & NGTCP2_STREAM_DATA_FLAG_FIN);
if (nconsumed < 0) { if (nconsumed < 0) {
std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed) std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed)
<< std::endl; << std::endl;

4
src/h2load_http3_session.h
View File

@ -58,8 +58,8 @@ public:
int extend_max_local_streams(); int extend_max_local_streams();
int64_t submit_request_internal(); int64_t submit_request_internal();
ssize_t read_stream(int64_t stream_id, const uint8_t *data, size_t datalen, ssize_t read_stream(uint32_t flags, int64_t stream_id, const uint8_t *data,
int fin); size_t datalen);
ssize_t write_stream(int64_t &stream_id, int &fin, nghttp3_vec *vec, ssize_t write_stream(int64_t &stream_id, int &fin, nghttp3_vec *vec,
size_t veccnt); size_t veccnt);
int block_stream(int64_t stream_id); int block_stream(int64_t stream_id);

19
src/h2load_quic.cc
View File

@ -71,11 +71,11 @@ int handshake_completed(ngtcp2_conn *conn, void *user_data) {
int Client::quic_handshake_completed() { return connection_made(); } int Client::quic_handshake_completed() { return connection_made(); }
namespace { namespace {
int recv_stream_data(ngtcp2_conn *conn, int64_t stream_id, int fin, int recv_stream_data(ngtcp2_conn *conn, uint32_t flags, int64_t stream_id,
uint64_t offset, const uint8_t *data, size_t datalen, uint64_t offset, const uint8_t *data, size_t datalen,
void *user_data, void *stream_user_data) { void *user_data, void *stream_user_data) {
auto c = static_cast<Client *>(user_data); auto c = static_cast<Client *>(user_data);
if (c->quic_recv_stream_data(stream_id, fin, data, datalen) != 0) { if (c->quic_recv_stream_data(flags, stream_id, data, datalen) != 0) {
// TODO Better to do this gracefully rather than // TODO Better to do this gracefully rather than
// NGTCP2_ERR_CALLBACK_FAILURE. Perhaps, call // NGTCP2_ERR_CALLBACK_FAILURE. Perhaps, call
// ngtcp2_conn_write_application_close() ? // ngtcp2_conn_write_application_close() ?
@ -85,14 +85,14 @@ int recv_stream_data(ngtcp2_conn *conn, int64_t stream_id, int fin,
} }
} // namespace } // namespace
int Client::quic_recv_stream_data(int64_t stream_id, int fin, int Client::quic_recv_stream_data(uint32_t flags, int64_t stream_id,
const uint8_t *data, size_t datalen) { const uint8_t *data, size_t datalen) {
if (worker->current_phase == Phase::MAIN_DURATION) { if (worker->current_phase == Phase::MAIN_DURATION) {
worker->stats.bytes_total += datalen; worker->stats.bytes_total += datalen;
} }
auto s = static_cast<Http3Session *>(session.get()); auto s = static_cast<Http3Session *>(session.get());
auto nconsumed = s->read_stream(stream_id, data, datalen, fin); auto nconsumed = s->read_stream(flags, stream_id, data, datalen);
if (nconsumed == -1) { if (nconsumed == -1) {
return -1; return -1;
} }
@ -570,10 +570,15 @@ int Client::write_quic() {
auto v = vec.data(); auto v = vec.data();
auto vcnt = static_cast<size_t>(sveccnt); auto vcnt = static_cast<size_t>(sveccnt);
uint32_t flags = NGTCP2_WRITE_STREAM_FLAG_MORE;
if (fin) {
flags |= NGTCP2_WRITE_STREAM_FLAG_FIN;
}
auto nwrite = ngtcp2_conn_writev_stream( auto nwrite = ngtcp2_conn_writev_stream(
quic.conn, &ps.path, buf.data(), quic.max_pktlen, &ndatalen, quic.conn, &ps.path, buf.data(), quic.max_pktlen, &ndatalen, flags,
NGTCP2_WRITE_STREAM_FLAG_MORE, stream_id, fin, stream_id, reinterpret_cast<const ngtcp2_vec *>(v), vcnt,
reinterpret_cast<const ngtcp2_vec *>(v), vcnt, timestamp(worker->loop)); timestamp(worker->loop));
if (nwrite < 0) { if (nwrite < 0) {
switch (nwrite) { switch (nwrite) {
case NGTCP2_ERR_STREAM_DATA_BLOCKED: case NGTCP2_ERR_STREAM_DATA_BLOCKED: