Skip to content

Commit d76d053

Browse files
authored
clang-tidy: fixes errors in common/tcp (envoyproxy#37502)
part of envoyproxy#28566 Signed-off-by: Takeshi Yoneda <[email protected]>
1 parent 885693b commit d76d053

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

source/common/tcp/async_tcp_client_impl.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ AsyncTcpClientImpl::~AsyncTcpClientImpl() {
2929
connection_->removeConnectionCallbacks(*this);
3030
}
3131

32-
close(Network::ConnectionCloseType::NoFlush);
32+
closeImpl(Network::ConnectionCloseType::NoFlush);
3333
}
3434

3535
bool AsyncTcpClientImpl::connect() {
@@ -76,7 +76,7 @@ void AsyncTcpClientImpl::onConnectTimeout() {
7676
close(Network::ConnectionCloseType::NoFlush);
7777
}
7878

79-
void AsyncTcpClientImpl::close(Network::ConnectionCloseType type) {
79+
void AsyncTcpClientImpl::closeImpl(Network::ConnectionCloseType type) {
8080
if (connection_ && !closing_) {
8181
closing_ = true;
8282
connection_->close(type);

source/common/tcp/async_tcp_client_impl.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class AsyncTcpClientImpl : public AsyncTcpClient,
2828
AsyncTcpClientImpl(Event::Dispatcher& dispatcher,
2929
Upstream::ThreadLocalCluster& thread_local_cluster,
3030
Upstream::LoadBalancerContext* context, bool enable_half_close);
31-
~AsyncTcpClientImpl();
31+
~AsyncTcpClientImpl() override;
3232

33-
void close(Network::ConnectionCloseType type) override;
33+
void close(Network::ConnectionCloseType type) override { closeImpl(type); }
3434

3535
Network::DetectedCloseType detectedCloseType() const override { return detected_close_; }
3636

@@ -68,6 +68,10 @@ class AsyncTcpClientImpl : public AsyncTcpClient,
6868
}
6969

7070
private:
71+
// This implements the AsyncTcpClient::close but exists as non-virtual to avoid calling it in the
72+
// destructor.
73+
void closeImpl(Network::ConnectionCloseType type);
74+
7175
struct NetworkReadFilter : public Network::ReadFilterBaseImpl {
7276
NetworkReadFilter(AsyncTcpClientImpl& parent) : parent_(parent) {}
7377

0 commit comments

Comments
 (0)