From 4c605a79b7f68092b26da116fac8edfd8f46f230 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 15 Aug 2013 23:48:05 -0700 Subject: [PATCH] Rename to max_needed for clarity --- .../protocol/beast_HandshakeDetectorType.h | 18 ++++++++++++------ .../sockets/ripple_MultiSocketType.h | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Subtrees/beast/modules/beast_asio/protocol/beast_HandshakeDetectorType.h b/Subtrees/beast/modules/beast_asio/protocol/beast_HandshakeDetectorType.h index 5d5a3f429..b896815cd 100644 --- a/Subtrees/beast/modules/beast_asio/protocol/beast_HandshakeDetectorType.h +++ b/Subtrees/beast/modules/beast_asio/protocol/beast_HandshakeDetectorType.h @@ -29,9 +29,15 @@ public: { } - /** Returns the minimum number of bytes we need to succeed. + /** How many bytes maximum we might need. + + This is the largest number of bytes that the detector + might need in order to come to a conclusion about + whether or not the handshake is a match. Depending + on the data, it could come to that conclusion sooner + though. */ - virtual std::size_t needed () = 0; + virtual std::size_t max_needed () = 0; /** Returns true if the return value of success() is valid. */ @@ -190,7 +196,7 @@ public: bytesNeeded = 3 }; - std::size_t needed () + std::size_t max_needed () { return bytesNeeded; } @@ -262,7 +268,7 @@ public: bytesNeeded = 6 }; - std::size_t needed () + std::size_t max_needed () { return bytesNeeded; } @@ -309,9 +315,9 @@ public: { } - std::size_t needed () noexcept + std::size_t max_needed () noexcept { - return m_logic.needed (); + return m_logic.max_needed (); } bool finished () noexcept diff --git a/modules/ripple_asio/sockets/ripple_MultiSocketType.h b/modules/ripple_asio/sockets/ripple_MultiSocketType.h index b51bc7f2c..607e12182 100644 --- a/modules/ripple_asio/sockets/ripple_MultiSocketType.h +++ b/modules/ripple_asio/sockets/ripple_MultiSocketType.h @@ -54,7 +54,7 @@ public: ec = boost::system::error_code (); m_buffer.commit (boost::asio::read (m_next_layer, - m_buffer.prepare (m_detector.needed ()), ec)); + m_buffer.prepare (m_detector.max_needed ()), ec)); if (!ec) {