Skip to content
/ i2pd Public
forked from PurpleI2P/i2pd

Commit

Permalink
Make SOCKS use TCPIPAcceptor
Browse files Browse the repository at this point in the history
  • Loading branch information
klondi committed Jan 8, 2015
1 parent 8a6bea6 commit 7d9c0b7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 53 deletions.
36 changes: 2 additions & 34 deletions SOCKS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ();
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;
}
return std::make_shared<SOCKSHandler> (this, socket);
}

}
Expand Down
26 changes: 7 additions & 19 deletions SOCKS.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,16 @@ namespace i2p
{
namespace proxy
{
class SOCKSHandler;
class SOCKSServer: public i2p::client::I2PService
class SOCKSServer: public i2p::client::TCPIPAcceptor
{
private:
std::set<std::shared_ptr<SOCKSHandler> > m_Handlers;
boost::asio::ip::tcp::acceptor m_Acceptor;
boost::asio::deadline_timer m_Timer;
std::mutex m_HandlersMutex;

private:

void Accept();
void HandleAccept(const boost::system::error_code& ecode, boost::asio::ip::tcp::socket * socket);
protected:
// Implements TCPIPAcceptor
std::shared_ptr<i2p::client::I2PServiceHandler> CreateHandler(boost::asio::ip::tcp::socket * socket);
const char* GetName() { return "SOCKS"; }

public:
SOCKSServer(int port) : I2PService(nullptr),
m_Acceptor (GetService (), boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)),
m_Timer (GetService ()) {};
~SOCKSServer() { Stop(); }

void Start ();
void Stop ();
SOCKSServer(int port) : TCPIPAcceptor(port) {}
~SOCKSServer() {}
};

typedef SOCKSServer SOCKSProxy;
Expand Down

0 comments on commit 7d9c0b7

Please sign in to comment.