diff --git a/envoy/network/connection.h b/envoy/network/connection.h index da22c5309ab09..a7ada431dae94 100644 --- a/envoy/network/connection.h +++ b/envoy/network/connection.h @@ -194,8 +194,8 @@ class Connection : public Event::DeferredDeletable, /** * @return the address provider backing this connection. */ - virtual const SocketAddressProvider& addressProvider() const PURE; - virtual SocketAddressProviderSharedPtr addressProviderSharedPtr() const PURE; + virtual const ConnectionInfoProvider& addressProvider() const PURE; + virtual ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const PURE; /** * Credentials of the peer of a socket as decided by SO_PEERCRED. diff --git a/envoy/network/socket.h b/envoy/network/socket.h index 4300cb0da4702..d2fc93ddc5b2f 100644 --- a/envoy/network/socket.h +++ b/envoy/network/socket.h @@ -50,9 +50,9 @@ struct SocketOptionName { * TODO(soulxu): Since there are more than address information inside the provider, this will be * renamed as ConnectionInfoProvider. Ref https://github.com/envoyproxy/envoy/issues/17168 */ -class SocketAddressProvider { +class ConnectionInfoProvider { public: - virtual ~SocketAddressProvider() = default; + virtual ~ConnectionInfoProvider() = default; /** * @return the local address of the socket. @@ -87,7 +87,7 @@ class SocketAddressProvider { virtual absl::optional connectionID() const PURE; /** - * Dumps the state of the SocketAddressProvider to the given ostream. + * Dumps the state of the ConnectionInfoProvider to the given ostream. * * @param os the std::ostream to dump to. * @param indent_level the level of indentation. @@ -101,7 +101,7 @@ class SocketAddressProvider { virtual Ssl::ConnectionInfoConstSharedPtr sslConnection() const PURE; }; -class SocketAddressSetter : public SocketAddressProvider { +class ConnectionInfoSetter : public ConnectionInfoProvider { public: /** * Set the local address of the socket. On accepted sockets the local address defaults to the @@ -145,8 +145,8 @@ class SocketAddressSetter : public SocketAddressProvider { virtual void setSslConnection(const Ssl::ConnectionInfoConstSharedPtr& ssl_connection_info) PURE; }; -using SocketAddressSetterSharedPtr = std::shared_ptr; -using SocketAddressProviderSharedPtr = std::shared_ptr; +using ConnectionInfoSetterSharedPtr = std::shared_ptr; +using ConnectionInfoProviderSharedPtr = std::shared_ptr; /** * Base class for Sockets @@ -163,9 +163,9 @@ class Socket { /** * @return the address provider backing this socket. */ - virtual SocketAddressSetter& addressProvider() PURE; - virtual const SocketAddressProvider& addressProvider() const PURE; - virtual SocketAddressProviderSharedPtr addressProviderSharedPtr() const PURE; + virtual ConnectionInfoSetter& addressProvider() PURE; + virtual const ConnectionInfoProvider& addressProvider() const PURE; + virtual ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const PURE; /** * @return IoHandle for the underlying connection diff --git a/envoy/stream_info/stream_info.h b/envoy/stream_info/stream_info.h index 93affe6d63ed5..08fc6124bf1de 100644 --- a/envoy/stream_info/stream_info.h +++ b/envoy/stream_info/stream_info.h @@ -466,7 +466,7 @@ class StreamInfo { /** * @return the downstream address provider. */ - virtual const Network::SocketAddressProvider& downstreamAddressProvider() const PURE; + virtual const Network::ConnectionInfoProvider& downstreamAddressProvider() const PURE; /** * @param connection_info sets the upstream ssl connection. diff --git a/source/common/http/filter_manager.h b/source/common/http/filter_manager.h index 232726fd1debe..d3214998bf5cf 100644 --- a/source/common/http/filter_manager.h +++ b/source/common/http/filter_manager.h @@ -585,11 +585,11 @@ class FilterManagerCallbacks { /** * This class allows the remote address to be overridden for HTTP stream info. This is used for * XFF handling. This is required to avoid providing stream info with a non-const address provider. - * Private inheritance from SocketAddressProvider is used to make sure users get the address + * Private inheritance from ConnectionInfoProvider is used to make sure users get the address * provider via the normal getter. */ -class OverridableRemoteSocketAddressSetterStreamInfo : public StreamInfo::StreamInfoImpl, - private Network::SocketAddressProvider { +class OverridableRemoteConnectionInfoSetterStreamInfo : public StreamInfo::StreamInfoImpl, + private Network::ConnectionInfoProvider { public: using StreamInfoImpl::StreamInfoImpl; @@ -603,9 +603,11 @@ class OverridableRemoteSocketAddressSetterStreamInfo : public StreamInfo::Stream } // StreamInfo::StreamInfo - const Network::SocketAddressProvider& downstreamAddressProvider() const override { return *this; } + const Network::ConnectionInfoProvider& downstreamAddressProvider() const override { + return *this; + } - // Network::SocketAddressProvider + // Network::ConnectionInfoProvider const Network::Address::InstanceConstSharedPtr& localAddress() const override { return StreamInfoImpl::downstreamAddressProvider().localAddress(); } @@ -636,7 +638,7 @@ class OverridableRemoteSocketAddressSetterStreamInfo : public StreamInfo::Stream StreamInfoImpl::dumpState(os, indent_level); const char* spaces = spacesForLevel(indent_level); - os << spaces << "OverridableRemoteSocketAddressSetterStreamInfo " << this + os << spaces << "OverridableRemoteConnectionInfoSetterStreamInfo " << this << DUMP_MEMBER_AS(remoteAddress(), remoteAddress()->asStringView()) << DUMP_MEMBER_AS(directRemoteAddress(), directRemoteAddress()->asStringView()) << DUMP_MEMBER_AS(localAddress(), localAddress()->asStringView()) << "\n"; @@ -1025,7 +1027,7 @@ class FilterManager : public ScopeTrackedObject, FilterChainFactory& filter_chain_factory_; const LocalReply::LocalReply& local_reply_; - OverridableRemoteSocketAddressSetterStreamInfo stream_info_; + OverridableRemoteConnectionInfoSetterStreamInfo stream_info_; // TODO(snowp): Once FM has been moved to its own file we'll make these private classes of FM, // at which point they no longer need to be friends. friend ActiveStreamFilterBase; diff --git a/source/common/network/connection_impl.h b/source/common/network/connection_impl.h index 618a6b293d3e0..963f71c8103d6 100644 --- a/source/common/network/connection_impl.h +++ b/source/common/network/connection_impl.h @@ -72,10 +72,10 @@ class ConnectionImpl : public ConnectionImplBase, public TransportSocketCallback void readDisable(bool disable) override; void detectEarlyCloseWhenReadDisabled(bool value) override { detect_early_close_ = value; } bool readEnabled() const override; - const SocketAddressProvider& addressProvider() const override { + const ConnectionInfoProvider& addressProvider() const override { return socket_->addressProvider(); } - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return socket_->addressProviderSharedPtr(); } absl::optional unixSocketPeerCredentials() const override; diff --git a/source/common/network/happy_eyeballs_connection_impl.cc b/source/common/network/happy_eyeballs_connection_impl.cc index dbe68e170d059..e1083611f9e19 100644 --- a/source/common/network/happy_eyeballs_connection_impl.cc +++ b/source/common/network/happy_eyeballs_connection_impl.cc @@ -155,11 +155,11 @@ bool HappyEyeballsConnectionImpl::readEnabled() const { return connections_[0]->readEnabled(); } -const SocketAddressProvider& HappyEyeballsConnectionImpl::addressProvider() const { +const ConnectionInfoProvider& HappyEyeballsConnectionImpl::addressProvider() const { return connections_[0]->addressProvider(); } -SocketAddressProviderSharedPtr HappyEyeballsConnectionImpl::addressProviderSharedPtr() const { +ConnectionInfoProviderSharedPtr HappyEyeballsConnectionImpl::addressProviderSharedPtr() const { return connections_[0]->addressProviderSharedPtr(); } diff --git a/source/common/network/happy_eyeballs_connection_impl.h b/source/common/network/happy_eyeballs_connection_impl.h index 9417db2de44d5..4318eaae94bfb 100644 --- a/source/common/network/happy_eyeballs_connection_impl.h +++ b/source/common/network/happy_eyeballs_connection_impl.h @@ -72,9 +72,9 @@ class HappyEyeballsConnectionImpl : public ClientConnection { bool isHalfCloseEnabled() override; std::string nextProtocol() const override; // Note, this might change before connect finishes. - const SocketAddressProvider& addressProvider() const override; + const ConnectionInfoProvider& addressProvider() const override; // Note, this might change before connect finishes. - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override; + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override; // Note, this might change before connect finishes. absl::optional unixSocketPeerCredentials() const override; // Note, this might change before connect finishes. diff --git a/source/common/network/socket_impl.cc b/source/common/network/socket_impl.cc index 76d1bd47c37cf..a78f7df30bcae 100644 --- a/source/common/network/socket_impl.cc +++ b/source/common/network/socket_impl.cc @@ -13,14 +13,14 @@ SocketImpl::SocketImpl(Socket::Type sock_type, const Address::InstanceConstSharedPtr& address_for_io_handle, const Address::InstanceConstSharedPtr& remote_address) : io_handle_(ioHandleForAddr(sock_type, address_for_io_handle)), - address_provider_(std::make_shared(nullptr, remote_address)), + address_provider_(std::make_shared(nullptr, remote_address)), sock_type_(sock_type), addr_type_(address_for_io_handle->type()) {} SocketImpl::SocketImpl(IoHandlePtr&& io_handle, const Address::InstanceConstSharedPtr& local_address, const Address::InstanceConstSharedPtr& remote_address) : io_handle_(std::move(io_handle)), - address_provider_(std::make_shared(local_address, remote_address)) { + address_provider_(std::make_shared(local_address, remote_address)) { if (address_provider_->localAddress() != nullptr) { addr_type_ = address_provider_->localAddress()->type(); diff --git a/source/common/network/socket_impl.h b/source/common/network/socket_impl.h index 12b651f3c4821..80d17d00fe34a 100644 --- a/source/common/network/socket_impl.h +++ b/source/common/network/socket_impl.h @@ -8,10 +8,10 @@ namespace Envoy { namespace Network { -class SocketAddressSetterImpl : public SocketAddressSetter { +class ConnectionInfoSetterImpl : public ConnectionInfoSetter { public: - SocketAddressSetterImpl(const Address::InstanceConstSharedPtr& local_address, - const Address::InstanceConstSharedPtr& remote_address) + ConnectionInfoSetterImpl(const Address::InstanceConstSharedPtr& local_address, + const Address::InstanceConstSharedPtr& remote_address) : local_address_(local_address), remote_address_(remote_address), direct_remote_address_(remote_address) {} @@ -21,14 +21,14 @@ class SocketAddressSetterImpl : public SocketAddressSetter { void dumpState(std::ostream& os, int indent_level) const override { const char* spaces = spacesForLevel(indent_level); - os << spaces << "SocketAddressSetterImpl " << this + os << spaces << "ConnectionInfoSetterImpl " << this << DUMP_NULLABLE_MEMBER(remote_address_, remote_address_->asStringView()) << DUMP_NULLABLE_MEMBER(direct_remote_address_, direct_remote_address_->asStringView()) << DUMP_NULLABLE_MEMBER(local_address_, local_address_->asStringView()) << DUMP_MEMBER(server_name_) << "\n"; } - // SocketAddressSetter + // ConnectionInfoSetter const Address::InstanceConstSharedPtr& localAddress() const override { return local_address_; } void setLocalAddress(const Address::InstanceConstSharedPtr& local_address) override { local_address_ = local_address; @@ -72,9 +72,9 @@ class SocketImpl : public virtual Socket { const Address::InstanceConstSharedPtr& remote_address); // Network::Socket - SocketAddressSetter& addressProvider() override { return *address_provider_; } - const SocketAddressProvider& addressProvider() const override { return *address_provider_; } - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + ConnectionInfoSetter& addressProvider() override { return *address_provider_; } + const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; } + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } SocketPtr duplicate() override { @@ -128,7 +128,7 @@ class SocketImpl : public virtual Socket { const Address::InstanceConstSharedPtr& remote_address); const IoHandlePtr io_handle_; - const std::shared_ptr address_provider_; + const std::shared_ptr address_provider_; OptionsSharedPtr options_; Socket::Type sock_type_; Address::Type addr_type_; diff --git a/source/common/quic/quic_filter_manager_connection_impl.h b/source/common/quic/quic_filter_manager_connection_impl.h index 3441f7fc47d9e..614c0e7c82670 100644 --- a/source/common/quic/quic_filter_manager_connection_impl.h +++ b/source/common/quic/quic_filter_manager_connection_impl.h @@ -68,10 +68,10 @@ class QuicFilterManagerConnectionImpl : public Network::ConnectionImplBase, void readDisable(bool /*disable*/) override { ASSERT(false); } void detectEarlyCloseWhenReadDisabled(bool /*value*/) override { ASSERT(false); } bool readEnabled() const override { return true; } - const Network::SocketAddressSetter& addressProvider() const override { + const Network::ConnectionInfoSetter& addressProvider() const override { return network_connection_->connectionSocket()->addressProvider(); } - Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return network_connection_->connectionSocket()->addressProviderSharedPtr(); } absl::optional diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h index 2024754272fd6..32843b130dfc3 100644 --- a/source/common/stream_info/stream_info_impl.h +++ b/source/common/stream_info/stream_info_impl.h @@ -36,18 +36,18 @@ const ReplacementMap& emptySpaceReplacement() { struct StreamInfoImpl : public StreamInfo { StreamInfoImpl(TimeSource& time_source, - const Network::SocketAddressProviderSharedPtr& downstream_address_provider, + const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider, FilterState::LifeSpan life_span = FilterState::LifeSpan::FilterChain) : StreamInfoImpl(absl::nullopt, time_source, downstream_address_provider, std::make_shared(life_span)) {} StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source, - const Network::SocketAddressProviderSharedPtr& downstream_address_provider) + const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider) : StreamInfoImpl(protocol, time_source, downstream_address_provider, std::make_shared(FilterState::LifeSpan::FilterChain)) {} StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source, - const Network::SocketAddressProviderSharedPtr& downstream_address_provider, + const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider, FilterStateSharedPtr parent_filter_state, FilterState::LifeSpan life_span) : StreamInfoImpl( protocol, time_source, downstream_address_provider, @@ -197,7 +197,7 @@ struct StreamInfoImpl : public StreamInfo { void healthCheck(bool is_health_check) override { health_check_request_ = is_health_check; } - const Network::SocketAddressProvider& downstreamAddressProvider() const override { + const Network::ConnectionInfoProvider& downstreamAddressProvider() const override { return *downstream_address_provider_; } @@ -305,14 +305,14 @@ struct StreamInfoImpl : public StreamInfo { absl::optional attempt_count_; private: - static Network::SocketAddressProviderSharedPtr emptyDownstreamAddressProvider() { + static Network::ConnectionInfoProviderSharedPtr emptyDownstreamAddressProvider() { MUTABLE_CONSTRUCT_ON_FIRST_USE( - Network::SocketAddressProviderSharedPtr, - std::make_shared(nullptr, nullptr)); + Network::ConnectionInfoProviderSharedPtr, + std::make_shared(nullptr, nullptr)); } StreamInfoImpl(absl::optional protocol, TimeSource& time_source, - const Network::SocketAddressProviderSharedPtr& downstream_address_provider, + const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider, FilterStateSharedPtr filter_state) : time_source_(time_source), start_time_(time_source.systemTime()), start_time_monotonic_(time_source.monotonicTime()), protocol_(protocol), @@ -325,7 +325,7 @@ struct StreamInfoImpl : public StreamInfo { uint64_t bytes_received_{}; uint64_t bytes_sent_{}; Network::Address::InstanceConstSharedPtr upstream_local_address_; - const Network::SocketAddressProviderSharedPtr downstream_address_provider_; + const Network::ConnectionInfoProviderSharedPtr downstream_address_provider_; Ssl::ConnectionInfoConstSharedPtr upstream_ssl_info_; std::string requested_server_name_; const Http::RequestHeaderMap* request_headers_{}; diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc index edcb756ee246b..ffbdc1756a97f 100644 --- a/source/common/upstream/health_checker_impl.cc +++ b/source/common/upstream/health_checker_impl.cc @@ -205,7 +205,7 @@ HttpHealthCheckerImpl::HttpActiveHealthCheckSession::HttpActiveHealthCheckSessio : ActiveHealthCheckSession(parent, host), parent_(parent), hostname_(getHostname(host, parent_.host_value_, parent_.cluster_.info())), protocol_(codecClientTypeToProtocol(parent_.codec_client_type_)), - local_address_provider_(std::make_shared( + local_address_provider_(std::make_shared( Network::Utility::getCanonicalIpv4LoopbackAddress(), Network::Utility::getCanonicalIpv4LoopbackAddress())) {} diff --git a/source/common/upstream/health_checker_impl.h b/source/common/upstream/health_checker_impl.h index a4000fc2ecc59..d598c36552270 100644 --- a/source/common/upstream/health_checker_impl.h +++ b/source/common/upstream/health_checker_impl.h @@ -141,7 +141,7 @@ class HttpHealthCheckerImpl : public HealthCheckerImplBase { Http::ResponseHeaderMapPtr response_headers_; const std::string& hostname_; const Http::Protocol protocol_; - Network::SocketAddressProviderSharedPtr local_address_provider_; + Network::ConnectionInfoProviderSharedPtr local_address_provider_; bool expect_reset_{}; bool reuse_connection_ = false; bool request_in_flight_ = false; diff --git a/source/server/api_listener_impl.h b/source/server/api_listener_impl.h index fdb8498ad1f0f..0f03387666216 100644 --- a/source/server/api_listener_impl.h +++ b/source/server/api_listener_impl.h @@ -79,7 +79,7 @@ class ApiListenerImplBase : public ApiListener, class SyntheticConnection : public Network::Connection { public: SyntheticConnection(SyntheticReadCallbacks& parent) - : parent_(parent), address_provider_(std::make_shared( + : parent_(parent), address_provider_(std::make_shared( parent.parent_.address_, parent.parent_.address_)), stream_info_(parent_.parent_.factory_context_.timeSource(), address_provider_), options_(std::make_shared>()) {} @@ -120,10 +120,10 @@ class ApiListenerImplBase : public ApiListener, void readDisable(bool) override {} void detectEarlyCloseWhenReadDisabled(bool) override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; } bool readEnabled() const override { return true; } - const Network::SocketAddressSetter& addressProvider() const override { + const Network::ConnectionInfoSetter& addressProvider() const override { return *address_provider_; } - Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } absl::optional @@ -152,7 +152,7 @@ class ApiListenerImplBase : public ApiListener, void dumpState(std::ostream& os, int) const override { os << "SyntheticConnection"; } SyntheticReadCallbacks& parent_; - Network::SocketAddressSetterSharedPtr address_provider_; + Network::ConnectionInfoSetterSharedPtr address_provider_; StreamInfo::StreamInfoImpl stream_info_; Network::ConnectionSocket::OptionsSharedPtr options_; std::list callbacks_; diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc index f69728e094aa1..139f9c761ae1c 100644 --- a/test/common/grpc/async_client_impl_test.cc +++ b/test/common/grpc/async_client_impl_test.cc @@ -142,7 +142,7 @@ TEST_F(EnvoyAsyncClientImplTest, MetadataIsInitialized) { .WillOnce(Invoke([&http_callbacks](Http::HeaderMap&, bool) { http_callbacks->onReset(); })); // Prepare the parent context of this call. - auto address_provider = std::make_shared( + auto address_provider = std::make_shared( std::make_shared(expected_downstream_local_address), nullptr); StreamInfo::StreamInfoImpl stream_info{test_time_.timeSystem(), address_provider}; Http::AsyncClient::ParentContext parent_context{&stream_info}; diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc index 30c8d6aecac98..4fa6ef597eaca 100644 --- a/test/common/grpc/google_async_client_impl_test.cc +++ b/test/common/grpc/google_async_client_impl_test.cc @@ -135,7 +135,7 @@ TEST_F(EnvoyGoogleAsyncClientImplTest, MetadataIsInitialized) { EXPECT_CALL(grpc_callbacks, onRemoteClose(Status::WellKnownGrpcStatus::Unavailable, "")); // Prepare the parent context of this call. - auto address_provider = std::make_shared( + auto address_provider = std::make_shared( std::make_shared(expected_downstream_local_address), nullptr); StreamInfo::StreamInfoImpl stream_info{test_time_.timeSystem(), address_provider}; Http::AsyncClient::ParentContext parent_context{&stream_info}; diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index 279cefbb0b3bd..8c214f59d259a 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -1918,7 +1918,7 @@ TEST_P(ConnectionImplTest, NetworkSocketDumpsWithoutAllocatingMemory) { const auto contents = ostream.contents(); EXPECT_THAT(contents, HasSubstr("ListenSocketImpl")); EXPECT_THAT(contents, HasSubstr("transport_protocol_: ")); - EXPECT_THAT(contents, HasSubstr("SocketAddressSetterImpl")); + EXPECT_THAT(contents, HasSubstr("ConnectionInfoSetterImpl")); if (GetParam() == Network::Address::IpVersion::v4) { EXPECT_THAT( contents, diff --git a/test/common/network/happy_eyeballs_connection_impl_test.cc b/test/common/network/happy_eyeballs_connection_impl_test.cc index f3c7106bee5ac..a14c428db4d86 100644 --- a/test/common/network/happy_eyeballs_connection_impl_test.cc +++ b/test/common/network/happy_eyeballs_connection_impl_test.cc @@ -966,8 +966,8 @@ TEST_F(HappyEyeballsConnectionImplTest, NextProtocol) { TEST_F(HappyEyeballsConnectionImplTest, AddressProvider) { connectFirstAttempt(); - const SocketAddressSetterImpl provider(std::make_shared(80), - std::make_shared(80)); + const ConnectionInfoSetterImpl provider(std::make_shared(80), + std::make_shared(80)); EXPECT_CALL(*created_connections_[0], addressProvider()).WillOnce(ReturnRef(provider)); impl_->addressProvider(); } @@ -975,7 +975,7 @@ TEST_F(HappyEyeballsConnectionImplTest, AddressProvider) { TEST_F(HappyEyeballsConnectionImplTest, AddressProviderSharedPtr) { connectFirstAttempt(); - SocketAddressProviderSharedPtr provider = std::make_shared( + ConnectionInfoProviderSharedPtr provider = std::make_shared( std::make_shared("127.0.0.2"), std::make_shared("127.0.0.1")); EXPECT_CALL(*created_connections_[0], addressProviderSharedPtr()).WillOnce(Return(provider)); diff --git a/test/common/router/upstream_request_test.cc b/test/common/router/upstream_request_test.cc index 312d5f0c99d69..e0d308fe7f171 100644 --- a/test/common/router/upstream_request_test.cc +++ b/test/common/router/upstream_request_test.cc @@ -74,7 +74,7 @@ TEST_F(UpstreamRequestTest, DumpsStateWithoutAllocatingMemory) { // Check Contents EXPECT_THAT(ostream.contents(), HasSubstr("UpstreamRequest ")); - EXPECT_THAT(ostream.contents(), HasSubstr("addressProvider: \n SocketAddressSetterImpl ")); + EXPECT_THAT(ostream.contents(), HasSubstr("addressProvider: \n ConnectionInfoSetterImpl ")); EXPECT_THAT(ostream.contents(), HasSubstr("request_headers: \n")); } diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h index 1c8632ba6f768..37f8299a078b1 100644 --- a/test/common/stream_info/test_util.h +++ b/test/common/stream_info/test_util.h @@ -75,7 +75,7 @@ class TestStreamInfo : public StreamInfo::StreamInfo { } bool healthCheck() const override { return health_check_request_; } void healthCheck(bool is_health_check) override { health_check_request_ = is_health_check; } - const Network::SocketAddressSetter& downstreamAddressProvider() const override { + const Network::ConnectionInfoSetter& downstreamAddressProvider() const override { return *downstream_address_provider_; } @@ -241,8 +241,8 @@ class TestStreamInfo : public StreamInfo::StreamInfo { bool health_check_request_{}; std::string route_name_; Network::Address::InstanceConstSharedPtr upstream_local_address_; - Network::SocketAddressSetterSharedPtr downstream_address_provider_{ - std::make_shared(nullptr, nullptr)}; + Network::ConnectionInfoSetterSharedPtr downstream_address_provider_{ + std::make_shared(nullptr, nullptr)}; Ssl::ConnectionInfoConstSharedPtr downstream_connection_info_; Ssl::ConnectionInfoConstSharedPtr upstream_connection_info_; Router::RouteConstSharedPtr route_; diff --git a/test/fuzz/utility.h b/test/fuzz/utility.h index c03b3a8c32850..dfcf551ef14ca 100644 --- a/test/fuzz/utility.h +++ b/test/fuzz/utility.h @@ -166,7 +166,7 @@ inline std::unique_ptr fromStreamInfo(const test::fuzz::StreamIn : Network::Utility::resolveUrl("tcp://10.0.0.1:10000"); test_stream_info->upstream_local_address_ = upstream_local_address; test_stream_info->downstream_address_provider_ = - std::make_shared(address, address); + std::make_shared(address, address); test_stream_info->downstream_address_provider_->setRequestedServerName( stream_info.requested_server_name()); auto connection_info = std::make_shared>(); diff --git a/test/mocks/network/connection.h b/test/mocks/network/connection.h index 585ef50e2a174..6f03b5f55d884 100644 --- a/test/mocks/network/connection.h +++ b/test/mocks/network/connection.h @@ -65,8 +65,8 @@ class MockConnectionBase { MOCK_METHOD(void, readDisable, (bool disable)); \ MOCK_METHOD(void, detectEarlyCloseWhenReadDisabled, (bool)); \ MOCK_METHOD(bool, readEnabled, (), (const)); \ - MOCK_METHOD(const SocketAddressProvider&, addressProvider, (), (const)); \ - MOCK_METHOD(SocketAddressProviderSharedPtr, addressProviderSharedPtr, (), (const)); \ + MOCK_METHOD(const ConnectionInfoProvider&, addressProvider, (), (const)); \ + MOCK_METHOD(ConnectionInfoProviderSharedPtr, addressProviderSharedPtr, (), (const)); \ MOCK_METHOD(absl::optional, \ unixSocketPeerCredentials, (), (const)); \ MOCK_METHOD(void, setConnectionStats, (const ConnectionStats& stats)); \ diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc index f4f20e1359b97..9ba968e31047a 100644 --- a/test/mocks/network/mocks.cc +++ b/test/mocks/network/mocks.cc @@ -133,7 +133,7 @@ MockFilterChainFactory::~MockFilterChainFactory() = default; MockListenSocket::MockListenSocket() : io_handle_(std::make_unique>()), - address_provider_(std::make_shared( + address_provider_(std::make_shared( std::make_shared(80), nullptr)) { ON_CALL(*this, options()).WillByDefault(ReturnRef(options_)); ON_CALL(*this, ioHandle()).WillByDefault(ReturnRef(*io_handle_)); @@ -158,8 +158,8 @@ MockSocketOption::~MockSocketOption() = default; MockConnectionSocket::MockConnectionSocket() : io_handle_(std::make_unique()), address_provider_( - std::make_shared(std::make_shared(80), - std::make_shared(80))) { + std::make_shared(std::make_shared(80), + std::make_shared(80))) { ON_CALL(*this, ioHandle()).WillByDefault(ReturnRef(*io_handle_)); ON_CALL(testing::Const(*this), ioHandle()).WillByDefault(ReturnRef(*io_handle_)); ON_CALL(*this, ipVersion()) diff --git a/test/mocks/network/mocks.h b/test/mocks/network/mocks.h index ce971d0b92cd3..963f9dcfc1136 100644 --- a/test/mocks/network/mocks.h +++ b/test/mocks/network/mocks.h @@ -243,9 +243,9 @@ class MockListenSocket : public Socket { void addOption(const Socket::OptionConstSharedPtr& option) override { addOption_(option); } void addOptions(const Socket::OptionsSharedPtr& options) override { addOptions_(options); } - SocketAddressSetter& addressProvider() override { return *address_provider_; } - const SocketAddressProvider& addressProvider() const override { return *address_provider_; } - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + ConnectionInfoSetter& addressProvider() override { return *address_provider_; } + const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; } + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } MOCK_METHOD(IoHandle&, ioHandle, ()); @@ -272,7 +272,7 @@ class MockListenSocket : public Socket { MOCK_METHOD(Api::SysCallIntResult, setBlockingForTest, (bool)); std::unique_ptr io_handle_; - Network::SocketAddressSetterSharedPtr address_provider_; + Network::ConnectionInfoSetterSharedPtr address_provider_; OptionsSharedPtr options_; bool socket_is_open_ = true; }; @@ -297,9 +297,9 @@ class MockConnectionSocket : public ConnectionSocket { void addOption(const Socket::OptionConstSharedPtr& option) override { addOption_(option); } void addOptions(const Socket::OptionsSharedPtr& options) override { addOptions_(options); } - SocketAddressSetter& addressProvider() override { return *address_provider_; } - const SocketAddressProvider& addressProvider() const override { return *address_provider_; } - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + ConnectionInfoSetter& addressProvider() override { return *address_provider_; } + const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; } + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } MOCK_METHOD(void, setDetectedTransportProtocol, (absl::string_view)); @@ -334,7 +334,7 @@ class MockConnectionSocket : public ConnectionSocket { MOCK_METHOD(void, dumpState, (std::ostream&, int), (const)); IoHandlePtr io_handle_; - std::shared_ptr address_provider_; + std::shared_ptr address_provider_; bool is_closed_; }; diff --git a/test/mocks/network/socket.h b/test/mocks/network/socket.h index b4f3ac4e6b43b..dc159633716c1 100644 --- a/test/mocks/network/socket.h +++ b/test/mocks/network/socket.h @@ -14,9 +14,9 @@ class MockSocket : public Socket { MockSocket(); ~MockSocket() override; - SocketAddressSetter& addressProvider() override { return *address_provider_; } - const SocketAddressProvider& addressProvider() const override { return *address_provider_; } - SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + ConnectionInfoSetter& addressProvider() override { return *address_provider_; } + const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; } + ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } IoHandle& ioHandle() override; @@ -43,7 +43,7 @@ class MockSocket : public Socket { MOCK_METHOD(void, addOptions, (const Socket::OptionsSharedPtr&), (override)); const std::unique_ptr io_handle_; - Network::SocketAddressSetterSharedPtr address_provider_; + Network::ConnectionInfoSetterSharedPtr address_provider_; }; } // namespace Network diff --git a/test/mocks/stream_info/mocks.cc b/test/mocks/stream_info/mocks.cc index 5d6332a230862..8fb2a2c6b3c40 100644 --- a/test/mocks/stream_info/mocks.cc +++ b/test/mocks/stream_info/mocks.cc @@ -18,7 +18,7 @@ namespace StreamInfo { MockStreamInfo::MockStreamInfo() : start_time_(ts_.systemTime()), filter_state_(std::make_shared(FilterState::LifeSpan::FilterChain)), - downstream_address_provider_(std::make_shared( + downstream_address_provider_(std::make_shared( std::make_shared("127.0.0.2"), std::make_shared("127.0.0.1"))) { ON_CALL(*this, setResponseFlag(_)).WillByDefault(Invoke([this](ResponseFlag response_flag) { diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h index 6209cff3a2424..fe7b291c08f85 100644 --- a/test/mocks/stream_info/mocks.h +++ b/test/mocks/stream_info/mocks.h @@ -65,7 +65,7 @@ class MockStreamInfo : public StreamInfo { MOCK_METHOD(const Network::Address::InstanceConstSharedPtr&, upstreamLocalAddress, (), (const)); MOCK_METHOD(bool, healthCheck, (), (const)); MOCK_METHOD(void, healthCheck, (bool is_health_check)); - MOCK_METHOD(const Network::SocketAddressProvider&, downstreamAddressProvider, (), (const)); + MOCK_METHOD(const Network::ConnectionInfoProvider&, downstreamAddressProvider, (), (const)); MOCK_METHOD(void, setUpstreamSslConnection, (const Ssl::ConnectionInfoConstSharedPtr&)); MOCK_METHOD(Ssl::ConnectionInfoConstSharedPtr, upstreamSslConnection, (), (const)); MOCK_METHOD(Router::RouteConstSharedPtr, route, (), (const)); @@ -124,7 +124,7 @@ class MockStreamInfo : public StreamInfo { uint64_t bytes_received_{}; uint64_t bytes_sent_{}; Network::Address::InstanceConstSharedPtr upstream_local_address_; - std::shared_ptr downstream_address_provider_; + std::shared_ptr downstream_address_provider_; Ssl::ConnectionInfoConstSharedPtr downstream_connection_info_; Ssl::ConnectionInfoConstSharedPtr upstream_connection_info_; std::string route_name_; diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index 89569264633b0..17d61ef11975b 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -39,7 +39,7 @@ class MockFilterChainFactoryBuilder : public FilterChainFactoryBuilder { class MockConnectionSocket : public Network::ConnectionSocket { public: MockConnectionSocket() - : address_provider_(std::make_shared(nullptr, nullptr)) {} + : address_provider_(std::make_shared(nullptr, nullptr)) {} static std::unique_ptr createMockConnectionSocket(uint16_t destination_port, const std::string& destination_address, @@ -75,11 +75,11 @@ class MockConnectionSocket : public Network::ConnectionSocket { const std::vector& requestedApplicationProtocols() const override { return application_protocols_; } - Network::SocketAddressSetter& addressProvider() override { return *address_provider_; } - const Network::SocketAddressSetter& addressProvider() const override { + Network::ConnectionInfoSetter& addressProvider() override { return *address_provider_; } + const Network::ConnectionInfoSetter& addressProvider() const override { return *address_provider_; } - Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override { + Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override { return address_provider_; } @@ -126,7 +126,7 @@ class MockConnectionSocket : public Network::ConnectionSocket { private: Network::IoHandlePtr io_handle_; OptionsSharedPtr options_; - std::shared_ptr address_provider_; + std::shared_ptr address_provider_; std::string server_name_; std::string transport_protocol_; std::vector application_protocols_; diff --git a/test/tools/router_check/router.cc b/test/tools/router_check/router.cc index 4d21e67c5a752..20b0b9caa3cf7 100644 --- a/test/tools/router_check/router.cc +++ b/test/tools/router_check/router.cc @@ -247,7 +247,7 @@ bool RouterCheckTool::compareEntries(const std::string& expected_routes) { validation_config.tests()) { active_runtime_ = check_config.input().runtime(); headers_finalized_ = false; - auto address_provider = std::make_shared( + auto address_provider = std::make_shared( nullptr, Network::Utility::getCanonicalIpv4LoopbackAddress()); Envoy::StreamInfo::StreamInfoImpl stream_info(Envoy::Http::Protocol::Http11, factory_context_->dispatcher().timeSource(),