Make SOCKS use TCPIPAcceptor

SOCKS.cpp

@@ -514,41 +514,9 @@ namespace proxy
 		}
 	}
 
-	void SOCKSServer::Start ()
+	std::shared_ptr<i2p::client::I2PServiceHandler> SOCKSServer::CreateHandler(boost::asio::ip::tcp::socket * socket)
 	{
-		m_Acceptor.listen ();
+		return std::make_shared<SOCKSHandler> (this, socket);
-		Accept ();
-	}
-
-	void SOCKSServer::Stop ()
-	{
-		m_Acceptor.close();
-		m_Timer.cancel ();
-		ClearHandlers();
-	}
-
-	void SOCKSServer::Accept ()
-	{
-		auto newSocket = new boost::asio::ip::tcp::socket (GetService ());
-		m_Acceptor.async_accept (*newSocket, std::bind (&SOCKSServer::HandleAccept, this,
-			std::placeholders::_1, newSocket));
-	}
-
-	void SOCKSServer::HandleAccept (const boost::system::error_code& ecode, boost::asio::ip::tcp::socket * socket)
-	{
-		if (!ecode)
-		{
-			LogPrint(eLogDebug,"--- SOCKS accepted");
-			auto handle = std::make_shared<SOCKSHandler> (this, socket);
-			AddHandler(handle);
-			handle->Handle();
-			Accept();
-		}
-		else
-		{
-			LogPrint (eLogError,"--- SOCKS Closing socket on accept because: ", ecode.message ());
-			delete socket;
-		}
 	}
 
 }

SOCKS.h

@@ -11,28 +11,16 @@ namespace i2p
 {
 namespace proxy
 {
-	class SOCKSHandler;
+	class SOCKSServer: public i2p::client::TCPIPAcceptor
-	class SOCKSServer: public i2p::client::I2PService
 	{
-		private:
+		protected:
-			std::set<std::shared_ptr<SOCKSHandler> > m_Handlers;
+			// Implements TCPIPAcceptor
-			boost::asio::ip::tcp::acceptor m_Acceptor;
+			std::shared_ptr<i2p::client::I2PServiceHandler> CreateHandler(boost::asio::ip::tcp::socket * socket);
-			boost::asio::deadline_timer m_Timer;
+			const char* GetName() { return "SOCKS"; }
-			std::mutex m_HandlersMutex;
-
-		private:
-
-			void Accept();
-			void HandleAccept(const boost::system::error_code& ecode, boost::asio::ip::tcp::socket * socket);
 
 		public:
-			SOCKSServer(int port) : I2PService(nullptr),
+			SOCKSServer(int port) : TCPIPAcceptor(port) {}
-				m_Acceptor (GetService (), boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)),
+			~SOCKSServer() {}
-				m_Timer (GetService ()) {};
-			~SOCKSServer() { Stop(); }
-
-			void Start ();
-			void Stop ();
 	};
 
 	typedef SOCKSServer SOCKSProxy;