Skip to content

Rollforward #24555

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
alyssawilk merged 2 commits into from
Jan 3, 2023
Merged

Rollforward #24555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba6df3c
Revert "Revert "build: Moving more downstream code into the listener …
alyssawilk Dec 15, 2022
fec0ae4
merge fix
alyssawilk Dec 15, 2022
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
2 changes: 1 addition & 1 deletion contrib/network/connection_balance/dlb/source/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ envoy_cc_contrib_extension(
"//source/common/common:logger_lib",
"//source/common/network:connection_balancer_lib",
"//source/common/protobuf:utility_lib",
"//source/server:active_tcp_listener",
"//source/extensions/listener_managers/listener_manager:active_tcp_listener",
"@envoy_api//contrib/envoy/extensions/network/connection_balance/dlb/v3alpha:pkg_cc_proto",
] + select({
"//bazel:linux_x86_64": [
Expand Down
2 changes: 1 addition & 1 deletion contrib/network/connection_balance/dlb/source/connection_balancer_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "source/common/api/os_sys_calls_impl.h"
#include "source/common/network/connection_balancer_impl.h"
#include "source/common/protobuf/protobuf.h"
#include "source/server/active_tcp_listener.h"
#include "source/extensions/listener_managers/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"
Expand Down
1 change: 0 additions & 1 deletion source/common/quic/active_quic_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "source/common/quic/envoy_quic_proof_source_factory_interface.h"
#include "source/common/runtime/runtime_protos.h"
#include "source/server/active_udp_listener.h"
#include "source/server/connection_handler_impl.h"

#include "quiche/quic/load_balancer/load_balancer_encoder.h"

Expand Down
4 changes: 2 additions & 2 deletions source/extensions/bootstrap/internal_listener/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ envoy_cc_library(
"//source/common/stats:timespan_lib",
"//source/common/stream_info:stream_info_lib",
"//source/extensions/io_socket/user_space:config",
"//source/server:active_stream_listener_base",
"//source/server:active_tcp_listener",
"//source/extensions/listener_managers/listener_manager:active_stream_listener_base",
"//source/extensions/listener_managers/listener_manager:active_tcp_listener",
],
)
2 changes: 1 addition & 1 deletion source/extensions/bootstrap/internal_listener/active_internal_listener.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "source/common/network/address_impl.h"
#include "source/common/stats/timespan_impl.h"
#include "source/extensions/io_socket/user_space/io_handle.h"
#include "source/server/active_stream_listener_base.h"
#include "source/extensions/listener_managers/listener_manager/active_stream_listener_base.h"

namespace Envoy {
namespace Extensions {
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/bootstrap/internal_listener/active_internal_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "source/common/common/linked_object.h"
#include "source/common/common/non_copyable.h"
#include "source/common/stream_info/stream_info_impl.h"
#include "source/server/active_stream_listener_base.h"
#include "source/extensions/listener_managers/listener_manager/active_stream_listener_base.h"

#include "spdlog/spdlog.h"

Expand Down
139 changes: 138 additions & 1 deletion source/extensions/listener_managers/listener_manager/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ envoy_cc_extension(
"//test:__subpackages__",
],
deps = [
":connection_handler_lib",
"//source/server:listener_manager_factory_lib",
"//source/server:api_listener_lib",
":active_raw_udp_listener_config",
Expand Down Expand Up @@ -91,8 +92,8 @@ envoy_cc_library(
"//test:__subpackages__",
],
deps = [
":connection_handler_lib",
"//envoy/registry",
"//source/server:connection_handler_lib",
],
)

Expand Down Expand Up @@ -153,3 +154,139 @@ envoy_cc_library(
"@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
],
)

envoy_cc_extension(
name = "connection_handler_lib",
srcs = ["connection_handler_impl.cc"],
hdrs = [
"connection_handler_impl.h",
],
# core code.
extra_visibility = [
"//test:__subpackages__",
],
deps = [
"active_tcp_listener",
"//envoy/common:time_interface",
"//envoy/event:deferred_deletable",
"//envoy/event:dispatcher_interface",
"//envoy/network:client_connection_factory",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:filter_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//envoy/runtime:runtime_interface",
"//envoy/server:listener_manager_interface",
"//envoy/stats:timespan_interface",
"//source/common/common:linked_object",
"//source/common/common:non_copyable",
"//source/common/event:deferred_task",
"//source/common/network:address_lib",
"//source/common/network:connection_lib",
"//source/common/stream_info:stream_info_lib",
"//source/server:active_udp_listener",
"//source/server:listener_manager_factory_lib",
],
)

envoy_cc_library(
name = "active_tcp_listener",
srcs = ["active_tcp_listener.cc"],
hdrs = [
"active_tcp_listener.h",
],
deps = [
":active_stream_listener_base",
":active_tcp_socket",
"//envoy/common:time_interface",
"//envoy/event:deferred_deletable",
"//envoy/event:dispatcher_interface",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//envoy/server:listener_manager_interface",
"//source/common/common:assert_lib",
"//source/common/common:linked_object",
"//source/common/network:connection_lib",
"//source/common/stats:timespan_lib",
"//source/server:active_listener_base",
],
)

envoy_cc_library(
name = "active_tcp_listener_headers",
hdrs = [
"active_stream_listener_base.h",
"active_tcp_listener.h",
"active_tcp_socket.h",
],
deps = [
"//envoy/common:time_interface",
"//envoy/event:deferred_deletable",
"//envoy/event:dispatcher_interface",
"//envoy/event:timer_interface",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:filter_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//envoy/server:listener_manager_interface",
"//source/common/common:assert_lib",
"//source/common/common:linked_object",
"//source/common/network:connection_lib",
"//source/common/stats:timespan_lib",
"//source/server:active_listener_base",
],
)

envoy_cc_library(
name = "active_tcp_socket",
srcs = ["active_tcp_socket.cc"],
hdrs = [
"active_tcp_socket.h",
],
deps = [
":active_tcp_listener_headers",
"//envoy/common:time_interface",
"//envoy/event:deferred_deletable",
"//envoy/event:dispatcher_interface",
"//envoy/event:timer_interface",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:filter_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//source/common/common:linked_object",
"//source/common/network:connection_lib",
"//source/common/network:listener_filter_buffer_lib",
"//source/common/stream_info:stream_info_lib",
"//source/server:active_listener_base",
],
)

envoy_cc_library(
name = "active_stream_listener_base",
srcs = ["active_stream_listener_base.cc"],
hdrs = [
"active_stream_listener_base.h",
],
deps = [
":active_tcp_listener_headers",
"//envoy/common:time_interface",
"//envoy/event:deferred_deletable",
"//envoy/event:dispatcher_interface",
"//envoy/event:timer_interface",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:filter_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//envoy/stream_info:stream_info_interface",
"//source/common/common:linked_object",
"//source/common/network:connection_lib",
"//source/common/network:listener_filter_buffer_lib",
"//source/server:active_listener_base",
],
)
2 changes: 1 addition & 1 deletion source/extensions/listener_managers/listener_manager/active_raw_udp_listener_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <memory>
#include <string>

#include "source/extensions/listener_managers/listener_manager/connection_handler_impl.h"
#include "source/server/active_udp_listener.h"
#include "source/server/connection_handler_impl.h"

namespace Envoy {
namespace Server {
Expand Down
2 changes: 1 addition & 1 deletion source/server/active_stream_listener_base.cc → ...er_manager/active_stream_listener_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "source/server/active_stream_listener_base.h"
#include "source/extensions/listener_managers/listener_manager/active_stream_listener_base.h"

#include "envoy/network/filter.h"

Expand Down
2 changes: 1 addition & 1 deletion source/server/active_stream_listener_base.h → ...ner_manager/active_stream_listener_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "envoy/stream_info/stream_info.h"

#include "source/common/common/linked_object.h"
#include "source/extensions/listener_managers/listener_manager/active_tcp_socket.h"
#include "source/server/active_listener_base.h"
#include "source/server/active_tcp_socket.h"

namespace Envoy {
namespace Server {
Expand Down
2 changes: 1 addition & 1 deletion source/server/active_tcp_listener.cc → ...s/listener_manager/active_tcp_listener.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "source/server/active_tcp_listener.h"
#include "source/extensions/listener_managers/listener_manager/active_tcp_listener.h"

#include <chrono>

Expand Down
4 changes: 2 additions & 2 deletions source/server/active_tcp_listener.h → ...rs/listener_manager/active_tcp_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "envoy/stream_info/stream_info.h"

#include "source/common/common/linked_object.h"
#include "source/extensions/listener_managers/listener_manager/active_stream_listener_base.h"
#include "source/extensions/listener_managers/listener_manager/active_tcp_socket.h"
#include "source/server/active_listener_base.h"
#include "source/server/active_stream_listener_base.h"
#include "source/server/active_tcp_socket.h"

namespace Envoy {
namespace Server {
Expand Down
4 changes: 2 additions & 2 deletions source/server/active_tcp_socket.cc → ...ers/listener_manager/active_tcp_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "source/server/active_tcp_socket.h"
#include "source/extensions/listener_managers/listener_manager/active_tcp_socket.h"

#include "envoy/network/filter.h"

#include "source/common/stream_info/stream_info_impl.h"
#include "source/server/active_stream_listener_base.h"
#include "source/extensions/listener_managers/listener_manager/active_stream_listener_base.h"

namespace Envoy {
namespace Server {
Expand Down
0 source/server/active_tcp_socket.h → ...gers/listener_manager/active_tcp_socket.h
View file
Open in desktop
File renamed without changes.
7 changes: 5 additions & 2 deletions source/server/connection_handler_impl.cc → ...stener_manager/connection_handler_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "source/server/connection_handler_impl.h"
#include "source/extensions/listener_managers/listener_manager/connection_handler_impl.h"

#include <chrono>

Expand All @@ -10,7 +10,8 @@
#include "source/common/network/address_impl.h"
#include "source/common/network/utility.h"
#include "source/common/runtime/runtime_features.h"
#include "source/server/active_tcp_listener.h"
#include "source/extensions/listener_managers/listener_manager/active_tcp_listener.h"
#include "source/server/listener_manager_factory.h"

namespace Envoy {
namespace Server {
Expand Down Expand Up @@ -374,5 +375,7 @@ ConnectionHandlerImpl::getBalancedHandlerByAddress(const Network::Address::Insta
: absl::nullopt;
}

REGISTER_FACTORY(ConnectionHandlerFactoryImpl, ConnectionHandlerFactory);

} // namespace Server
} // namespace Envoy
18 changes: 15 additions & 3 deletions source/server/connection_handler_impl.h → ...istener_manager/connection_handler_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "envoy/stats/scope.h"

#include "source/common/common/non_copyable.h"
#include "source/server/listener_manager_factory.h"

#include "spdlog/spdlog.h"

Expand All @@ -27,9 +28,7 @@ class ActiveInternalListener;
* Server side connection handler. This is used both by workers as well as the
* main thread for non-threaded listeners.
*/
class ConnectionHandlerImpl : public Network::TcpConnectionHandler,
public Network::UdpConnectionHandler,
public Network::InternalListenerManager,
class ConnectionHandlerImpl : public ConnectionHandler,
NonCopyable,
Logger::Loggable<Logger::Id::conn_handler> {
public:
Expand Down Expand Up @@ -154,5 +153,18 @@ class ConnectionHandlerImpl : public Network::TcpConnectionHandler,
UnitFloat listener_reject_fraction_{UnitFloat::min()};
};

class ConnectionHandlerFactoryImpl : public ConnectionHandlerFactory {
public:
std::unique_ptr<ConnectionHandler>
createConnectionHandler(Event::Dispatcher& dispatcher,
absl::optional<uint32_t> worker_index) override {
return std::make_unique<ConnectionHandlerImpl>(dispatcher, worker_index);
}

std::string name() const override { return "envoy.connection_handler.default"; }
};

DECLARE_FACTORY(ConnectionHandlerFactoryImpl);

} // namespace Server
} // namespace Envoy
Loading