comment

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
envoyproxy · Dec 5, 2023 · df7889f · df7889f
1 parent ae0aeaf
commit df7889f
Show file tree

Hide file tree

Showing 64 changed files with 84 additions and 84 deletions.
diff --git a/.github/workflows/mobile-perf.yml b/.github/workflows/mobile-perf.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Ensure files don't leak back into the main binary
-      run: rm source/common/tcp/listener_manager/listener_manager_impl.h source/server/overload_manager_impl.cc source/common/network/listen_socket_impl.h source/common/network/tcp_listener_impl.h source/server/guarddog_impl.h source/server/watchdog_impl.h source/server/options_impl.cc
+      run: rm source/common/listener_manager/listener_manager_impl.h source/server/overload_manager_impl.cc source/common/network/listen_socket_impl.h source/common/network/tcp_listener_impl.h source/server/guarddog_impl.h source/server/watchdog_impl.h source/server/options_impl.cc
     - name: Add safe directory
       run: git config --global --add safe.directory /__w/envoy/envoy
     - name: 'Build test binary'

diff --git a/contrib/dlb/source/BUILD b/contrib/dlb/source/BUILD
@@ -43,9 +43,9 @@ envoy_cc_contrib_extension(
         "//envoy/server:factory_context_interface",
         "//envoy/server:filter_config_interface",
         "//source/common/common:logger_lib",
+        "//source/common/listener_manager:active_tcp_listener",
         "//source/common/network:connection_balancer_lib",
         "//source/common/protobuf:utility_lib",
-        "//source/common/tcp/listener_manager:active_tcp_listener",
         "@envoy_api//contrib/envoy/extensions/network/connection_balance/dlb/v3alpha:pkg_cc_proto",
     ] + select({
         "//bazel:linux_x86_64": [

diff --git a/contrib/dlb/source/connection_balancer_impl.h b/contrib/dlb/source/connection_balancer_impl.h
@@ -8,9 +8,9 @@
 #include "envoy/server/filter_config.h"
 
 #include "source/common/api/os_sys_calls_impl.h"
+#include "source/common/listener_manager/active_tcp_listener.h"
 #include "source/common/network/connection_balancer_impl.h"
 #include "source/common/protobuf/protobuf.h"
-#include "source/common/tcp/listener_manager/active_tcp_listener.h"
 
 #include "contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.h"
 #include "contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.h"

diff --git a/mobile/test/common/jni/BUILD b/mobile/test/common/jni/BUILD
@@ -64,7 +64,7 @@ cc_library(
     deps = [
         ":server_envoy_jni_lib",
         "//library/common/jni:envoy_jni_lib",
-        "@envoy//source/common/tcp/listener_manager:listener_manager_lib",
+        "@envoy//source/common/listener_manager:listener_manager_lib",
     ],
 )
 

diff --git a/source/common/tcp/listener_manager/BUILD → source/common/listener_manager/BUILD b/source/common/tcp/listener_manager/BUILD → source/common/listener_manager/BUILD
diff --git a/...manager/active_raw_udp_listener_config.cc → ...manager/active_raw_udp_listener_config.cc b/...manager/active_raw_udp_listener_config.cc → ...manager/active_raw_udp_listener_config.cc
@@ -1,9 +1,9 @@
-#include "source/common/tcp/listener_manager/active_raw_udp_listener_config.h"
+#include "source/common/listener_manager/active_raw_udp_listener_config.h"
 
 #include <memory>
 #include <string>
 
-#include "source/common/tcp/listener_manager/connection_handler_impl.h"
+#include "source/common/listener_manager/connection_handler_impl.h"
 #include "source/server/active_udp_listener.h"
 
 namespace Envoy {

diff --git a/..._manager/active_raw_udp_listener_config.h → ..._manager/active_raw_udp_listener_config.h b/..._manager/active_raw_udp_listener_config.h → ..._manager/active_raw_udp_listener_config.h
diff --git a/...er_manager/active_stream_listener_base.cc → ...er_manager/active_stream_listener_base.cc b/...er_manager/active_stream_listener_base.cc → ...er_manager/active_stream_listener_base.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/active_stream_listener_base.h"
+#include "source/common/listener_manager/active_stream_listener_base.h"
 
 #include "envoy/network/filter.h"
 

diff --git a/...ner_manager/active_stream_listener_base.h → ...ner_manager/active_stream_listener_base.h b/...ner_manager/active_stream_listener_base.h → ...ner_manager/active_stream_listener_base.h
@@ -15,7 +15,7 @@
 
 #include "source/common/common/linked_object.h"
 #include "source/common/formatter/http_specific_formatter.h"
-#include "source/common/tcp/listener_manager/active_tcp_socket.h"
+#include "source/common/listener_manager/active_tcp_socket.h"
 #include "source/server/active_listener_base.h"
 
 namespace Envoy {

diff --git a/...p/listener_manager/active_tcp_listener.cc → ...n/listener_manager/active_tcp_listener.cc b/...p/listener_manager/active_tcp_listener.cc → ...n/listener_manager/active_tcp_listener.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/active_tcp_listener.h"
+#include "source/common/listener_manager/active_tcp_listener.h"
 
 #include <chrono>
 

diff --git a/...cp/listener_manager/active_tcp_listener.h → ...on/listener_manager/active_tcp_listener.h b/...cp/listener_manager/active_tcp_listener.h → ...on/listener_manager/active_tcp_listener.h
@@ -5,8 +5,8 @@
 #include "envoy/stream_info/stream_info.h"
 
 #include "source/common/common/linked_object.h"
-#include "source/common/tcp/listener_manager/active_stream_listener_base.h"
-#include "source/common/tcp/listener_manager/active_tcp_socket.h"
+#include "source/common/listener_manager/active_stream_listener_base.h"
+#include "source/common/listener_manager/active_tcp_socket.h"
 #include "source/server/active_listener_base.h"
 
 namespace Envoy {

diff --git a/...tcp/listener_manager/active_tcp_socket.cc → ...mon/listener_manager/active_tcp_socket.cc b/...tcp/listener_manager/active_tcp_socket.cc → ...mon/listener_manager/active_tcp_socket.cc
@@ -1,9 +1,9 @@
-#include "source/common/tcp/listener_manager/active_tcp_socket.h"
+#include "source/common/listener_manager/active_tcp_socket.h"
 
 #include "envoy/network/filter.h"
 
+#include "source/common/listener_manager/active_stream_listener_base.h"
 #include "source/common/stream_info/stream_info_impl.h"
-#include "source/common/tcp/listener_manager/active_stream_listener_base.h"
 
 namespace Envoy {
 namespace Server {

diff --git a/.../tcp/listener_manager/active_tcp_socket.h → ...mmon/listener_manager/active_tcp_socket.h b/.../tcp/listener_manager/active_tcp_socket.h → ...mmon/listener_manager/active_tcp_socket.h
diff --git a/...listener_manager/async_tcp_client_impl.cc → ...listener_manager/async_tcp_client_impl.cc b/...listener_manager/async_tcp_client_impl.cc → ...listener_manager/async_tcp_client_impl.cc
diff --git a/.../listener_manager/async_tcp_client_impl.h → .../listener_manager/async_tcp_client_impl.h b/.../listener_manager/async_tcp_client_impl.h → .../listener_manager/async_tcp_client_impl.h
diff --git a/.../common/tcp/listener_manager/conn_pool.cc → source/common/listener_manager/conn_pool.cc b/.../common/tcp/listener_manager/conn_pool.cc → source/common/listener_manager/conn_pool.cc
diff --git a/...e/common/tcp/listener_manager/conn_pool.h → source/common/listener_manager/conn_pool.h b/...e/common/tcp/listener_manager/conn_pool.h → source/common/listener_manager/conn_pool.h
diff --git a/...stener_manager/connection_handler_impl.cc → ...stener_manager/connection_handler_impl.cc b/...stener_manager/connection_handler_impl.cc → ...stener_manager/connection_handler_impl.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/connection_handler_impl.h"
+#include "source/common/listener_manager/connection_handler_impl.h"
 
 #include <chrono>
 
@@ -7,11 +7,11 @@
 
 #include "source/common/common/logger.h"
 #include "source/common/event/deferred_task.h"
+#include "source/common/listener_manager/active_tcp_listener.h"
 #include "source/common/network/address_impl.h"
 #include "source/common/network/tcp_listener_impl.h"
 #include "source/common/network/utility.h"
 #include "source/common/runtime/runtime_features.h"
-#include "source/common/tcp/listener_manager/active_tcp_listener.h"
 #include "source/server/listener_manager_factory.h"
 
 namespace Envoy {

diff --git a/...istener_manager/connection_handler_impl.h → ...istener_manager/connection_handler_impl.h b/...istener_manager/connection_handler_impl.h → ...istener_manager/connection_handler_impl.h
diff --git a/...r/filter_chain_factory_context_callback.h → ...r/filter_chain_factory_context_callback.h b/...r/filter_chain_factory_context_callback.h → ...r/filter_chain_factory_context_callback.h
diff --git a/...ener_manager/filter_chain_manager_impl.cc → ...ener_manager/filter_chain_manager_impl.cc b/...ener_manager/filter_chain_manager_impl.cc → ...ener_manager/filter_chain_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/filter_chain_manager_impl.h"
+#include "source/common/listener_manager/filter_chain_manager_impl.h"
 
 #include "envoy/config/listener/v3/listener_components.pb.h"
 

diff --git a/...tener_manager/filter_chain_manager_impl.h → ...tener_manager/filter_chain_manager_impl.h b/...tener_manager/filter_chain_manager_impl.h → ...tener_manager/filter_chain_manager_impl.h
@@ -18,9 +18,9 @@
 
 #include "source/common/common/logger.h"
 #include "source/common/init/manager_impl.h"
+#include "source/common/listener_manager/filter_chain_factory_context_callback.h"
 #include "source/common/network/cidr_range.h"
 #include "source/common/network/lc_trie.h"
-#include "source/common/tcp/listener_manager/filter_chain_factory_context_callback.h"
 #include "source/server/factory_context_impl.h"
 
 #include "absl/container/flat_hash_map.h"

diff --git a/...ce/common/tcp/listener_manager/lds_api.cc → source/common/listener_manager/lds_api.cc b/...ce/common/tcp/listener_manager/lds_api.cc → source/common/listener_manager/lds_api.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/lds_api.h"
+#include "source/common/listener_manager/lds_api.h"
 
 #include "envoy/admin/v3/config_dump.pb.h"
 #include "envoy/config/core/v3/config_source.pb.h"

diff --git a/source/common/tcp/listener_manager/lds_api.h → source/common/listener_manager/lds_api.h b/source/common/tcp/listener_manager/lds_api.h → source/common/listener_manager/lds_api.h
diff --git a/...mon/tcp/listener_manager/listener_impl.cc → .../common/listener_manager/listener_impl.cc b/...mon/tcp/listener_manager/listener_impl.cc → .../common/listener_manager/listener_impl.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/listener_impl.h"
+#include "source/common/listener_manager/listener_impl.h"
 
 #include <functional>
 
@@ -18,6 +18,9 @@
 #include "source/common/api/os_sys_calls_impl.h"
 #include "source/common/common/assert.h"
 #include "source/common/config/utility.h"
+#include "source/common/listener_manager/active_raw_udp_listener_config.h"
+#include "source/common/listener_manager/filter_chain_manager_impl.h"
+#include "source/common/listener_manager/listener_manager_impl.h"
 #include "source/common/network/connection_balancer_impl.h"
 #include "source/common/network/resolver_impl.h"
 #include "source/common/network/socket_option_factory.h"
@@ -27,9 +30,6 @@
 #include "source/common/network/utility.h"
 #include "source/common/protobuf/utility.h"
 #include "source/common/runtime/runtime_features.h"
-#include "source/common/tcp/listener_manager/active_raw_udp_listener_config.h"
-#include "source/common/tcp/listener_manager/filter_chain_manager_impl.h"
-#include "source/common/tcp/listener_manager/listener_manager_impl.h"
 #include "source/server/configuration_impl.h"
 #include "source/server/drain_manager_impl.h"
 #include "source/server/transport_socket_config_impl.h"

diff --git a/...mmon/tcp/listener_manager/listener_impl.h → ...e/common/listener_manager/listener_impl.h b/...mmon/tcp/listener_manager/listener_impl.h → ...e/common/listener_manager/listener_impl.h
@@ -21,8 +21,8 @@
 #include "source/common/config/metadata.h"
 #include "source/common/init/manager_impl.h"
 #include "source/common/init/target_impl.h"
+#include "source/common/listener_manager/filter_chain_manager_impl.h"
 #include "source/common/quic/quic_stat_names.h"
-#include "source/common/tcp/listener_manager/filter_chain_manager_impl.h"
 #include "source/server/transport_socket_config_impl.h"
 
 namespace Envoy {

diff --git a/...listener_manager/listener_manager_impl.cc → ...listener_manager/listener_manager_impl.cc b/...listener_manager/listener_manager_impl.cc → ...listener_manager/listener_manager_impl.cc
@@ -1,4 +1,4 @@
-#include "source/common/tcp/listener_manager/listener_manager_impl.h"
+#include "source/common/listener_manager/listener_manager_impl.h"
 
 #include <algorithm>
 
@@ -33,7 +33,7 @@
 #include "source/server/api_listener_impl.h"
 #include "source/server/configuration_impl.h"
 #include "source/server/drain_manager_impl.h"
-#include "source/common/tcp/listener_manager/filter_chain_manager_impl.h"
+#include "source/common/listener_manager/filter_chain_manager_impl.h"
 #include "source/server/transport_socket_config_impl.h"
 
 namespace Envoy {

diff --git a/.../listener_manager/listener_manager_impl.h → .../listener_manager/listener_manager_impl.h b/.../listener_manager/listener_manager_impl.h → .../listener_manager/listener_manager_impl.h
@@ -20,11 +20,11 @@
 
 #include "source/common/config/well_known_names.h"
 #include "source/common/filter/config_discovery_impl.h"
+#include "source/common/listener_manager/filter_chain_factory_context_callback.h"
+#include "source/common/listener_manager/filter_chain_manager_impl.h"
+#include "source/common/listener_manager/lds_api.h"
+#include "source/common/listener_manager/listener_impl.h"
 #include "source/common/quic/quic_stat_names.h"
-#include "source/common/tcp/listener_manager/filter_chain_factory_context_callback.h"
-#include "source/common/tcp/listener_manager/filter_chain_manager_impl.h"
-#include "source/common/tcp/listener_manager/lds_api.h"
-#include "source/common/tcp/listener_manager/listener_impl.h"
 #include "source/server/listener_manager_factory.h"
 
 namespace Envoy {

diff --git a/source/exe/BUILD b/source/exe/BUILD
@@ -126,7 +126,7 @@ envoy_cc_library(
         ":main_common_lib",
         # These are compiled as extensions so Envoy Mobile doesn't have to link them in.
         # Envoy requires them.
-        "//source/common/tcp/listener_manager:listener_manager_lib",
+        "//source/common/listener_manager:listener_manager_lib",
         "//source/extensions/listener_managers/validation_listener_manager:validation_listener_manager_lib",
         "//source/common/version:version_linkstamp",
         "//source/server:options_lib",

diff --git a/source/extensions/bootstrap/internal_listener/BUILD b/source/extensions/bootstrap/internal_listener/BUILD
@@ -30,7 +30,7 @@ envoy_cc_extension(
     deps = [
         ":thread_local_registry",
         "//envoy/server:bootstrap_extension_config_interface",
-        "//source/common/tcp/listener_manager:listener_manager_lib",
+        "//source/common/listener_manager:listener_manager_lib",
         "@envoy_api//envoy/extensions/bootstrap/internal_listener/v3:pkg_cc_proto",
     ],
     alwayslink = 1,
@@ -93,12 +93,12 @@ envoy_cc_library(
         "//source/common/common:linked_object",
         "//source/common/common:non_copyable",
         "//source/common/event:deferred_task",
+        "//source/common/listener_manager:active_stream_listener_base",
+        "//source/common/listener_manager:active_tcp_listener",
         "//source/common/network:connection_lib",
         "//source/common/network:listener_filter_buffer_lib",
         "//source/common/stats:timespan_lib",
         "//source/common/stream_info:stream_info_lib",
-        "//source/common/tcp/listener_manager:active_stream_listener_base",
-        "//source/common/tcp/listener_manager:active_tcp_listener",
         "//source/extensions/io_socket/user_space:config",
     ],
 )
diff --git a/source/extensions/bootstrap/internal_listener/active_internal_listener.cc b/source/extensions/bootstrap/internal_listener/active_internal_listener.cc
@@ -3,9 +3,9 @@
 #include "envoy/network/filter.h"
 #include "envoy/stats/scope.h"
 
+#include "source/common/listener_manager/active_stream_listener_base.h"
 #include "source/common/network/address_impl.h"
 #include "source/common/stats/timespan_impl.h"
-#include "source/common/tcp/listener_manager/active_stream_listener_base.h"
 #include "source/extensions/io_socket/user_space/io_handle.h"
 
 namespace Envoy {

diff --git a/source/extensions/bootstrap/internal_listener/active_internal_listener.h b/source/extensions/bootstrap/internal_listener/active_internal_listener.h
@@ -17,8 +17,8 @@
 
 #include "source/common/common/linked_object.h"
 #include "source/common/common/non_copyable.h"
+#include "source/common/listener_manager/active_stream_listener_base.h"
 #include "source/common/stream_info/stream_info_impl.h"
-#include "source/common/tcp/listener_manager/active_stream_listener_base.h"
 
 #include "spdlog/spdlog.h"
 

diff --git a/source/extensions/common/matcher/BUILD b/source/extensions/common/matcher/BUILD
@@ -26,7 +26,7 @@ envoy_cc_extension(
     srcs = ["trie_matcher.cc"],
     hdrs = ["trie_matcher.h"],
     extra_visibility = [
-        "//source/common/tcp:__subpackages__",
+        "//source/common/listener_manager:__subpackages__",
         "//test:__subpackages__",
     ],
     deps = [

diff --git a/source/extensions/listener_managers/validation_listener_manager/BUILD b/source/extensions/listener_managers/validation_listener_manager/BUILD
@@ -23,6 +23,6 @@ envoy_cc_extension(
         "//test:__subpackages__",
     ],
     deps = [
-        "//source/common/tcp/listener_manager:listener_manager_lib",
+        "//source/common/listener_manager:listener_manager_lib",
     ],
 )
diff --git a/...ce/extensions/listener_managers/validation_listener_manager/validation_listener_manager.h b/...ce/extensions/listener_managers/validation_listener_manager/validation_listener_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "source/common/tcp/listener_manager/listener_manager_impl.h"
+#include "source/common/listener_manager/listener_manager_impl.h"
 #include "source/server/listener_manager_factory.h"
 
 namespace Envoy {

diff --git a/source/extensions/matching/network/common/BUILD b/source/extensions/matching/network/common/BUILD
@@ -13,7 +13,7 @@ envoy_cc_extension(
     srcs = ["inputs.cc"],
     hdrs = ["inputs.h"],
     extra_visibility = [
-        "//source/common/tcp:__subpackages__",
+        "//source/common/listener_manager:__subpackages__",
         "//test:__subpackages__",
     ],
     deps = [

diff --git a/source/extensions/udp_packet_writer/default/BUILD b/source/extensions/udp_packet_writer/default/BUILD
@@ -18,7 +18,7 @@ envoy_cc_extension(
     ],
     extra_visibility = [
         "//source/server:__subpackages__",
-        "//source/common/tcp:__subpackages__",
+        "//source/common/listener_manager:__subpackages__",
     ],
     deps = [
         "//envoy/config:typed_config_interface",

diff --git a/source/extensions/udp_packet_writer/gso/BUILD b/source/extensions/udp_packet_writer/gso/BUILD
@@ -19,7 +19,7 @@ envoy_cc_extension(
     ],
     extra_visibility = [
         "//source/server:__subpackages__",
-        "//source/common/tcp:__subpackages__",
+        "//source/common/listener_manager:__subpackages__",
     ],
     tags = ["nofips"],
     deps = [

diff --git a/source/server/admin/BUILD b/source/server/admin/BUILD
@@ -78,6 +78,7 @@ envoy_cc_library(
         "//source/common/http:header_map_lib",
         "//source/common/http:headers_lib",
         "//source/common/http:utility_lib",
+        "//source/common/listener_manager:listener_manager_lib",
         "//source/common/memory:utils_lib",
         "//source/common/network:connection_balancer_lib",
         "//source/common/network:listen_socket_lib",
@@ -86,7 +87,6 @@ envoy_cc_library(
         "//source/common/router:config_lib",
         "//source/common/router:scoped_config_lib",
         "//source/common/stats:isolated_store_lib",
-        "//source/common/tcp/listener_manager:listener_manager_lib",
         "//source/extensions/access_loggers/common:file_access_log_lib",
         "//source/extensions/http/header_validators/envoy_default:config",
         "//source/extensions/request_id/uuid:config",

diff --git a/source/server/admin/admin.cc b/source/server/admin/admin.cc
@@ -28,12 +28,12 @@
 #include "source/common/http/conn_manager_utility.h"
 #include "source/common/http/header_map_impl.h"
 #include "source/common/http/headers.h"
+#include "source/common/listener_manager/listener_impl.h"
 #include "source/common/memory/utils.h"
 #include "source/common/network/listen_socket_impl.h"
 #include "source/common/protobuf/protobuf.h"
 #include "source/common/protobuf/utility.h"
 #include "source/common/router/config_impl.h"
-#include "source/common/tcp/listener_manager/listener_impl.h"
 #include "source/extensions/request_id/uuid/config.h"
 #include "source/server/admin/utils.h"
 

diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD
@@ -213,11 +213,11 @@ envoy_cc_test(
         ":test_proof_source_lib",
         ":test_utils_lib",
         "//source/common/http:utility_lib",
+        "//source/common/listener_manager:connection_handler_lib",
         "//source/common/network:udp_packet_writer_handler_lib",
         "//source/common/quic:active_quic_listener_lib",
         "//source/common/quic:envoy_quic_utils_lib",
         "//source/common/quic:udp_gso_batch_writer_lib",
-        "//source/common/tcp/listener_manager:connection_handler_lib",
         "//source/extensions/quic/crypto_stream:envoy_quic_crypto_server_stream_lib",
         "//source/extensions/quic/proof_source:envoy_quic_proof_source_factory_impl_lib",
         "//source/server:configuration_lib",
@@ -239,12 +239,12 @@ envoy_cc_test(
         ":test_proof_source_lib",
         ":test_utils_lib",
         "//envoy/stats:stats_macros",
+        "//source/common/listener_manager:connection_handler_lib",
         "//source/common/quic:envoy_quic_alarm_factory_lib",
         "//source/common/quic:envoy_quic_connection_helper_lib",
         "//source/common/quic:envoy_quic_dispatcher_lib",
         "//source/common/quic:envoy_quic_proof_source_lib",
         "//source/common/quic:envoy_quic_server_session_lib",
-        "//source/common/tcp/listener_manager:connection_handler_lib",
         "//source/extensions/quic/crypto_stream:envoy_quic_crypto_server_stream_lib",
         "//source/server:configuration_lib",
         "//test/mocks/event:event_mocks",

diff --git a/test/common/quic/active_quic_listener_test.cc b/test/common/quic/active_quic_listener_test.cc
@@ -6,6 +6,7 @@
 
 #include "source/common/common/logger.h"
 #include "source/common/http/utility.h"
+#include "source/common/listener_manager/connection_handler_impl.h"
 #include "source/common/network/listen_socket_impl.h"
 #include "source/common/network/socket_option_factory.h"
 #include "source/common/network/udp_packet_writer_handler_impl.h"
@@ -14,7 +15,6 @@
 #include "source/common/quic/envoy_quic_utils.h"
 #include "source/common/quic/udp_gso_batch_writer.h"
 #include "source/common/runtime/runtime_impl.h"
-#include "source/common/tcp/listener_manager/connection_handler_impl.h"
 #include "source/extensions/quic/crypto_stream/envoy_quic_crypto_server_stream.h"
 #include "source/extensions/quic/proof_source/envoy_quic_proof_source_factory_impl.h"
 #include "source/server/configuration_impl.h"

diff --git a/test/common/quic/envoy_quic_dispatcher_test.cc b/test/common/quic/envoy_quic_dispatcher_test.cc
@@ -2,6 +2,7 @@
 
 #include <memory>
 
+#include "source/common/listener_manager/connection_handler_impl.h"
 #include "source/common/network/listen_socket_impl.h"
 #include "source/common/quic/envoy_quic_alarm_factory.h"
 #include "source/common/quic/envoy_quic_clock.h"
@@ -10,7 +11,6 @@
 #include "source/common/quic/envoy_quic_server_session.h"
 #include "source/common/quic/envoy_quic_utils.h"
 #include "source/common/quic/quic_transport_socket_factory.h"
-#include "source/common/tcp/listener_manager/connection_handler_impl.h"
 #include "source/extensions/quic/crypto_stream/envoy_quic_crypto_server_stream.h"
 #include "source/server/configuration_impl.h"