1 files changed, 16 insertions, 53 deletions

diff --git a/socks5.hpp b/socks5.hpp
index 203bdfe..07d0253 100644
--- a/socks5.hpp
+++ b/socks5.hpp
@@ -11,63 +11,29 @@
 #include <memory>
 #include <string_view>
 
-namespace SOCKS5 {
-class StreamBuffer : public boost::noncopyable {
-public:
-  explicit StreamBuffer(std::size_t size)
-      : m_bufferUsed{0}, m_bufferSize{size} {
-    m_buffer = new std::uint8_t[size];
-  }
-  StreamBuffer(StreamBuffer &&moveable) {
-    m_bufferUsed = moveable.m_bufferUsed;
-    m_bufferSize = moveable.m_bufferSize;
-    m_buffer = moveable.m_buffer;
-    moveable.m_buffer = nullptr;
-  }
-  ~StreamBuffer() { delete[] m_buffer; }
-  void operator+=(std::size_t commit_size) { m_bufferUsed += commit_size; }
-  void operator+=(const std::initializer_list<uint8_t> &to_add) {
-    std::copy(to_add.begin(), to_add.end(), &m_buffer[m_bufferUsed]);
-    m_bufferUsed += to_add.size();
-  }
-  void operator-=(std::size_t consume_size) { m_bufferUsed -= consume_size; }
-  auto operator+() {
-    return boost::asio::buffer(&m_buffer[m_bufferUsed],
-                               m_bufferSize - m_bufferUsed);
-  }
-  auto operator-() { return boost::asio::buffer(&m_buffer[0], m_bufferUsed); }
-  auto operator[](std::size_t index) const { return m_buffer[index]; }
-  const auto *operator()(std::size_t index = 0) const {
-    return &m_buffer[index];
-  }
-  auto size() const { return m_bufferUsed; }
-  auto getHealth() const {
-    return (static_cast<float>(m_bufferUsed) /
-            static_cast<float>(m_bufferSize));
-  }
-
-private:
-  std::size_t m_bufferUsed;
-  std::size_t m_bufferSize;
-  std::uint8_t *m_buffer;
-};
+#include "fastbuffer.hpp"
 
-class ProxySessionBase : public boost::noncopyable {
+namespace SOCKS5 {
+class ProxySessionBase : private boost::noncopyable {
 public:
+  using CompletionHandler = std::function<void(std::size_t length)>;
   ProxySessionBase(std::uint32_t session_id,
                    boost::asio::ip::tcp::socket &&client_socket,
                    std::size_t buffer_size = BUFSIZ);
   ProxySessionBase(std::uint32_t session_id,
                    boost::asio::ip::tcp::socket &&client_socket,
-                   StreamBuffer &&input_buffer, StreamBuffer &&output_buffer);
+                   ContiguousStreamBuffer &&input_buffer, ContiguousStreamBuffer &&output_buffer);
+  void async_read(const CompletionHandler &handler,
+                  std::size_t expected_length = 0);
 
+protected:
   std::uint32_t m_sessionId;
-  StreamBuffer m_inBuf;
-  StreamBuffer m_outBuf;
+  ContiguousStreamBuffer m_inBuf;
+  ContiguousStreamBuffer m_outBuf;
   boost::asio::ip::tcp::socket m_clientSocket;
 };
 
-class ProxySessionAuth : public ProxySessionBase,
+class ProxySessionAuth : private ProxySessionBase,
                          public std::enable_shared_from_this<ProxySessionAuth> {
 public:
   ProxySessionAuth(std::uint32_t session_id,
@@ -75,11 +41,9 @@ public:
   void start();
 
 private:
-  void recv_client_greeting(const boost::system::error_code &ec,
-                            std::size_t length);
+  void recv_client_greeting(std::size_t length);
   void send_server_greeting(bool auth_supported);
-  void recv_connection_request(const boost::system::error_code &ec,
-                               std::size_t length);
+  void recv_connection_request(std::size_t length);
   void process_connection_request();
   void send_server_response(std::uint8_t proxy_cmd, std::uint8_t status_code);
   void resolve_destination_host(std::uint8_t proxy_cmd,
@@ -96,7 +60,7 @@ private:
   boost::asio::ip::tcp::socket m_destinationSocket;
 };
 
-class ProxySessionTcp : public ProxySessionBase,
+class ProxySessionTcp : private ProxySessionBase,
                         public std::enable_shared_from_this<ProxySessionTcp> {
 public:
   explicit ProxySessionTcp(std::uint32_t session_id,
@@ -109,8 +73,7 @@ private:
   void recv_from_both();
   void recv_from_destination(const boost::system::error_code &ec,
                              std::size_t length);
-  void recv_from_client(const boost::system::error_code &ec,
-                        std::size_t length);
+  void recv_from_client(std::size_t length);
   void handle_client_write(const boost::system::error_code &ec,
                            std::size_t length);
   void handle_destination_write(const boost::system::error_code &ec,
@@ -119,7 +82,7 @@ private:
   boost::asio::ip::tcp::socket m_destinationSocket;
 };
 
-class ProxyServer : public boost::noncopyable {
+class ProxyServer : private boost::noncopyable {
 public:
   ProxyServer(boost::asio::io_context &ioc,
               const boost::asio::ip::tcp::endpoint &local_endpoint);