From c2410e5997b840e8654b96ac40b83999f13e3ab6 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 17 Jul 2023 16:59:48 +0200 Subject: [PATCH] dnsdist: Remove TCPIOHandler::hasBufferedData() since we cannot rely on it --- pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc | 5 ----- pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc | 5 ----- pdns/dnsdistdist/test-dnsdisttcp_cc.cc | 5 ----- pdns/tcpiohandler.cc | 19 ------------------- pdns/tcpiohandler.hh | 9 --------- 5 files changed, 43 deletions(-) diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc index 48d2f6eeeb..e3e9dedd9e 100644 --- a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc @@ -362,11 +362,6 @@ public: BOOST_REQUIRE_EQUAL(step.request, ExpectedStep::ExpectedRequest::closeClient); } - bool hasBufferedData() const override - { - return false; - } - bool isUsable() const override { return true; diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc index 3e5bb16312..a7afea2063 100644 --- a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc @@ -405,11 +405,6 @@ public: BOOST_REQUIRE_EQUAL(step.request, !d_client ? ExpectedStep::ExpectedRequest::closeClient : ExpectedStep::ExpectedRequest::closeBackend); } - bool hasBufferedData() const override - { - return false; - } - bool isUsable() const override { return true; diff --git a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc index dedfd97d2b..296cd44cb6 100644 --- a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc +++ b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc @@ -208,11 +208,6 @@ public: BOOST_REQUIRE_EQUAL(step.request, !d_client ? ExpectedStep::ExpectedRequest::closeClient : ExpectedStep::ExpectedRequest::closeBackend); } - bool hasBufferedData() const override - { - return false; - } - bool isUsable() const override { return true; diff --git a/pdns/tcpiohandler.cc b/pdns/tcpiohandler.cc index 6be1eea476..db12a7f4b9 100644 --- a/pdns/tcpiohandler.cc +++ b/pdns/tcpiohandler.cc @@ -432,16 +432,6 @@ public: return got; } - bool hasBufferedData() const override - { - if (d_conn) { - /* this is broken when read-ahead is set, unfortunately */ - return SSL_pending(d_conn.get()) > 0; - } - - return false; - } - bool isUsable() const override { if (!d_conn) { @@ -1445,15 +1435,6 @@ public: return got; } - bool hasBufferedData() const override - { - if (d_conn) { - return gnutls_record_check_pending(d_conn.get()) > 0; - } - - return false; - } - bool isUsable() const override { if (!d_conn) { diff --git a/pdns/tcpiohandler.hh b/pdns/tcpiohandler.hh index 3cf674ca16..3f68828163 100644 --- a/pdns/tcpiohandler.hh +++ b/pdns/tcpiohandler.hh @@ -32,7 +32,6 @@ public: virtual size_t write(const void* buffer, size_t bufferSize, const struct timeval& writeTimeout) = 0; virtual IOState tryWrite(const PacketBuffer& buffer, size_t& pos, size_t toWrite) = 0; virtual IOState tryRead(PacketBuffer& buffer, size_t& pos, size_t toRead, bool allowIncomplete=false) = 0; - virtual bool hasBufferedData() const = 0; virtual std::string getServerNameIndication() const = 0; virtual std::vector getNextProtocol() const = 0; virtual LibsslTLSVersion getTLSVersion() const = 0; @@ -476,14 +475,6 @@ public: return writen2WithTimeout(d_socket, buffer, bufferSize, writeTimeout); } - bool hasBufferedData() const - { - if (d_conn) { - return d_conn->hasBufferedData(); - } - return false; - } - std::string getServerNameIndication() const { if (d_conn) { -- 2.47.2