Skip to content

listener: move active_tcp_listener out of conn handler #15553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 6 commits into from
Mar 25, 2021
Merged

listener: move active_tcp_listener out of conn handler #15553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15278cb
listener: extract active tcp listener out of connection handler impl
lambdai Mar 18, 2021
cf04a86
introduce a header obj to make hdrs clean
lambdai Mar 22, 2021
71d2e84
add TODO
lambdai Mar 22, 2021
dc4a060
fix_spelling_pedantic
lambdai Mar 23, 2021
0b9c413
clangtidy
lambdai Mar 23, 2021
0f63301
add depends of active tcp listener header
lambdai Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 64 additions & 3 deletions source/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ envoy_cc_library(
envoy_cc_library(
name = "connection_handler_lib",
deps = [
":active_udp_listener",
":connection_handler_impl",
"//source/server:active_tcp_listener",
"//source/server:active_udp_listener",
"//source/server:connection_handler_impl",
],
)

Expand All @@ -72,14 +73,44 @@ envoy_cc_library(
hdrs = [
"connection_handler_impl.h",
],
deps = [
"//include/envoy/common:time_interface",
"//include/envoy/event:deferred_deletable",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/network:connection_handler_interface",
"//include/envoy/network:connection_interface",
"//include/envoy/network:filter_interface",
"//include/envoy/network:listen_socket_interface",
"//include/envoy/network:listener_interface",
"//include/envoy/server:active_udp_listener_config_interface",
"//include/envoy/server:listener_manager_interface",
"//include/envoy/stats:timespan_interface",
"//source/common/common:linked_object",
"//source/common/common:non_copyable",
"//source/common/event:deferred_task",
"//source/common/network:connection_lib",
"//source/common/stream_info:stream_info_lib",
"//source/server:active_tcp_listener_header",
],
)

envoy_cc_library(
# Currently both `active_tcp_listener` and `connection_handler_impl` need below headers
# while addressing https://github.com/envoyproxy/envoy/issues/15126
# TODO(lambdai): Remove the definition of ActiveTcpListener from dependency of ConnectionHandlerImpl
# and delete this target.
name = "active_tcp_listener_header",
hdrs = [
"active_tcp_listener.h",
"connection_handler_impl.h",
],
deps = [
"//include/envoy/common:time_interface",
"//include/envoy/event:deferred_deletable",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/event:timer_interface",
"//include/envoy/network:connection_handler_interface",
"//include/envoy/network:connection_interface",
"//include/envoy/network:exception_interface",
"//include/envoy/network:filter_interface",
"//include/envoy/network:listen_socket_interface",
"//include/envoy/network:listener_interface",
Expand All @@ -92,7 +123,37 @@ envoy_cc_library(
"//source/common/network:connection_lib",
"//source/common/stats:timespan_lib",
"//source/common/stream_info:stream_info_lib",
],
)

envoy_cc_library(
name = "active_tcp_listener",
srcs = ["active_tcp_listener.cc"],
hdrs = [
"active_tcp_listener.h",
],
deps = [
"//include/envoy/common:time_interface",
"//include/envoy/event:deferred_deletable",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/event:timer_interface",
"//include/envoy/network:connection_handler_interface",
"//include/envoy/network:connection_interface",
"//include/envoy/network:filter_interface",
"//include/envoy/network:listen_socket_interface",
"//include/envoy/network:listener_interface",
"//include/envoy/server:active_udp_listener_config_interface",
"//include/envoy/server:listener_manager_interface",
"//include/envoy/stats:timespan_interface",
"//source/common/common:linked_object",
"//source/common/common:non_copyable",
"//source/common/common:safe_memcpy_lib",
"//source/common/event:deferred_task",
"//source/common/network:connection_lib",
"//source/common/stats:timespan_lib",
"//source/common/stream_info:stream_info_lib",
"//source/extensions/transport_sockets:well_known_names",
"//source/server:active_tcp_listener_header",
],
)

Expand Down
Loading