Move QuicCryptoServerStream::Helper to QuicCryptoServerStreamBase gfe-relnote: rename class - no behavior change PiperOrigin-RevId: 296246242 Change-Id: I68425fe4ba7a2040eed4bf93835639e6f353a406
diff --git a/quic/core/http/quic_server_session_base.cc b/quic/core/http/quic_server_session_base.cc index f52c19d..3a7dd98 100644 --- a/quic/core/http/quic_server_session_base.cc +++ b/quic/core/http/quic_server_session_base.cc
@@ -22,7 +22,7 @@ const ParsedQuicVersionVector& supported_versions, QuicConnection* connection, Visitor* visitor, - QuicCryptoServerStream::Helper* helper, + QuicCryptoServerStreamBase::Helper* helper, const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache) : QuicSpdySession(connection, visitor, config, supported_versions),
diff --git a/quic/core/http/quic_server_session_base.h b/quic/core/http/quic_server_session_base.h index f2c7ab3..3561e28 100644 --- a/quic/core/http/quic_server_session_base.h +++ b/quic/core/http/quic_server_session_base.h
@@ -38,7 +38,7 @@ const ParsedQuicVersionVector& supported_versions, QuicConnection* connection, QuicSession::Visitor* visitor, - QuicCryptoServerStream::Helper* helper, + QuicCryptoServerStreamBase::Helper* helper, const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache); QuicServerSessionBase(const QuicServerSessionBase&) = delete; @@ -93,7 +93,7 @@ const QuicCryptoServerConfig* crypto_config() { return crypto_config_; } - QuicCryptoServerStream::Helper* stream_helper() { return helper_; } + QuicCryptoServerStreamBase::Helper* stream_helper() { return helper_; } private: friend class test::QuicServerSessionBasePeer; @@ -109,7 +109,7 @@ // Pointer to the helper used to create crypto server streams. Must outlive // streams created via CreateQuicCryptoServerStream. - QuicCryptoServerStream::Helper* helper_; + QuicCryptoServerStreamBase::Helper* helper_; // Whether bandwidth resumption is enabled for this connection. bool bandwidth_resumption_enabled_;
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc index 33a1ab8..3e9437f 100644 --- a/quic/core/http/quic_server_session_base_test.cc +++ b/quic/core/http/quic_server_session_base_test.cc
@@ -54,7 +54,7 @@ TestServerSession(const QuicConfig& config, QuicConnection* connection, QuicSession::Visitor* visitor, - QuicCryptoServerStream::Helper* helper, + QuicCryptoServerStreamBase::Helper* helper, const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSimpleServerBackend* quic_simple_server_backend) @@ -462,7 +462,7 @@ const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicServerSessionBase* session, - QuicCryptoServerStream::Helper* helper) + QuicCryptoServerStreamBase::Helper* helper) : QuicCryptoServerStream(crypto_config, compressed_certs_cache, session,
diff --git a/quic/core/quic_crypto_server_handshaker.cc b/quic/core/quic_crypto_server_handshaker.cc index 6150642..a4994a0 100644 --- a/quic/core/quic_crypto_server_handshaker.cc +++ b/quic/core/quic_crypto_server_handshaker.cc
@@ -51,7 +51,7 @@ QuicCryptoServerStream* stream, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - QuicCryptoServerStream::Helper* helper) + QuicCryptoServerStreamBase::Helper* helper) : QuicCryptoHandshaker(stream, session), stream_(stream), session_(session),
diff --git a/quic/core/quic_crypto_server_handshaker.h b/quic/core/quic_crypto_server_handshaker.h index e6d5cae..257ee16 100644 --- a/quic/core/quic_crypto_server_handshaker.h +++ b/quic/core/quic_crypto_server_handshaker.h
@@ -31,7 +31,7 @@ QuicCryptoServerStream* stream, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - QuicCryptoServerStream::Helper* helper); + QuicCryptoServerStreamBase::Helper* helper); QuicCryptoServerHandshaker(const QuicCryptoServerHandshaker&) = delete; QuicCryptoServerHandshaker& operator=(const QuicCryptoServerHandshaker&) = delete; @@ -182,7 +182,7 @@ std::string chlo_hash_; // Pointer to the helper for this crypto stream. Must outlive this stream. - QuicCryptoServerStream::Helper* helper_; + QuicCryptoServerStreamBase::Helper* helper_; // Number of handshake messages received by this stream. uint8_t num_handshake_messages_;
diff --git a/quic/core/quic_crypto_server_stream.cc b/quic/core/quic_crypto_server_stream.cc index 234ecca..dbbb541 100644 --- a/quic/core/quic_crypto_server_stream.cc +++ b/quic/core/quic_crypto_server_stream.cc
@@ -31,7 +31,7 @@ const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - QuicCryptoServerStream::Helper* helper) { + QuicCryptoServerStreamBase::Helper* helper) { switch (session->connection()->version().handshake_protocol) { case PROTOCOL_QUIC_CRYPTO: return std::unique_ptr<QuicCryptoServerStream>(new QuicCryptoServerStream( @@ -52,7 +52,7 @@ const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - Helper* helper) + QuicCryptoServerStreamBase::Helper* helper) : QuicCryptoServerStream(crypto_config, compressed_certs_cache, session, @@ -63,7 +63,7 @@ const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - Helper* helper, + QuicCryptoServerStreamBase::Helper* helper, std::unique_ptr<HandshakerInterface> handshaker) : QuicCryptoServerStreamBase(session), handshaker_(std::move(handshaker)), @@ -196,7 +196,7 @@ return compressed_certs_cache_; } -QuicCryptoServerStream::Helper* QuicCryptoServerStream::helper() const { +QuicCryptoServerStreamBase::Helper* QuicCryptoServerStream::helper() const { return helper_; }
diff --git a/quic/core/quic_crypto_server_stream.h b/quic/core/quic_crypto_server_stream.h index d6e621b..f96c45a 100644 --- a/quic/core/quic_crypto_server_stream.h +++ b/quic/core/quic_crypto_server_stream.h
@@ -31,6 +31,20 @@ public: explicit QuicCryptoServerStreamBase(QuicSession* session); + class QUIC_EXPORT_PRIVATE Helper { + public: + virtual ~Helper() {} + + // Returns true if |message|, which was received on |self_address| is + // acceptable according to the visitor's policy. Otherwise, returns false + // and populates |error_details|. + virtual bool CanAcceptClientHello(const CryptoHandshakeMessage& message, + const QuicSocketAddress& client_address, + const QuicSocketAddress& peer_address, + const QuicSocketAddress& self_address, + std::string* error_details) const = 0; + }; + ~QuicCryptoServerStreamBase() override {} // Cancel any outstanding callbacks, such as asynchronous validation of client @@ -136,20 +150,6 @@ virtual size_t BufferSizeLimitForLevel(EncryptionLevel level) const = 0; }; - class QUIC_EXPORT_PRIVATE Helper { - public: - virtual ~Helper() {} - - // Returns true if |message|, which was received on |self_address| is - // acceptable according to the visitor's policy. Otherwise, returns false - // and populates |error_details|. - virtual bool CanAcceptClientHello(const CryptoHandshakeMessage& message, - const QuicSocketAddress& client_address, - const QuicSocketAddress& peer_address, - const QuicSocketAddress& self_address, - std::string* error_details) const = 0; - }; - QuicCryptoServerStream(const QuicCryptoServerStream&) = delete; QuicCryptoServerStream& operator=(const QuicCryptoServerStream&) = delete; @@ -185,12 +185,12 @@ CreateCryptoServerStream(const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - Helper* helper); + QuicCryptoServerStreamBase::Helper* helper); QuicCryptoServerStream(const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - Helper* helper); + QuicCryptoServerStreamBase::Helper* helper); // Provided so that subclasses can provide their own handshaker. // set_handshaker can only be called if this QuicCryptoServerStream's // handshaker hasn't been set yet. If set_handshaker is called outside of @@ -199,14 +199,14 @@ QuicCryptoServerStream(const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - Helper* helper, + QuicCryptoServerStreamBase::Helper* helper, std::unique_ptr<HandshakerInterface> handshaker); void set_handshaker(std::unique_ptr<HandshakerInterface> handshaker); HandshakerInterface* handshaker() const; const QuicCryptoServerConfig* crypto_config() const; QuicCompressedCertsCache* compressed_certs_cache() const; - Helper* helper() const; + QuicCryptoServerStreamBase::Helper* helper() const; private: std::unique_ptr<HandshakerInterface> handshaker_; @@ -215,7 +215,7 @@ // passed to the HandshakerInterface constructor in its late construction. const QuicCryptoServerConfig* crypto_config_; QuicCompressedCertsCache* compressed_certs_cache_; - Helper* helper_; + QuicCryptoServerStreamBase::Helper* helper_; }; // Creates an appropriate QuicCryptoServerStream for the provided parameters, @@ -226,7 +226,7 @@ CreateCryptoServerStream(const QuicCryptoServerConfig* crypto_config, QuicCompressedCertsCache* compressed_certs_cache, QuicSession* session, - QuicCryptoServerStream::Helper* helper); + QuicCryptoServerStreamBase::Helper* helper); } // namespace quic
diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc index bcb7cd1..a92dfb7 100644 --- a/quic/core/quic_dispatcher.cc +++ b/quic/core/quic_dispatcher.cc
@@ -221,7 +221,7 @@ const QuicCryptoServerConfig* crypto_config, QuicVersionManager* version_manager, std::unique_ptr<QuicConnectionHelperInterface> helper, - std::unique_ptr<QuicCryptoServerStream::Helper> session_helper, + std::unique_ptr<QuicCryptoServerStreamBase::Helper> session_helper, std::unique_ptr<QuicAlarmFactory> alarm_factory, uint8_t expected_server_connection_id_length) : config_(config),
diff --git a/quic/core/quic_dispatcher.h b/quic/core/quic_dispatcher.h index 3c57ec5..aae7e6c 100644 --- a/quic/core/quic_dispatcher.h +++ b/quic/core/quic_dispatcher.h
@@ -43,13 +43,14 @@ // Ideally we'd have a linked_hash_set: the boolean is unused. typedef QuicLinkedHashMap<QuicBlockedWriterInterface*, bool> WriteBlockedList; - QuicDispatcher(const QuicConfig* config, - const QuicCryptoServerConfig* crypto_config, - QuicVersionManager* version_manager, - std::unique_ptr<QuicConnectionHelperInterface> helper, - std::unique_ptr<QuicCryptoServerStream::Helper> session_helper, - std::unique_ptr<QuicAlarmFactory> alarm_factory, - uint8_t expected_server_connection_id_length); + QuicDispatcher( + const QuicConfig* config, + const QuicCryptoServerConfig* crypto_config, + QuicVersionManager* version_manager, + std::unique_ptr<QuicConnectionHelperInterface> helper, + std::unique_ptr<QuicCryptoServerStreamBase::Helper> session_helper, + std::unique_ptr<QuicAlarmFactory> alarm_factory, + uint8_t expected_server_connection_id_length); QuicDispatcher(const QuicDispatcher&) = delete; QuicDispatcher& operator=(const QuicDispatcher&) = delete; @@ -210,7 +211,7 @@ QuicConnectionHelperInterface* helper() { return helper_.get(); } - QuicCryptoServerStream::Helper* session_helper() { + QuicCryptoServerStreamBase::Helper* session_helper() { return session_helper_.get(); } @@ -338,7 +339,7 @@ std::unique_ptr<QuicConnectionHelperInterface> helper_; // The helper used for all sessions. - std::unique_ptr<QuicCryptoServerStream::Helper> session_helper_; + std::unique_ptr<QuicCryptoServerStreamBase::Helper> session_helper_; // Creates alarms. std::unique_ptr<QuicAlarmFactory> alarm_factory_;
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc index 4ce9fa2..66b9e2e 100644 --- a/quic/core/quic_dispatcher_test.cc +++ b/quic/core/quic_dispatcher_test.cc
@@ -93,7 +93,7 @@ stream_helper()); } - QuicCryptoServerStream::Helper* stream_helper() { + QuicCryptoServerStreamBase::Helper* stream_helper() { return QuicServerSessionBase::stream_helper(); } }; @@ -108,7 +108,7 @@ crypto_config, version_manager, std::make_unique<MockQuicConnectionHelper>(), - std::unique_ptr<QuicCryptoServerStream::Helper>( + std::unique_ptr<QuicCryptoServerStreamBase::Helper>( new QuicSimpleCryptoServerStreamHelper()), std::make_unique<MockAlarmFactory>(), kQuicDefaultConnectionIdLength),