Run include_cleaner on //third_party/quic/masque PiperOrigin-RevId: 597315664
diff --git a/quiche/common/platform/api/quiche_command_line_flags.h b/quiche/common/platform/api/quiche_command_line_flags.h index 57caeb3..b3e53ce 100644 --- a/quiche/common/platform/api/quiche_command_line_flags.h +++ b/quiche/common/platform/api/quiche_command_line_flags.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "quiche_platform_impl/quiche_command_line_flags_impl.h" +#include "quiche_platform_impl/quiche_command_line_flags_impl.h" // IWYU pragma: export // Define a command-line flag that can be automatically set via // QuicheParseCommandLineFlags(). The macro has to be called in the .cc file of
diff --git a/quiche/quic/masque/masque_client.cc b/quiche/quic/masque/masque_client.cc index 3d64ed4..f55fff6 100644 --- a/quiche/quic/masque/masque_client.cc +++ b/quiche/quic/masque/masque_client.cc
@@ -4,11 +4,25 @@ #include "quiche/quic/masque/masque_client.h" +#include <cstdint> +#include <memory> #include <string> +#include <utility> #include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "quiche/quic/core/crypto/proof_verifier.h" +#include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/quic/tools/quic_default_client.h" #include "quiche/quic/tools/quic_name_lookup.h" #include "quiche/quic/tools/quic_url.h"
diff --git a/quiche/quic/masque/masque_client.h b/quiche/quic/masque/masque_client.h index d3332ac..c36b589 100644 --- a/quiche/quic/masque/masque_client.h +++ b/quiche/quic/masque/masque_client.h
@@ -5,12 +5,19 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_CLIENT_H_ #define QUICHE_QUIC_MASQUE_MASQUE_CLIENT_H_ +#include <memory> #include <string> +#include "quiche/quic/core/crypto/proof_verifier.h" #include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_default_client.h" namespace quic {
diff --git a/quiche/quic/masque/masque_client_bin.cc b/quiche/quic/masque/masque_client_bin.cc index a52c518..2246c69 100644 --- a/quiche/quic/masque/masque_client_bin.cc +++ b/quiche/quic/masque/masque_client_bin.cc
@@ -7,31 +7,39 @@ // HTTP/3 requests to web servers tunnelled over that MASQUE connection. // e.g.: masque_client $PROXY_HOST:$PROXY_PORT $URL1 $URL2 +#include <cstddef> #include <cstdint> #include <iostream> #include <memory> #include <string> +#include <utility> #include <vector> #include "absl/strings/escaping.h" +#include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "openssl/curve25519.h" +#include "quiche/quic/core/crypto/proof_verifier.h" #include "quiche/quic/core/io/quic_default_event_loop.h" #include "quiche/quic/core/io/quic_event_loop.h" #include "quiche/quic/core/quic_default_clock.h" -#include "quiche/quic/core/quic_server_id.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_udp_socket.h" #include "quiche/quic/masque/masque_client.h" +#include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/masque/masque_client_tools.h" -#include "quiche/quic/masque/masque_encapsulated_client.h" #include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_bug_tracker.h" #include "quiche/quic/platform/api/quic_default_proof_providers.h" -#include "quiche/quic/platform/api/quic_flags.h" -#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_logging.h" #include "quiche/quic/tools/fake_proof_verifier.h" +#include "quiche/common/capsule.h" #include "quiche/common/platform/api/quiche_command_line_flags.h" #include "quiche/common/platform/api/quiche_googleurl.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_system_event_loop.h" DEFINE_QUICHE_COMMAND_LINE_FLAG(
diff --git a/quiche/quic/masque/masque_client_session.cc b/quiche/quic/masque/masque_client_session.cc index 258394d..ede64e6 100644 --- a/quiche/quic/masque/masque_client_session.cc +++ b/quiche/quic/masque/masque_client_session.cc
@@ -8,9 +8,9 @@ #include <cstring> #include <optional> #include <string> +#include <utility> #include <vector> -#include "absl/algorithm/container.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/escaping.h" @@ -18,15 +18,32 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "openssl/curve25519.h" -#include "quiche/quic/core/http/spdy_utils.h" +#include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" +#include "quiche/quic/core/http/http_frames.h" +#include "quiche/quic/core/http/quic_spdy_client_session.h" +#include "quiche/quic/core/http/quic_spdy_client_stream.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" #include "quiche/quic/core/quic_data_reader.h" #include "quiche/quic/core/quic_data_writer.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_server_id.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" #include "quiche/quic/core/quic_utils.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_bug_tracker.h" +#include "quiche/quic/platform/api/quic_logging.h" #include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_url.h" +#include "quiche/common/capsule.h" #include "quiche/common/platform/api/quiche_googleurl.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_url_utils.h" +#include "quiche/common/quiche_ip_address.h" +#include "quiche/common/quiche_random.h" #include "quiche/common/quiche_text_utils.h" #include "quiche/spdy/core/http2_header_block.h"
diff --git a/quiche/quic/masque/masque_client_session.h b/quiche/quic/masque/masque_client_session.h index eeb317a..7429f91 100644 --- a/quiche/quic/masque/masque_client_session.h +++ b/quiche/quic/masque/masque_client_session.h
@@ -5,15 +5,31 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_CLIENT_SESSION_H_ #define QUICHE_QUIC_MASQUE_MASQUE_CLIENT_SESSION_H_ +#include <list> +#include <optional> #include <string> #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" +#include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" +#include "quiche/quic/core/http/http_frames.h" #include "quiche/quic/core/http/quic_spdy_client_session.h" +#include "quiche/quic/core/http/quic_spdy_client_stream.h" +#include "quiche/quic/core/http/quic_spdy_session.h" +#include "quiche/quic/core/http/quic_spdy_stream.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_export.h" #include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_url.h" +#include "quiche/common/capsule.h" +#include "quiche/common/quiche_ip_address.h" +#include "quiche/spdy/core/http2_header_block.h" namespace quic {
diff --git a/quiche/quic/masque/masque_client_tools.cc b/quiche/quic/masque/masque_client_tools.cc index 318cb78..0cb1d59 100644 --- a/quiche/quic/masque/masque_client_tools.cc +++ b/quiche/quic/masque/masque_client_tools.cc
@@ -4,14 +4,28 @@ #include "quiche/quic/masque/masque_client_tools.h" +#include <memory> #include <optional> +#include <ostream> +#include <string> +#include <utility> +#include "absl/strings/str_cat.h" +#include "quiche/quic/core/crypto/proof_verifier.h" +#include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/masque/masque_client.h" +#include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/masque/masque_encapsulated_client.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_default_proof_providers.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/fake_proof_verifier.h" #include "quiche/quic/tools/quic_name_lookup.h" #include "quiche/quic/tools/quic_url.h" +#include "quiche/common/platform/api/quiche_logging.h" +#include "quiche/common/quiche_ip_address.h" #include "quiche/spdy/core/http2_header_block.h" namespace quic {
diff --git a/quiche/quic/masque/masque_client_tools.h b/quiche/quic/masque/masque_client_tools.h index 932fdfa..fc7c4c6 100644 --- a/quiche/quic/masque/masque_client_tools.h +++ b/quiche/quic/masque/masque_client_tools.h
@@ -5,6 +5,9 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_CLIENT_TOOLS_H_ #define QUICHE_QUIC_MASQUE_MASQUE_CLIENT_TOOLS_H_ +#include <string> + +#include "quiche/quic/core/io/quic_event_loop.h" #include "quiche/quic/masque/masque_client.h" namespace quic {
diff --git a/quiche/quic/masque/masque_dispatcher.cc b/quiche/quic/masque/masque_dispatcher.cc index 788707d..5ce5d02 100644 --- a/quiche/quic/masque/masque_dispatcher.cc +++ b/quiche/quic/masque/masque_dispatcher.cc
@@ -4,10 +4,28 @@ #include "quiche/quic/masque/masque_dispatcher.h" +#include <cstdint> +#include <memory> +#include <utility> + +#include "absl/strings/string_view.h" #include "quiche/quic/core/connection_id_generator.h" +#include "quiche/quic/core/crypto/quic_crypto_server_config.h" +#include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_alarm_factory.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_crypto_server_stream_base.h" +#include "quiche/quic/core/quic_session.h" #include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_version_manager.h" #include "quiche/quic/core/quic_versions.h" +#include "quiche/quic/masque/masque_server_backend.h" #include "quiche/quic/masque/masque_server_session.h" +#include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/quic/tools/quic_simple_dispatcher.h" namespace quic {
diff --git a/quiche/quic/masque/masque_dispatcher.h b/quiche/quic/masque/masque_dispatcher.h index 06750a6..f9a0825 100644 --- a/quiche/quic/masque/masque_dispatcher.h +++ b/quiche/quic/masque/masque_dispatcher.h
@@ -6,14 +6,25 @@ #define QUICHE_QUIC_MASQUE_MASQUE_DISPATCHER_H_ #include <cstdint> +#include <memory> +#include "absl/strings/string_view.h" #include "quiche/quic/core/connection_id_generator.h" +#include "quiche/quic/core/crypto/quic_crypto_server_config.h" #include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_alarm_factory.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/core/quic_crypto_server_stream_base.h" +#include "quiche/quic/core/quic_session.h" #include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_version_manager.h" #include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_server_backend.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_simple_dispatcher.h" namespace quic {
diff --git a/quiche/quic/masque/masque_encapsulated_client.cc b/quiche/quic/masque/masque_encapsulated_client.cc index 6afdb0e..e9a195b 100644 --- a/quiche/quic/masque/masque_encapsulated_client.cc +++ b/quiche/quic/masque/masque_encapsulated_client.cc
@@ -4,14 +4,33 @@ #include "quiche/quic/masque/masque_encapsulated_client.h" +#include <algorithm> +#include <cstddef> +#include <cstdint> +#include <memory> #include <optional> +#include <string> +#include <utility> -#include "quiche/quic/core/quic_utils.h" +#include "absl/strings/string_view.h" +#include "quiche/quic/core/crypto/proof_verifier.h" +#include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_packet_writer.h" +#include "quiche/quic/core/quic_server_id.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_client.h" #include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/masque/masque_encapsulated_client_session.h" #include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_client_default_network_helper.h" +#include "quiche/quic/tools/quic_default_client.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/quiche_data_reader.h" #include "quiche/common/quiche_data_writer.h"
diff --git a/quiche/quic/masque/masque_encapsulated_client.h b/quiche/quic/masque/masque_encapsulated_client.h index 42fda86..f04e054 100644 --- a/quiche/quic/masque/masque_encapsulated_client.h +++ b/quiche/quic/masque/masque_encapsulated_client.h
@@ -5,10 +5,17 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_ENCAPSULATED_CLIENT_H_ #define QUICHE_QUIC_MASQUE_MASQUE_ENCAPSULATED_CLIENT_H_ +#include <memory> + +#include "quiche/quic/core/crypto/proof_verifier.h" #include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_client.h" #include "quiche/quic/masque/masque_encapsulated_client_session.h" #include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_default_client.h" namespace quic {
diff --git a/quiche/quic/masque/masque_encapsulated_client_session.cc b/quiche/quic/masque/masque_encapsulated_client_session.cc index 05e132a..29d8052 100644 --- a/quiche/quic/masque/masque_encapsulated_client_session.cc +++ b/quiche/quic/masque/masque_encapsulated_client_session.cc
@@ -4,9 +4,29 @@ #include "quiche/quic/masque/masque_encapsulated_client_session.h" +#include <cstdint> +#include <string> + #include "absl/strings/string_view.h" +#include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" +#include "quiche/quic/core/http/quic_spdy_client_session.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_packets.h" +#include "quiche/quic/core/quic_server_id.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_versions.h" +#include "quiche/quic/masque/masque_client_session.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/common/capsule.h" #include "quiche/common/platform/api/quiche_logging.h" +#include "quiche/common/quiche_data_reader.h" #include "quiche/common/quiche_ip_address.h" +#include "quiche/common/quiche_text_utils.h" namespace quic {
diff --git a/quiche/quic/masque/masque_encapsulated_client_session.h b/quiche/quic/masque/masque_encapsulated_client_session.h index fe753cd..5ee8dce 100644 --- a/quiche/quic/masque/masque_encapsulated_client_session.h +++ b/quiche/quic/masque/masque_encapsulated_client_session.h
@@ -5,9 +5,21 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_ENCAPSULATED_CLIENT_SESSION_H_ #define QUICHE_QUIC_MASQUE_MASQUE_ENCAPSULATED_CLIENT_SESSION_H_ +#include <string> + +#include "absl/strings/string_view.h" +#include "quiche/quic/core/crypto/quic_crypto_client_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" #include "quiche/quic/core/http/quic_spdy_client_session.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_types.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_client_session.h" #include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/common/capsule.h" namespace quic {
diff --git a/quiche/quic/masque/masque_server.cc b/quiche/quic/masque/masque_server.cc index b05e306..96d47aa 100644 --- a/quiche/quic/masque/masque_server.cc +++ b/quiche/quic/masque/masque_server.cc
@@ -4,10 +4,15 @@ #include "quiche/quic/masque/masque_server.h" +#include <memory> + #include "quiche/quic/core/quic_default_connection_helper.h" +#include "quiche/quic/core/quic_dispatcher.h" #include "quiche/quic/masque/masque_dispatcher.h" +#include "quiche/quic/masque/masque_server_backend.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_default_proof_providers.h" +#include "quiche/quic/tools/quic_server.h" #include "quiche/quic/tools/quic_simple_crypto_server_stream_helper.h" namespace quic {
diff --git a/quiche/quic/masque/masque_server_backend.cc b/quiche/quic/masque/masque_server_backend.cc index 8fbeec7..1586a77 100644 --- a/quiche/quic/masque/masque_server_backend.cc +++ b/quiche/quic/masque/masque_server_backend.cc
@@ -4,10 +4,27 @@ #include "quiche/quic/masque/masque_server_backend.h" -#include "absl/strings/str_cat.h" +#include <cstdint> +#include <cstring> +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include "absl/strings/escaping.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "openssl/curve25519.h" +#include "quiche/quic/core/quic_connection_id.h" +#include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_bug_tracker.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/tools/quic_backend_response.h" +#include "quiche/quic/tools/quic_memory_cache_backend.h" +#include "quiche/quic/tools/quic_simple_server_backend.h" +#include "quiche/common/quiche_text_utils.h" +#include "quiche/spdy/core/http2_header_block.h" namespace quic {
diff --git a/quiche/quic/masque/masque_server_bin.cc b/quiche/quic/masque/masque_server_bin.cc index 81e7fe0..ee5e1ea 100644 --- a/quiche/quic/masque/masque_server_bin.cc +++ b/quiche/quic/masque/masque_server_bin.cc
@@ -7,11 +7,15 @@ // requests to web servers tunnelled over MASQUE connections. // e.g.: masque_server +#include <cstdint> #include <memory> +#include <string> +#include <vector> #include "quiche/quic/masque/masque_server.h" #include "quiche/quic/masque/masque_server_backend.h" -#include "quiche/quic/platform/api/quic_flags.h" +#include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_ip_address.h" #include "quiche/quic/platform/api/quic_logging.h" #include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/common/platform/api/quiche_command_line_flags.h"
diff --git a/quiche/quic/masque/masque_server_session.cc b/quiche/quic/masque/masque_server_session.cc index 43efd6e..4a125e5 100644 --- a/quiche/quic/masque/masque_server_session.cc +++ b/quiche/quic/masque/masque_server_session.cc
@@ -10,33 +10,54 @@ #include <netinet/ip_icmp.h> #include <netinet/udp.h> -#include <cstddef> #include <cstdint> #include <limits> +#include <memory> #include <optional> #include <string> +#include <utility> #include <vector> +#include "absl/algorithm/container.h" #include "absl/cleanup/cleanup.h" #include "absl/strings/escaping.h" #include "absl/strings/numbers.h" -#include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "openssl/curve25519.h" -#include "quiche/quic/core/http/spdy_utils.h" +#include "quiche/quic/core/crypto/quic_compressed_certs_cache.h" +#include "quiche/quic/core/crypto/quic_crypto_server_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" +#include "quiche/quic/core/http/http_frames.h" +#include "quiche/quic/core/http/quic_spdy_stream.h" #include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_constants.h" +#include "quiche/quic/core/quic_crypto_server_stream_base.h" #include "quiche/quic/core/quic_data_reader.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_time.h" +#include "quiche/quic/core/quic_types.h" #include "quiche/quic/core/quic_udp_socket.h" +#include "quiche/quic/core/quic_versions.h" +#include "quiche/quic/masque/masque_server_backend.h" #include "quiche/quic/masque/masque_utils.h" +#include "quiche/quic/platform/api/quic_bug_tracker.h" #include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/quic/platform/api/quic_socket_address.h" #include "quiche/quic/tools/quic_backend_response.h" +#include "quiche/quic/tools/quic_simple_server_backend.h" +#include "quiche/quic/tools/quic_simple_server_session.h" #include "quiche/quic/tools/quic_url.h" #include "quiche/common/capsule.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_url_utils.h" #include "quiche/common/quiche_ip_address.h" #include "quiche/common/quiche_text_utils.h" +#include "quiche/spdy/core/http2_header_block.h" namespace quic {
diff --git a/quiche/quic/masque/masque_server_session.h b/quiche/quic/masque/masque_server_session.h index bd87f50..b33f7ff 100644 --- a/quiche/quic/masque/masque_server_session.h +++ b/quiche/quic/masque/masque_server_session.h
@@ -5,13 +5,34 @@ #ifndef QUICHE_QUIC_MASQUE_MASQUE_SERVER_SESSION_H_ #define QUICHE_QUIC_MASQUE_MASQUE_SERVER_SESSION_H_ +#include <list> +#include <memory> + +#include "absl/strings/string_view.h" +#include "quiche/quic/core/crypto/quic_compressed_certs_cache.h" +#include "quiche/quic/core/crypto/quic_crypto_server_config.h" +#include "quiche/quic/core/frames/quic_connection_close_frame.h" +#include "quiche/quic/core/http/http_frames.h" +#include "quiche/quic/core/http/quic_spdy_session.h" +#include "quiche/quic/core/http/quic_spdy_stream.h" #include "quiche/quic/core/io/quic_event_loop.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_connection.h" +#include "quiche/quic/core/quic_crypto_server_stream_base.h" +#include "quiche/quic/core/quic_session.h" +#include "quiche/quic/core/quic_time.h" #include "quiche/quic/core/quic_types.h" #include "quiche/quic/core/quic_udp_socket.h" +#include "quiche/quic/core/quic_versions.h" #include "quiche/quic/masque/masque_server_backend.h" #include "quiche/quic/masque/masque_utils.h" #include "quiche/quic/platform/api/quic_export.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_socket_address.h" +#include "quiche/quic/tools/quic_backend_response.h" +#include "quiche/quic/tools/quic_simple_server_backend.h" #include "quiche/quic/tools/quic_simple_server_session.h" +#include "quiche/common/capsule.h" #include "quiche/spdy/core/http2_header_block.h" namespace quic {
diff --git a/quiche/quic/masque/masque_utils.cc b/quiche/quic/masque/masque_utils.cc index 322920b..10ebe71 100644 --- a/quiche/quic/masque/masque_utils.cc +++ b/quiche/quic/masque/masque_utils.cc
@@ -4,10 +4,20 @@ #include "quiche/quic/masque/masque_utils.h" +#include <cstdint> +#include <cstring> +#include <ostream> #include <string> +#include <utility> #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "quiche/quic/core/quic_config.h" +#include "quiche/quic/core/quic_data_writer.h" +#include "quiche/quic/core/quic_versions.h" +#include "quiche/quic/platform/api/quic_ip_address.h" +#include "quiche/quic/platform/api/quic_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #if defined(__linux__) #include <fcntl.h>
diff --git a/quiche/quic/masque/masque_utils.h b/quiche/quic/masque/masque_utils.h index c55da9e..900e62c 100644 --- a/quiche/quic/masque/masque_utils.h +++ b/quiche/quic/masque/masque_utils.h
@@ -7,7 +7,6 @@ #include <cstddef> #include <cstdint> -#include <optional> #include <ostream> #include <string>