Skip to content
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

Jump to bottom

quic: multiple cleanups #34137

Closed
wants to merge 8 commits into from
Closed

quic: multiple cleanups #34137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1b9e76
quic: cleanups in JS API
jasnell Jun 27, 2020
e52f81d
quic: cleanups for QuicSocket
jasnell Jun 30, 2020
f3ead5d
quic: fixup set_final_size
jasnell Jun 30, 2020
0aa82a4
quic: consolidate onSessionClose and onSessionSilentClose
jasnell Jun 30, 2020
e6f6ff1
quic: remove unused callback function
jasnell Jun 30, 2020
b1c13b8
quic: fixup constant exports, export all protocol error codes
jasnell Jun 30, 2020
4135c5c
quic: avoid using private JS fields for now
jasnell Jun 30, 2020
0c9ea4e
quic: reduce duplication of code
jasnell Jun 30, 2020
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
1,106 changes: 569 additions & 537 deletions lib/internal/quic/core.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,20 +450,17 @@ constexpr size_t kFsStatsBufferLength =
#if defined(NODE_EXPERIMENTAL_QUIC) && NODE_EXPERIMENTAL_QUIC
# define QUIC_ENVIRONMENT_STRONG_PERSISTENT_VALUES(V) \
V(quic_on_socket_close_function, v8::Function) \
V(quic_on_socket_error_function, v8::Function) \
V(quic_on_socket_server_busy_function, v8::Function) \
V(quic_on_session_cert_function, v8::Function) \
V(quic_on_session_client_hello_function, v8::Function) \
V(quic_on_session_close_function, v8::Function) \
V(quic_on_session_destroyed_function, v8::Function) \
V(quic_on_session_error_function, v8::Function) \
V(quic_on_session_handshake_function, v8::Function) \
V(quic_on_session_keylog_function, v8::Function) \
V(quic_on_session_path_validation_function, v8::Function) \
V(quic_on_session_use_preferred_address_function, v8::Function) \
V(quic_on_session_qlog_function, v8::Function) \
V(quic_on_session_ready_function, v8::Function) \
V(quic_on_session_silent_close_function, v8::Function) \
V(quic_on_session_status_function, v8::Function) \
V(quic_on_session_ticket_function, v8::Function) \
V(quic_on_session_version_negotiation_function, v8::Function) \
Expand Down
22 changes: 18 additions & 4 deletions src/quic/node_quic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,16 @@ void QuicSetCallbacks(const FunctionCallbackInfo<Value>& args) {
} while (0)

