Skip to content

Commit 8e639ec

Browse files
soulxusoulxu
committed
network: rename the class name of SocketAddressProvider to ConnectionInfoProvider
Signed-off-by: He Jie Xu <hejie.xu@intel.com>
1 parent 34910b6 commit 8e639ec

19 files changed

+45
-45
lines changed

‎envoy/network/connection.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ class Connection : public Event::DeferredDeletable,
194194
/**
195195
* @return the address provider backing this connection.
196196
*/
197-
virtual const SocketAddressProvider& addressProvider() const PURE;
198-
virtual SocketAddressProviderSharedPtr addressProviderSharedPtr() const PURE;
197+
virtual const ConnectionInfoProvider& addressProvider() const PURE;
198+
virtual ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const PURE;
199199

200200
/**
201201
* Credentials of the peer of a socket as decided by SO_PEERCRED.

‎envoy/network/socket.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ struct SocketOptionName {
5050
* TODO(soulxu): Since there are more than address information inside the provider, this will be
5151
* renamed as ConnectionInfoProvider. Ref https://github.com/envoyproxy/envoy/issues/17168
5252
*/
53-
class SocketAddressProvider {
53+
class ConnectionInfoProvider {
5454
public:
55-
virtual ~SocketAddressProvider() = default;
55+
virtual ~ConnectionInfoProvider() = default;
5656

5757
/**
5858
* @return the local address of the socket.
@@ -87,7 +87,7 @@ class SocketAddressProvider {
8787
virtual absl::optional<uint64_t> connectionID() const PURE;
8888

8989
/**
90-
* Dumps the state of the SocketAddressProvider to the given ostream.
90+
* Dumps the state of the ConnectionInfoProvider to the given ostream.
9191
*
9292
* @param os the std::ostream to dump to.
9393
* @param indent_level the level of indentation.
@@ -101,7 +101,7 @@ class SocketAddressProvider {
101101
virtual Ssl::ConnectionInfoConstSharedPtr sslConnection() const PURE;
102102
};
103103

104-
class SocketAddressSetter : public SocketAddressProvider {
104+
class SocketAddressSetter : public ConnectionInfoProvider {
105105
public:
106106
/**
107107
* Set the local address of the socket. On accepted sockets the local address defaults to the
@@ -146,7 +146,7 @@ class SocketAddressSetter : public SocketAddressProvider {
146146
};
147147

148148
using SocketAddressSetterSharedPtr = std::shared_ptr<SocketAddressSetter>;
149-
using SocketAddressProviderSharedPtr = std::shared_ptr<const SocketAddressProvider>;
149+
using ConnectionInfoProviderSharedPtr = std::shared_ptr<const ConnectionInfoProvider>;
150150

151151
/**
152152
* Base class for Sockets
@@ -164,8 +164,8 @@ class Socket {
164164
* @return the address provider backing this socket.
165165
*/
166166
virtual SocketAddressSetter& addressProvider() PURE;
167-
virtual const SocketAddressProvider& addressProvider() const PURE;
168-
virtual SocketAddressProviderSharedPtr addressProviderSharedPtr() const PURE;
167+
virtual const ConnectionInfoProvider& addressProvider() const PURE;
168+
virtual ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const PURE;
169169

170170
/**
171171
* @return IoHandle for the underlying connection

‎envoy/stream_info/stream_info.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ class StreamInfo {
466466
/**
467467
* @return the downstream address provider.
468468
*/
469-
virtual const Network::SocketAddressProvider& downstreamAddressProvider() const PURE;
469+
virtual const Network::ConnectionInfoProvider& downstreamAddressProvider() const PURE;
470470

471471
/**
472472
* @param connection_info sets the upstream ssl connection.

‎source/common/http/filter_manager.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,11 @@ class FilterManagerCallbacks {
585585
/**
586586
* This class allows the remote address to be overridden for HTTP stream info. This is used for
587587
* XFF handling. This is required to avoid providing stream info with a non-const address provider.
588-
* Private inheritance from SocketAddressProvider is used to make sure users get the address
588+
* Private inheritance from ConnectionInfoProvider is used to make sure users get the address
589589
* provider via the normal getter.
590590
*/
591591
class OverridableRemoteSocketAddressSetterStreamInfo : public StreamInfo::StreamInfoImpl,
592-
private Network::SocketAddressProvider {
592+
private Network::ConnectionInfoProvider {
593593
public:
594594
using StreamInfoImpl::StreamInfoImpl;
595595

@@ -603,9 +603,9 @@ class OverridableRemoteSocketAddressSetterStreamInfo : public StreamInfo::Stream
603603
}
604604

605605
// StreamInfo::StreamInfo
606-
const Network::SocketAddressProvider& downstreamAddressProvider() const override { return *this; }
606+
const Network::ConnectionInfoProvider& downstreamAddressProvider() const override { return *this; }
607607

608-
// Network::SocketAddressProvider
608+
// Network::ConnectionInfoProvider
609609
const Network::Address::InstanceConstSharedPtr& localAddress() const override {
610610
return StreamInfoImpl::downstreamAddressProvider().localAddress();
611611
}

‎source/common/network/connection_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ class ConnectionImpl : public ConnectionImplBase, public TransportSocketCallback
7272
void readDisable(bool disable) override;
7373
void detectEarlyCloseWhenReadDisabled(bool value) override { detect_early_close_ = value; }
7474
bool readEnabled() const override;
75-
const SocketAddressProvider& addressProvider() const override {
75+
const ConnectionInfoProvider& addressProvider() const override {
7676
return socket_->addressProvider();
7777
}
78-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
78+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
7979
return socket_->addressProviderSharedPtr();
8080
}
8181
absl::optional<UnixDomainSocketPeerCredentials> unixSocketPeerCredentials() const override;

‎source/common/network/happy_eyeballs_connection_impl.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ bool HappyEyeballsConnectionImpl::readEnabled() const {
155155
return connections_[0]->readEnabled();
156156
}
157157

158-
const SocketAddressProvider& HappyEyeballsConnectionImpl::addressProvider() const {
158+
const ConnectionInfoProvider& HappyEyeballsConnectionImpl::addressProvider() const {
159159
return connections_[0]->addressProvider();
160160
}
161161

162-
SocketAddressProviderSharedPtr HappyEyeballsConnectionImpl::addressProviderSharedPtr() const {
162+
ConnectionInfoProviderSharedPtr HappyEyeballsConnectionImpl::addressProviderSharedPtr() const {
163163
return connections_[0]->addressProviderSharedPtr();
164164
}
165165

‎source/common/network/happy_eyeballs_connection_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class HappyEyeballsConnectionImpl : public ClientConnection {
7272
bool isHalfCloseEnabled() override;
7373
std::string nextProtocol() const override;
7474
// Note, this might change before connect finishes.
75-
const SocketAddressProvider& addressProvider() const override;
75+
const ConnectionInfoProvider& addressProvider() const override;
7676
// Note, this might change before connect finishes.
77-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override;
77+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override;
7878
// Note, this might change before connect finishes.
7979
absl::optional<UnixDomainSocketPeerCredentials> unixSocketPeerCredentials() const override;
8080
// Note, this might change before connect finishes.

‎source/common/network/socket_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class SocketImpl : public virtual Socket {
7373

7474
// Network::Socket
7575
SocketAddressSetter& addressProvider() override { return *address_provider_; }
76-
const SocketAddressProvider& addressProvider() const override { return *address_provider_; }
77-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
76+
const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; }
77+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
7878
return address_provider_;
7979
}
8080
SocketPtr duplicate() override {

‎source/common/quic/quic_filter_manager_connection_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class QuicFilterManagerConnectionImpl : public Network::ConnectionImplBase,
7171
const Network::SocketAddressSetter& addressProvider() const override {
7272
return network_connection_->connectionSocket()->addressProvider();
7373
}
74-
Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
74+
Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
7575
return network_connection_->connectionSocket()->addressProviderSharedPtr();
7676
}
7777
absl::optional<Network::Connection::UnixDomainSocketPeerCredentials>

‎source/common/stream_info/stream_info_impl.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ const ReplacementMap& emptySpaceReplacement() {
3636

3737
struct StreamInfoImpl : public StreamInfo {
3838
StreamInfoImpl(TimeSource& time_source,
39-
const Network::SocketAddressProviderSharedPtr& downstream_address_provider,
39+
const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider,
4040
FilterState::LifeSpan life_span = FilterState::LifeSpan::FilterChain)
4141
: StreamInfoImpl(absl::nullopt, time_source, downstream_address_provider,
4242
std::make_shared<FilterStateImpl>(life_span)) {}
4343

4444
StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source,
45-
const Network::SocketAddressProviderSharedPtr& downstream_address_provider)
45+
const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider)
4646
: StreamInfoImpl(protocol, time_source, downstream_address_provider,
4747
std::make_shared<FilterStateImpl>(FilterState::LifeSpan::FilterChain)) {}
4848

4949
StreamInfoImpl(Http::Protocol protocol, TimeSource& time_source,
50-
const Network::SocketAddressProviderSharedPtr& downstream_address_provider,
50+
const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider,
5151
FilterStateSharedPtr parent_filter_state, FilterState::LifeSpan life_span)
5252
: StreamInfoImpl(
5353
protocol, time_source, downstream_address_provider,
@@ -197,7 +197,7 @@ struct StreamInfoImpl : public StreamInfo {
197197

198198
void healthCheck(bool is_health_check) override { health_check_request_ = is_health_check; }
199199

200-
const Network::SocketAddressProvider& downstreamAddressProvider() const override {
200+
const Network::ConnectionInfoProvider& downstreamAddressProvider() const override {
201201
return *downstream_address_provider_;
202202
}
203203

@@ -305,14 +305,14 @@ struct StreamInfoImpl : public StreamInfo {
305305
absl::optional<uint32_t> attempt_count_;
306306

307307
private:
308-
static Network::SocketAddressProviderSharedPtr emptyDownstreamAddressProvider() {
308+
static Network::ConnectionInfoProviderSharedPtr emptyDownstreamAddressProvider() {
309309
MUTABLE_CONSTRUCT_ON_FIRST_USE(
310-
Network::SocketAddressProviderSharedPtr,
310+
Network::ConnectionInfoProviderSharedPtr,
311311
std::make_shared<Network::SocketAddressSetterImpl>(nullptr, nullptr));
312312
}
313313

314314
StreamInfoImpl(absl::optional<Http::Protocol> protocol, TimeSource& time_source,
315-
const Network::SocketAddressProviderSharedPtr& downstream_address_provider,
315+
const Network::ConnectionInfoProviderSharedPtr& downstream_address_provider,
316316
FilterStateSharedPtr filter_state)
317317
: time_source_(time_source), start_time_(time_source.systemTime()),
318318
start_time_monotonic_(time_source.monotonicTime()), protocol_(protocol),
@@ -325,7 +325,7 @@ struct StreamInfoImpl : public StreamInfo {
325325
uint64_t bytes_received_{};
326326
uint64_t bytes_sent_{};
327327
Network::Address::InstanceConstSharedPtr upstream_local_address_;
328-
const Network::SocketAddressProviderSharedPtr downstream_address_provider_;
328+
const Network::ConnectionInfoProviderSharedPtr downstream_address_provider_;
329329
Ssl::ConnectionInfoConstSharedPtr upstream_ssl_info_;
330330
std::string requested_server_name_;
331331
const Http::RequestHeaderMap* request_headers_{};

‎source/common/upstream/health_checker_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class HttpHealthCheckerImpl : public HealthCheckerImplBase {
141141
Http::ResponseHeaderMapPtr response_headers_;
142142
const std::string& hostname_;
143143
const Http::Protocol protocol_;
144-
Network::SocketAddressProviderSharedPtr local_address_provider_;
144+
Network::ConnectionInfoProviderSharedPtr local_address_provider_;
145145
bool expect_reset_{};
146146
bool reuse_connection_ = false;
147147
bool request_in_flight_ = false;

‎source/server/active_udp_listener.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ActiveRawUdpListener::ActiveRawUdpListener(uint32_t worker_index, uint32_t concu
7979
: ActiveRawUdpListener(worker_index, concurrency, parent, *listen_socket_ptr, listen_socket_ptr,
8080
dispatcher, config) {}
8181

82-
ActiveRawUdpListener::ActiveRawUdpListener(uint32_t worker_index, uint32_t concurrency,
82+
ActiveRawUdpListener:: ActiveRawUdpListener(uint32_t worker_index, uint32_t concurrency,
8383
Network::UdpConnectionHandler& parent,
8484
Network::Socket& listen_socket,
8585
Network::SocketSharedPtr listen_socket_ptr,

‎source/server/api_listener_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class ApiListenerImplBase : public ApiListener,
123123
const Network::SocketAddressSetter& addressProvider() const override {
124124
return *address_provider_;
125125
}
126-
Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
126+
Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
127127
return address_provider_;
128128
}
129129
absl::optional<Network::Connection::UnixDomainSocketPeerCredentials>

‎test/common/network/happy_eyeballs_connection_impl_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ TEST_F(HappyEyeballsConnectionImplTest, AddressProvider) {
975975
TEST_F(HappyEyeballsConnectionImplTest, AddressProviderSharedPtr) {
976976
connectFirstAttempt();
977977

978-
SocketAddressProviderSharedPtr provider = std::make_shared<SocketAddressSetterImpl>(
978+
ConnectionInfoProviderSharedPtr provider = std::make_shared<SocketAddressSetterImpl>(
979979
std::make_shared<Address::Ipv4Instance>("127.0.0.2"),
980980
std::make_shared<Address::Ipv4Instance>("127.0.0.1"));
981981
EXPECT_CALL(*created_connections_[0], addressProviderSharedPtr()).WillOnce(Return(provider));

‎test/mocks/network/connection.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class MockConnectionBase {
6565
MOCK_METHOD(void, readDisable, (bool disable)); \
6666
MOCK_METHOD(void, detectEarlyCloseWhenReadDisabled, (bool)); \
6767
MOCK_METHOD(bool, readEnabled, (), (const)); \
68-
MOCK_METHOD(const SocketAddressProvider&, addressProvider, (), (const)); \
69-
MOCK_METHOD(SocketAddressProviderSharedPtr, addressProviderSharedPtr, (), (const)); \
68+
MOCK_METHOD(const ConnectionInfoProvider&, addressProvider, (), (const)); \
69+
MOCK_METHOD(ConnectionInfoProviderSharedPtr, addressProviderSharedPtr, (), (const)); \
7070
MOCK_METHOD(absl::optional<Connection::UnixDomainSocketPeerCredentials>, \
7171
unixSocketPeerCredentials, (), (const)); \
7272
MOCK_METHOD(void, setConnectionStats, (const ConnectionStats& stats)); \

‎test/mocks/network/mocks.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ class MockListenSocket : public Socket {
244244
void addOptions(const Socket::OptionsSharedPtr& options) override { addOptions_(options); }
245245

246246
SocketAddressSetter& addressProvider() override { return *address_provider_; }
247-
const SocketAddressProvider& addressProvider() const override { return *address_provider_; }
248-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
247+
const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; }
248+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
249249
return address_provider_;
250250
}
251251
MOCK_METHOD(IoHandle&, ioHandle, ());
@@ -298,8 +298,8 @@ class MockConnectionSocket : public ConnectionSocket {
298298
void addOptions(const Socket::OptionsSharedPtr& options) override { addOptions_(options); }
299299

300300
SocketAddressSetter& addressProvider() override { return *address_provider_; }
301-
const SocketAddressProvider& addressProvider() const override { return *address_provider_; }
302-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
301+
const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; }
302+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
303303
return address_provider_;
304304
}
305305
MOCK_METHOD(void, setDetectedTransportProtocol, (absl::string_view));

‎test/mocks/network/socket.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class MockSocket : public Socket {
1515
~MockSocket() override;
1616

1717
SocketAddressSetter& addressProvider() override { return *address_provider_; }
18-
const SocketAddressProvider& addressProvider() const override { return *address_provider_; }
19-
SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
18+
const ConnectionInfoProvider& addressProvider() const override { return *address_provider_; }
19+
ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
2020
return address_provider_;
2121
}
2222
IoHandle& ioHandle() override;

‎test/mocks/stream_info/mocks.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class MockStreamInfo : public StreamInfo {
6565
MOCK_METHOD(const Network::Address::InstanceConstSharedPtr&, upstreamLocalAddress, (), (const));
6666
MOCK_METHOD(bool, healthCheck, (), (const));
6767
MOCK_METHOD(void, healthCheck, (bool is_health_check));
68-
MOCK_METHOD(const Network::SocketAddressProvider&, downstreamAddressProvider, (), (const));
68+
MOCK_METHOD(const Network::ConnectionInfoProvider&, downstreamAddressProvider, (), (const));
6969
MOCK_METHOD(void, setUpstreamSslConnection, (const Ssl::ConnectionInfoConstSharedPtr&));
7070
MOCK_METHOD(Ssl::ConnectionInfoConstSharedPtr, upstreamSslConnection, (), (const));
7171
MOCK_METHOD(Router::RouteConstSharedPtr, route, (), (const));

‎test/server/filter_chain_benchmark_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class MockConnectionSocket : public Network::ConnectionSocket {
7979
const Network::SocketAddressSetter& addressProvider() const override {
8080
return *address_provider_;
8181
}
82-
Network::SocketAddressProviderSharedPtr addressProviderSharedPtr() const override {
82+
Network::ConnectionInfoProviderSharedPtr addressProviderSharedPtr() const override {
8383
return address_provider_;
8484
}
8585

0 commit comments

Comments
 (0)