quic: update more of the quic to the new compile guard

Signed-off-by: James M Snell <[email protected]>
PR-URL: #59342
Reviewed-By: Stephen Belanger <[email protected]>
Reviewed-By: Ethan Arrowood <[email protected]>

Author: jasnell

node.gyp

@@ -185,8 +185,15 @@
       'src/udp_wrap.cc',
       'src/util.cc',
       'src/uv.cc',
+      'src/quic/bindingdata.cc',
       'src/quic/cid.cc',
       'src/quic/data.cc',
+      'src/quic/logstream.cc',
+      'src/quic/packet.cc',
+      'src/quic/preferredaddress.cc',
+      'src/quic/sessionticket.cc',
+      'src/quic/tokens.cc',
+#      'src/quic/transportparams.cc',
       # headers to make for a more pleasant IDE experience
       'src/aliased_buffer.h',
       'src/aliased_buffer-inl.h',
@@ -323,9 +330,16 @@
       'src/udp_wrap.h',
       'src/util.h',
       'src/util-inl.h',
+      'src/quic/bindingdata.h',
       'src/quic/cid.h',
       'src/quic/data.h',
       'src/quic/defs.h',
+      'src/quic/logstream.h',
+      'src/quic/packet.h',
+      'src/quic/preferredaddress.h',
+      'src/quic/sessionticket.h',
+      'src/quic/tokens.h',
+#      'src/quic/transportparams.h',
       'src/quic/guard.h',
     ],
     'node_crypto_sources': [
@@ -390,31 +404,17 @@
     ],
     'node_quic_sources': [
       'src/quic/application.cc',
-      'src/quic/bindingdata.cc',
       'src/quic/endpoint.cc',
       'src/quic/http3.cc',
-      'src/quic/logstream.cc',
-      'src/quic/packet.cc',
-      'src/quic/preferredaddress.cc',
       'src/quic/session.cc',
-      'src/quic/sessionticket.cc',
       'src/quic/streams.cc',
       'src/quic/tlscontext.cc',
-      'src/quic/tokens.cc',
-      'src/quic/transportparams.cc',
       'src/quic/application.h',
-      'src/quic/bindingdata.h',
       'src/quic/endpoint.h',
       'src/quic/http3.h',
-      'src/quic/logstream.h',
-      'src/quic/packet.h',
-      'src/quic/preferredaddress.h',
       'src/quic/session.h',
-      'src/quic/sessionticket.h',
       'src/quic/streams.h',
       'src/quic/tlscontext.h',
-      'src/quic/tokens.h',
-      'src/quic/transportparams.h',
       'src/quic/quic.cc',
     ],
     'node_cctest_openssl_sources': [
@@ -423,6 +423,7 @@
       'test/cctest/test_node_crypto_env.cc',
       'test/cctest/test_quic_cid.cc',
       'test/cctest/test_quic_error.cc',
+      'test/cctest/test_quic_preferredaddress.cc',
       'test/cctest/test_quic_tokens.cc',
     ],
     'node_cctest_inspector_sources': [

src/quic/application.cc

@@ -290,7 +290,7 @@ void Session::Application::SendPendingData() {
     // The stream_data is the next block of data from the application stream.
     if (GetStreamData(&stream_data) < 0) {
       Debug(session_, "Application failed to get stream data");
-      packet->Done(UV_ECANCELED);
+      packet->CancelPacket();
       session_->SetLastError(QuicError::ForNgtcp2Error(NGTCP2_ERR_INTERNAL));
       return session_->Close(CloseMethod::SILENT);
     }
@@ -357,7 +357,7 @@ void Session::Application::SendPendingData() {
           if (ndatalen >= 0 && !StreamCommit(&stream_data, ndatalen)) {
             Debug(session_,
                   "Failed to commit stream data while writing packets");
-            packet->Done(UV_ECANCELED);
+            packet->CancelPacket();;
             session_->SetLastError(
                 QuicError::ForNgtcp2Error(NGTCP2_ERR_INTERNAL));
             return session_->Close(CloseMethod::SILENT);
@@ -371,11 +371,11 @@ void Session::Application::SendPendingData() {
       Debug(session_,
             "Application encountered error while writing packet: %s",
             ngtcp2_strerror(nwrite));
-      packet->Done(UV_ECANCELED);
+      packet->CancelPacket();
       session_->SetLastError(QuicError::ForNgtcp2Error(nwrite));
       return session_->Close(CloseMethod::SILENT);
     } else if (ndatalen >= 0 && !StreamCommit(&stream_data, ndatalen)) {
-      packet->Done(UV_ECANCELED);
+      packet->CancelPacket();
       session_->SetLastError(QuicError::ForNgtcp2Error(NGTCP2_ERR_INTERNAL));
       return session_->Close(CloseMethod::SILENT);
     }
@@ -394,7 +394,7 @@ void Session::Application::SendPendingData() {
         packet->Truncate(datalen);
         session_->Send(packet, path);
       } else {
-        packet->Done(UV_ECANCELED);
+        packet->CancelPacket();
       }
 
       return;

src/quic/bindingdata.cc

@@ -1,4 +1,6 @@
-#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
+#if HAVE_OPENSSL
+#include "guard.h"
+#ifndef OPENSSL_NO_QUIC
 #include "bindingdata.h"
 #include <base_object-inl.h>
 #include <env-inl.h>
@@ -49,10 +51,12 @@ void BindingData::CheckAllocatedSize(size_t previous_size) const {
 }
 
 void BindingData::IncreaseAllocatedSize(size_t size) {
+  CHECK_GE(current_ngtcp2_memory_ + size, current_ngtcp2_memory_);
   current_ngtcp2_memory_ += size;
 }
 
 void BindingData::DecreaseAllocatedSize(size_t size) {
+  CHECK_LE(current_ngtcp2_memory_ - size, current_ngtcp2_memory_);
   current_ngtcp2_memory_ -= size;
 }
 
@@ -220,4 +224,5 @@ void IllegalConstructor(const FunctionCallbackInfo<Value>& args) {
 }  // namespace quic
 }  // namespace node
 
-#endif  // HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
+#endif  // OPENSSL_NO_QUIC
+#endif  // HAVE_OPENSSL

src/quic/bindingdata.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
 
 #include <base_object.h>
 #include <env.h>
@@ -26,32 +25,32 @@ class Packet;
 // The FunctionTemplates the BindingData will store for us.
 #define QUIC_CONSTRUCTORS(V)                                                   \
   V(endpoint)                                                                  \
+  V(http3application)                                                          \
   V(logstream)                                                                 \
   V(packet)                                                                    \
   V(session)                                                                   \
   V(stream)                                                                    \
-  V(udp)                                                                       \
-  V(http3application)
+  V(udp)
 
 // The callbacks are persistent v8::Function references that are set in the
 // quic::BindingState used to communicate data and events back out to the JS
 // environment. They are set once from the JavaScript side when the
 // internalBinding('quic') is first loaded.
 #define QUIC_JS_CALLBACKS(V)                                                   \
   V(endpoint_close, EndpointClose)                                             \
-  V(session_new, SessionNew)                                                   \
   V(session_close, SessionClose)                                               \
   V(session_datagram, SessionDatagram)                                         \
   V(session_datagram_status, SessionDatagramStatus)                            \
   V(session_handshake, SessionHandshake)                                       \
+  V(session_new, SessionNew)                                                   \
+  V(session_path_validation, SessionPathValidation)                            \
   V(session_ticket, SessionTicket)                                             \
   V(session_version_negotiation, SessionVersionNegotiation)                    \
-  V(session_path_validation, SessionPathValidation)                            \
+  V(stream_blocked, StreamBlocked)                                             \
   V(stream_close, StreamClose)                                                 \
   V(stream_created, StreamCreated)                                             \
-  V(stream_reset, StreamReset)                                                 \
   V(stream_headers, StreamHeaders)                                             \
-  V(stream_blocked, StreamBlocked)                                             \
+  V(stream_reset, StreamReset)                                                 \
   V(stream_trailers, StreamTrailers)
 
 // The various JS strings the implementation uses.
@@ -64,10 +63,10 @@ class Packet;
   V(application_provider, "provider")                                          \
   V(bbr, "bbr")                                                                \
   V(ca, "ca")                                                                  \
-  V(certs, "certs")                                                            \
   V(cc_algorithm, "cc")                                                        \
-  V(crl, "crl")                                                                \
+  V(certs, "certs")                                                            \
   V(ciphers, "ciphers")                                                        \
+  V(crl, "crl")                                                                \
   V(cubic, "cubic")                                                            \
   V(disable_stateless_reset, "disableStatelessReset")                          \
   V(enable_connect_protocol, "enableConnectProtocol")                          \
@@ -114,8 +113,8 @@ class Packet;
   V(qpack_max_dtable_capacity, "qpackMaxDTableCapacity")                       \
   V(reject_unauthorized, "rejectUnauthorized")                                 \
   V(reno, "reno")                                                              \
-  V(retry_token_expiration, "retryTokenExpiration")                            \
   V(reset_token_secret, "resetTokenSecret")                                    \
+  V(retry_token_expiration, "retryTokenExpiration")                            \
   V(rx_loss, "rxDiagnosticLoss")                                               \
   V(servername, "servername")                                                  \
   V(session, "Session")                                                        \
@@ -150,6 +149,9 @@ class BindingData final
   static void RegisterExternalReferences(ExternalReferenceRegistry* registry);
 
   static BindingData& Get(Environment* env);
+  static inline BindingData& Get(Realm* realm) {
+    return Get(realm->env());
+  }
 
   BindingData(Realm* realm, v8::Local<v8::Object> object);
   DISALLOW_COPY_AND_MOVE(BindingData)
@@ -179,6 +181,7 @@ class BindingData final
 
   bool in_ngtcp2_callback_scope = false;
   bool in_nghttp3_callback_scope = false;
+  size_t current_ngtcp2_memory_ = 0;
 
   // The following set up various storage and accessors for common strings,
   // construction templates, and callbacks stored on the BindingData. These
@@ -205,8 +208,6 @@ class BindingData final
   QUIC_JS_CALLBACKS(V)
 #undef V
 
-  size_t current_ngtcp2_memory_ = 0;
-
 #define V(name) v8::Global<v8::FunctionTemplate> name##_constructor_template_;
   QUIC_CONSTRUCTORS(V)
 #undef V
@@ -229,15 +230,15 @@ void IllegalConstructor(const v8::FunctionCallbackInfo<v8::Value>& args);
 // The ngtcp2 and nghttp3 callbacks have certain restrictions
 // that forbid re-entry. We provide the following scopes for
 // use in those to help protect against it.
-struct NgTcp2CallbackScope {
+struct NgTcp2CallbackScope final {
   Environment* env;
   explicit NgTcp2CallbackScope(Environment* env);
   DISALLOW_COPY_AND_MOVE(NgTcp2CallbackScope)
   ~NgTcp2CallbackScope();
   static bool in_ngtcp2_callback(Environment* env);
 };
 
-struct NgHttp3CallbackScope {
+struct NgHttp3CallbackScope final {
   Environment* env;
   explicit NgHttp3CallbackScope(Environment* env);
   DISALLOW_COPY_AND_MOVE(NgHttp3CallbackScope)
@@ -268,5 +269,4 @@ struct CallbackScope final : public CallbackScopeBase {
 
 }  // namespace node::quic
 
-#endif  // HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

src/quic/endpoint.cc

@@ -751,14 +751,14 @@ void Endpoint::Send(const BaseObjectPtr<Packet>& packet) {
   // dropped. This can happen to any type of packet. We use this only in
   // testing to test various reliability issues.
   if (is_diagnostic_packet_loss(options_.tx_loss)) [[unlikely]] {
-    packet->Done(0);
+    packet->Done();
     // Simulating tx packet loss
     return;
   }
 #endif  // DEBUG
 
   if (is_closed() || is_closing() || packet->length() == 0) {
-    packet->Done(UV_ECANCELED);
+    packet->CancelPacket();
     return;
   }
   Debug(this, "Sending %s", packet->ToString());

src/quic/logstream.cc

@@ -1,5 +1,6 @@
-#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
-
+#if HAVE_OPENSSL
+#include "guard.h"
+#ifndef OPENSSL_NO_QUIC
 #include "logstream.h"
 #include <async_wrap-inl.h>
 #include <base_object-inl.h>
@@ -149,4 +150,5 @@ void LogStream::ensure_space(size_t amt) {
 }  // namespace quic
 }  // namespace node
 
-#endif  // HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
+#endif  // OPENSSL_NO_QUIC
+#endif  // HAVE_OPENSSL

src/quic/logstream.h

@@ -1,19 +1,18 @@
 #pragma once
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
 
 #include <async_wrap.h>
 #include <base_object.h>
 #include <env.h>
 #include <stream_base.h>
-#include <deque>
+#include <list>
 
 namespace node::quic {
 
 // The LogStream is a utility that the QUIC impl uses to publish both QLog
 // and Keylog diagnostic data (one instance for each).
-class LogStream : public AsyncWrap, public StreamBase {
+class LogStream final : public AsyncWrap, public StreamBase {
  public:
   static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
       Environment* env);
@@ -22,7 +21,7 @@ class LogStream : public AsyncWrap, public StreamBase {
 
   LogStream(Environment* env, v8::Local<v8::Object> obj);
 
-  enum class EmitOption {
+  enum class EmitOption : uint8_t {
     NONE,
     FIN,
   };
@@ -61,10 +60,10 @@ class LogStream : public AsyncWrap, public StreamBase {
     uv_buf_t buf;
   };
   size_t total_ = 0;
+  std::list<Chunk> buffer_;
   bool fin_seen_ = false;
   bool ended_ = false;
   bool reading_ = false;
-  std::deque<Chunk> buffer_;
 
   // The value here is fairly arbitrary. Once we get everything
   // fully implemented and start working with this, we might
@@ -77,5 +76,4 @@ class LogStream : public AsyncWrap, public StreamBase {
 
 }  // namespace node::quic
 
-#endif  // HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS