quic: hopefully fixup windows build issues

Author: jasnell

src/quic/application.cc

@@ -3,6 +3,7 @@
 #include "application.h"
 #include <node_sockaddr-inl.h>
 #include <v8.h>
+#include "defs.h"
 #include "endpoint.h"
 #include "packet.h"
 #include "session.h"
@@ -378,9 +379,7 @@ class DefaultApplication final : public Session::Application {
  return i == cnt;
  };
 
- if (!stream_data.stream || !is_empty(stream_data.buf, stream_data.count))
- return false;
- return true;
+ return stream_data.stream && is_empty(stream_data.buf, stream_data.count);
  }
 
  bool StreamCommit(StreamData* stream_data, size_t datalen) override {

src/quic/bindingdata.h

@@ -149,7 +149,7 @@ constexpr size_t kMaxVectorCount = 16;
  V(max_connections_total, "maxConnectionsTotal") \
  V(max_datagram_frame_size, "maxDatagramFrameSize") \
  V(max_field_section_size, "maxFieldSectionSize") \
- V(max_header_length, "maxHeaderLength"); \
+ V(max_header_length, "maxHeaderLength")  \
  V(max_header_pairs, "maxHeaderPairs") \
  V(max_idle_timeout, "maxIdleTimeout") \
  V(max_payload_size, "maxPayloadSize") \

src/quic/endpoint.cc

@@ -298,7 +298,7 @@ class Endpoint::UDP::Impl final : public HandleWrap {
  return;
  }
 
- impl->endpoint_->Receive(uv_buf_t{buf->base, static_cast<size_t>(nread)},
+ impl->endpoint_->Receive(uv_buf_init(buf->base, static_cast<size_t>(nread)),
  SocketAddress(addr));
  }
 
@@ -459,7 +459,7 @@ void Endpoint::Initialize(Environment* env, Local<Object> target) {
 #undef V
 
 #define V(name, key, __) \
- auto IDX_STATE_ENDPOINT_##name = OffsetOf(&Endpoint::State::key);
+ auto IDX_STATE_ENDPOINT_##name = offsetof(Endpoint::State, key);
  ENDPOINT_STATE(V)
 #undef V
 

src/quic/endpoint.h

@@ -268,10 +268,10 @@ class Endpoint final : public AsyncWrap, public Packet::Listener {
  SET_MEMORY_INFO_NAME(Endpoint)
  SET_SELF_SIZE(Endpoint)
 
- private:
  struct Stats;
  struct State;
 
+ private:
  class UDP final : public MemoryRetainer {
  public:
  explicit UDP(Endpoint* endpoint);

src/quic/session.cc

@@ -2133,7 +2133,7 @@ void Session::Initialize(Environment* env, Local<Object> target) {
 #undef V
 
 #define V(name, key, __) \
- auto IDX_STATE_SESSION_##name = OffsetOf(&Session::State::key);
+ auto IDX_STATE_SESSION_##name = offsetof(Session::State, key);
  SESSION_STATE(V)
 #undef V
 

src/quic/session.h

@@ -68,9 +68,9 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
 
  // HTTP/3 specific options.
  uint64_t max_field_section_size = 0;
- size_t qpack_max_dtable_capacity = 0;
- size_t qpack_encoder_max_dtable_capacity = 0;
- size_t qpack_blocked_streams = 0;
+ uint64_t qpack_max_dtable_capacity = 0;
+ uint64_t qpack_encoder_max_dtable_capacity = 0;
+ uint64_t qpack_blocked_streams = 0;
 
  SET_NO_MEMORY_INFO()
  SET_MEMORY_INFO_NAME(Application::Options)
@@ -225,11 +225,12 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
  SET_MEMORY_INFO_NAME(Session)
  SET_SELF_SIZE(Session)
 
+ struct State;
+ struct Stats;
+
  private:
  struct Impl;
  struct MaybeCloseConnectionScope;
- struct State;
- struct Stats;
 
  using StreamsMap = std::unordered_map<int64_t, BaseObjectPtr<Stream>>;
  using QuicConnectionPointer = DeleteFnPtr<ngtcp2_conn, ngtcp2_conn_del>;

test/sequential/test-async-wrap-getasyncid.js

@@ -70,6 +70,8 @@ const { getSystemErrorName } = require('util');
  delete providers.QUIC_PACKET;
  delete providers.QUIC_UDP;
  delete providers.QUIC_ENDPOINT;
+ delete providers.QUIC_SESSION;
+ delete providers.QUIC_STREAM;
 
  const objKeys = Object.keys(providers);
  if (objKeys.length > 0)