diff --git a/src/quic/node_quic_socket.h b/src/quic/node_quic_socket.h index 8cc0954e6d..38956b3f4f 100644 --- a/src/quic/node_quic_socket.h +++ b/src/quic/node_quic_socket.h @@ -478,8 +478,8 @@ class QuicSocket : public AsyncWrap, QlogMode qlog_ = QlogMode::kDisabled; BaseObjectPtr server_secure_context_; std::string server_alpn_; - QuicCIDMap> sessions_; - QuicCIDMap dcid_to_scid_; + QuicCID::Map> sessions_; + QuicCID::Map dcid_to_scid_; uint8_t token_secret_[kTokenSecretLen]; uint8_t reset_token_secret_[NGTCP2_STATELESS_RESET_TOKENLEN]; @@ -498,7 +498,7 @@ class QuicSocket : public AsyncWrap, // remote address. SocketAddressMap reset_counts_; - StatelessResetTokenMap token_map_; + StatelessResetToken::Map token_map_; // The validated_addrs_ vector is used as an LRU cache for // validated addresses only when the VALIDATE_ADDRESS_LRU diff --git a/src/quic/node_quic_util.h b/src/quic/node_quic_util.h index 344d55ed8c..0b06e573f8 100644 --- a/src/quic/node_quic_util.h +++ b/src/quic/node_quic_util.h @@ -257,6 +257,9 @@ class QuicCID : public MemoryRetainer { SET_MEMORY_INFO_NAME(QuicCID) SET_SELF_SIZE(QuicCID) + template + using Map = std::unordered_map; + private: ngtcp2_cid cid_{}; const ngtcp2_cid* ptr_; @@ -324,23 +327,19 @@ class StatelessResetToken : public MemoryRetainer { SET_MEMORY_INFO_NAME(StatelessResetToken) SET_SELF_SIZE(StatelessResetToken) + template + using Map = + std::unordered_map< + StatelessResetToken, + BaseObjectPtr, + StatelessResetToken::Hash, + StatelessResetToken::Compare>; + private: uint8_t buf_[NGTCP2_STATELESS_RESET_TOKENLEN]; const uint8_t* token_; }; -template -using StatelessResetTokenMap = - std::unordered_map< - StatelessResetToken, - BaseObjectPtr, - StatelessResetToken::Hash, - StatelessResetToken::Compare>; - -template -using QuicCIDMap = - std::unordered_map; - template inline size_t get_length(const T*, size_t len);