From 3728cbca0336c953e535417ccbbeb19b95d008db Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 25 Nov 2020 10:56:19 +0100
Subject: [PATCH] dnsdist: Clean up unused fields in IncomingTCPConnectionState

---
 pdns/dnsdist-tcp.cc                      | 7 ++-----
 pdns/dnsdistdist/dnsdist-tcp-upstream.hh | 3 ---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc
index a8d9963d23..a3f32f0292 100644
--- a/pdns/dnsdist-tcp.cc
+++ b/pdns/dnsdist-tcp.cc
@@ -294,7 +294,7 @@ static bool handleResponseSent(std::shared_ptr<IncomingTCPConnectionState>& stat
     --state->d_currentQueriesCount;
 
     const auto& currentResponse = state->d_currentResponse;
-    if (state->d_selfGeneratedResponse == false && currentResponse.d_connection && currentResponse.d_connection->getDS()) {
+    if (currentResponse.d_selfGenerated == false && currentResponse.d_connection && currentResponse.d_connection->getDS()) {
       const auto& ds = currentResponse.d_connection->getDS();
       struct timespec answertime;
       gettime(&answertime);
@@ -351,9 +351,7 @@ void IncomingTCPConnectionState::resetForNewQuery()
   d_buffer.resize(sizeof(uint16_t));
   d_currentPos = 0;
   d_querySize = 0;
-  d_downstreamFailures = 0;
   d_state = State::readingQuerySize;
-  d_selfGeneratedResponse = false;
 }
 
 std::shared_ptr<TCPConnectionToBackend> IncomingTCPConnectionState::getActiveDownstreamConnection(const std::shared_ptr<DownstreamState>& ds)
@@ -511,7 +509,6 @@ static IOState handleQuery(std::shared_ptr<IncomingTCPConnectionState>& state, c
   }
 
   state->d_readingFirstQuery = false;
-  state->d_proxyProtocolPayloadAdded = false;
   ++state->d_queriesCount;
   ++state->d_ci.cs->queries;
   ++g_stats.queries;
@@ -578,9 +575,9 @@ static IOState handleQuery(std::shared_ptr<IncomingTCPConnectionState>& state, c
   }
 
   if (result == ProcessQueryResult::SendAnswer) {
-    state->d_selfGeneratedResponse = true;
     state->d_buffer.resize(dq.len);
     TCPResponse response;
+    response.d_selfGenerated = true;
     response.d_buffer = std::move(state->d_buffer);
     state->d_state = IncomingTCPConnectionState::State::idle;
     ++state->d_currentQueriesCount;
diff --git a/pdns/dnsdistdist/dnsdist-tcp-upstream.hh b/pdns/dnsdistdist/dnsdist-tcp-upstream.hh
index 91b090ff9c..f5e063cae3 100644
--- a/pdns/dnsdistdist/dnsdist-tcp-upstream.hh
+++ b/pdns/dnsdistdist/dnsdist-tcp-upstream.hh
@@ -217,13 +217,10 @@ public:
   size_t d_currentQueriesCount{0};
   unsigned int d_remainingTime{0};
   uint16_t d_querySize{0};
-  uint16_t d_downstreamFailures{0};
   State d_state{State::doingHandshake};
   bool d_readingFirstQuery{true};
   bool d_isXFR{false};
   bool d_xfrStarted{false};
-  bool d_selfGeneratedResponse{false};
-  bool d_proxyProtocolPayloadAdded{false};
   bool d_proxyProtocolPayloadHasTLV{false};
 };
 
-- 
2.47.2