SETFUNCTION("onSocketClose", socket_close);
SETFUNCTION("onSocketError", socket_error);
SETFUNCTION("onSessionReady", session_ready);
SETFUNCTION("onSessionCert", session_cert);
SETFUNCTION("onSessionClientHello", session_client_hello);
SETFUNCTION("onSessionClose", session_close);
SETFUNCTION("onSessionDestroyed", session_destroyed);
SETFUNCTION("onSessionError", session_error);
SETFUNCTION("onSessionHandshake", session_handshake);
SETFUNCTION("onSessionKeylog", session_keylog);
SETFUNCTION("onSessionUsePreferredAddress", session_use_preferred_address);
SETFUNCTION("onSessionPathValidation", session_path_validation);
SETFUNCTION("onSessionQlog", session_qlog);
SETFUNCTION("onSessionSilentClose", session_silent_close);
SETFUNCTION("onSessionStatus", session_status);
SETFUNCTION("onSessionTicket", session_ticket);
SETFUNCTION("onSessionVersionNegotiation", session_version_negotiation);
Expand Down Expand Up @@ -192,7 +189,6 @@ void Initialize(Local<Object> target,
V(NGTCP2_APP_NOERROR) \
V(NGTCP2_PATH_VALIDATION_RESULT_FAILURE) \
V(NGTCP2_PATH_VALIDATION_RESULT_SUCCESS) \
V(NGTCP2_DEFAULT_MAX_PKTLEN) \
V(NGTCP2_CC_ALGO_CUBIC) \
V(NGTCP2_CC_ALGO_RENO) \
V(QUIC_ERROR_APPLICATION) \
Expand Down Expand Up @@ -235,11 +231,29 @@ void Initialize(Local<Object> target,
QUIC_CONSTANTS(V)
#undef V

NODE_DEFINE_CONSTANT(constants, NGTCP2_DEFAULT_MAX_PKTLEN);
NODE_DEFINE_CONSTANT(constants, NGTCP2_PROTO_VER);
NODE_DEFINE_CONSTANT(constants, NGTCP2_DEFAULT_MAX_ACK_DELAY);
NODE_DEFINE_CONSTANT(constants, NGTCP2_MAX_CIDLEN);
NODE_DEFINE_CONSTANT(constants, NGTCP2_MIN_CIDLEN);

NODE_DEFINE_CONSTANT(constants, NGTCP2_NO_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_INTERNAL_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_CONNECTION_REFUSED);
NODE_DEFINE_CONSTANT(constants, NGTCP2_FLOW_CONTROL_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_STREAM_LIMIT_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_STREAM_STATE_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_FINAL_SIZE_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_FRAME_ENCODING_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_TRANSPORT_PARAMETER_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_CONNECTION_ID_LIMIT_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_PROTOCOL_VIOLATION);
NODE_DEFINE_CONSTANT(constants, NGTCP2_INVALID_TOKEN);
NODE_DEFINE_CONSTANT(constants, NGTCP2_APPLICATION_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_CRYPTO_BUFFER_EXCEEDED);
NODE_DEFINE_CONSTANT(constants, NGTCP2_KEY_UPDATE_ERROR);
NODE_DEFINE_CONSTANT(constants, NGTCP2_CRYPTO_ERROR);

NODE_DEFINE_CONSTANT(constants, AF_INET);
NODE_DEFINE_CONSTANT(constants, AF_INET6);
NODE_DEFINE_STRING_CONSTANT(constants,
Expand Down
48 changes: 15 additions & 33 deletions src/quic/node_quic_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,9 @@ void QuicSessionListener::OnSessionDestroyed() {
previous_listener_->OnSessionDestroyed();
}

void QuicSessionListener::OnSessionClose(QuicError error) {
void QuicSessionListener::OnSessionClose(QuicError error, int flags) {
if (previous_listener_ != nullptr)
previous_listener_->OnSessionClose(error);
previous_listener_->OnSessionClose(error, flags);
}

void QuicSessionListener::OnStreamReady(BaseObjectPtr<QuicStream> stream) {
Expand Down Expand Up @@ -328,13 +328,6 @@ void QuicSessionListener::OnStreamBlocked(int64_t stream_id) {
}
}

void QuicSessionListener::OnSessionSilentClose(
bool stateless_reset,
QuicError error) {
if (previous_listener_ != nullptr)
previous_listener_->OnSessionSilentClose(stateless_reset, error);
}

void QuicSessionListener::OnUsePreferredAddress(
int family,
const PreferredAddress& preferred_address) {
Expand Down Expand Up @@ -525,14 +518,20 @@ void JSQuicSessionListener::OnSessionDestroyed() {
env->quic_on_session_destroyed_function(), 0, nullptr);
}

void JSQuicSessionListener::OnSessionClose(QuicError error) {
void JSQuicSessionListener::OnSessionClose(QuicError error, int flags) {
Environment* env = session()->env();
HandleScope scope(env->isolate());
Context::Scope context_scope(env->context());

Local<Value> argv[] = {
Number::New(env->isolate(), static_cast<double>(error.code)),
Integer::New(env->isolate(), error.family)
Integer::New(env->isolate(), error.family),
flags & SESSION_CLOSE_FLAG_SILENT
? v8::True(env->isolate())
: v8::False(env->isolate()),
flags & SESSION_CLOSE_FLAG_STATELESS_RESET
? v8::True(env->isolate())
: v8::False(env->isolate())
};

// Grab a shared pointer to this to prevent the QuicSession
Expand Down Expand Up @@ -664,26 +663,6 @@ void JSQuicSessionListener::OnSessionTicket(int size, SSL_SESSION* sess) {
arraysize(argv), argv);
}

void JSQuicSessionListener::OnSessionSilentClose(
bool stateless_reset,
QuicError error) {
Environment* env = session()->env();
HandleScope scope(env->isolate());
Context::Scope context_scope(env->context());

Local<Value> argv[] = {
stateless_reset ? v8::True(env->isolate()) : v8::False(env->isolate()),
Number::New(env->isolate(), static_cast<double>(error.code)),
Integer::New(env->isolate(), error.family)
};

// Grab a shared pointer to this to prevent the QuicSession
// from being freed while the MakeCallback is running.
BaseObjectPtr<QuicSession> ptr(session());
session()->MakeCallback(
env->quic_on_session_silent_close_function(), arraysize(argv), argv);
}

void JSQuicSessionListener::OnUsePreferredAddress(
int family,
const PreferredAddress& preferred_address) {
Expand Down Expand Up @@ -2323,7 +2302,7 @@ bool QuicSession::set_socket(QuicSocket* socket, bool nat_rebinding) {
socket->ReceiveStart();

// Step 4: Update ngtcp2
auto& local_address = socket->local_address();
auto local_address = socket->local_address();
if (nat_rebinding) {
ngtcp2_addr addr;
ngtcp2_addr_init(
Expand Down Expand Up @@ -2377,7 +2356,10 @@ void QuicSession::SilentClose() {
err.code,
is_stateless_reset() ? "yes" : "no");

listener()->OnSessionSilentClose(is_stateless_reset(), err);
int flags = QuicSessionListener::SESSION_CLOSE_FLAG_SILENT;
if (is_stateless_reset())
flags |= QuicSessionListener::SESSION_CLOSE_FLAG_STATELESS_RESET;
listener()->OnSessionClose(err, flags);
}
// Begin connection close by serializing the CONNECTION_CLOSE packet.
// There are two variants: one to serialize an application close, the
Expand Down
18 changes: 12 additions & 6 deletions src/quic/node_quic_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ struct QuicSessionStatsTraits {

class QuicSessionListener {
public:
enum SessionCloseFlags {
SESSION_CLOSE_FLAG_NONE,
SESSION_CLOSE_FLAG_SILENT,
SESSION_CLOSE_FLAG_STATELESS_RESET
};

virtual ~QuicSessionListener();

virtual void OnKeylog(const char* str, size_t size);
Expand All @@ -280,7 +286,9 @@ class QuicSessionListener {
int64_t stream_id,
uint64_t app_error_code);
virtual void OnSessionDestroyed();
virtual void OnSessionClose(QuicError error);
virtual void OnSessionClose(
QuicError error,
int flags = SESSION_CLOSE_FLAG_NONE);
virtual void OnStreamReady(BaseObjectPtr<QuicStream> stream);
virtual void OnHandshakeCompleted();
virtual void OnPathValidation(
Expand All @@ -291,9 +299,6 @@ class QuicSessionListener {
int family,
const PreferredAddress& preferred_address);
virtual void OnSessionTicket(int size, SSL_SESSION* session);
virtual void OnSessionSilentClose(
bool stateless_reset,
QuicError error);
virtual void OnStreamBlocked(int64_t stream_id);
virtual void OnVersionNegotiation(
uint32_t supported_version,
Expand Down Expand Up @@ -329,15 +334,16 @@ class JSQuicSessionListener : public QuicSessionListener {
int64_t stream_id,
uint64_t app_error_code) override;
void OnSessionDestroyed() override;
void OnSessionClose(QuicError error) override;
void OnSessionClose(
QuicError error,
int flags = SESSION_CLOSE_FLAG_NONE) override;
void OnStreamReady(BaseObjectPtr<QuicStream> stream) override;
void OnHandshakeCompleted() override;
void OnPathValidation(
ngtcp2_path_validation_result res,
const sockaddr* local,
const sockaddr* remote) override;
void OnSessionTicket(int size, SSL_SESSION* session) override;
void OnSessionSilentClose(bool stateless_reset, QuicError error) override;
void OnUsePreferredAddress(
int family,
const PreferredAddress& preferred_address) override;
Expand Down
8 changes: 2 additions & 6 deletions src/quic/node_quic_socket-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ void QuicSocket::AssociateStatelessResetToken(
token_map_[token] = session;
}

const SocketAddress& QuicSocket::local_address() {
CHECK(preferred_endpoint_);
SocketAddress QuicSocket::local_address() const {
DCHECK(preferred_endpoint_);
return preferred_endpoint_->local_address();
}

Expand Down Expand Up @@ -221,10 +221,6 @@ void QuicSocket::AddEndpoint(
endpoint_->ReceiveStart();
}

void QuicSocket::SessionReady(BaseObjectPtr<QuicSession> session) {
listener_->OnSessionReady(session);
}

} // namespace quic
} // namespace node

Expand Down
Loading