quic: use getter/setter for stateless reset toggle

PR-URL: #34247 Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · Jul 9, 2020 · d08e99d · d08e99d
1 parent f2753c7
commit d08e99d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/lib/internal/quic/core.js b/lib/internal/quic/core.js
@@ -857,6 +857,7 @@ class QuicSocket extends EventEmitter {
     serverSecureContext: undefined,
     sessions: new Set(),
     state: kSocketUnbound,
+    statelessResetEnabled: true,
     stats: undefined,
   };
 
@@ -1613,16 +1614,19 @@ class QuicSocket extends EventEmitter {
     this[kHandle].setDiagnosticPacketLoss(rx, tx);
   }
 
-  // Toggles stateless reset on/off. By default, stateless reset tokens
-  // are generated when necessary. The disableStatelessReset option may
-  // be used when the QuicSocket is created to disable generation of
-  // stateless resets. The toggleStatelessReset method allows the setting
-  // to be switched on/off dynamically through the lifetime of the
-  // socket.
-  toggleStatelessReset() {
-    if (this[kInternalState].state === kSocketDestroyed)
-      throw new ERR_QUICSOCKET_DESTROYED('toggleStatelessReset');
-    return this[kHandle].toggleStatelessReset();
+  get statelessResetEnabled() {
+    return this[kInternalState].statelessResetEnabled;
+  }
+
+  set statelessResetEnabled(on) {
+    const state = this[kInternalState];
+    if (state.state === kSocketDestroyed)
+      throw new ERR_QUICSOCKET_DESTROYED('serverBusy');
+    validateBoolean(on, 'on');
+    if (state.statelessResetEnabled !== on) {
+      this[kHandle].enableStatelessReset(on);
+      state.statelessResetEnabled = on;
+    }
   }
 }
 

diff --git a/src/quic/node_quic_socket-inl.h b/src/quic/node_quic_socket-inl.h
@@ -173,8 +173,8 @@ void QuicSocket::set_diagnostic_packet_loss(double rx, double tx) {
   tx_loss_ = tx;
 }
 
-bool QuicSocket::ToggleStatelessReset() {
-  set_stateless_reset_disabled(!is_stateless_reset_disabled());
+bool QuicSocket::EnableStatelessReset(bool on) {
+  set_stateless_reset_disabled(!on);
   return !is_stateless_reset_disabled();
 }
 

diff --git a/src/quic/node_quic_socket.cc b/src/quic/node_quic_socket.cc
@@ -1128,10 +1128,11 @@ void QuicSocketSetServerBusy(const FunctionCallbackInfo<Value>& args) {
   socket->ServerBusy(args[0]->IsTrue());
 }
 
-void QuicSocketToggleStatelessReset(const FunctionCallbackInfo<Value>& args) {
+void QuicSocketEnableStatelessReset(const FunctionCallbackInfo<Value>& args) {
   QuicSocket* socket;
   ASSIGN_OR_RETURN_UNWRAP(&socket, args.Holder());
-  args.GetReturnValue().Set(socket->ToggleStatelessReset());
+  CHECK_EQ(args.Length(), 1);
+  args.GetReturnValue().Set(socket->EnableStatelessReset(args[0]->IsTrue()));
 }
 
 void QuicEndpointWaitForPendingCallbacks(
@@ -1197,8 +1198,8 @@ void QuicSocket::Initialize(
                       "stopListening",
                       QuicSocketStopListening);
   env->SetProtoMethod(socket,
-                      "toggleStatelessReset",
-                      QuicSocketToggleStatelessReset);
+                      "enableStatelessReset",
+                      QuicSocketEnableStatelessReset);
   socket->Inherit(HandleWrap::GetConstructorTemplate(env));
   target->Set(context, class_name,
               socket->GetFunction(env->context()).ToLocalChecked()).FromJust();

diff --git a/src/quic/node_quic_socket.h b/src/quic/node_quic_socket.h
@@ -384,7 +384,7 @@ class QuicSocket : public AsyncWrap,
   // Toggles whether or not stateless reset is enabled or not.
   // Returns true if stateless reset is enabled, false if it
   // is not.
-  inline bool ToggleStatelessReset();
+  inline bool EnableStatelessReset(bool on = true);
 
   BaseObjectPtr<crypto::SecureContext> server_secure_context() const {
     return server_secure_context_;