Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-08 22:13:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

NTCP2 proxy

Browse source
This commit is contained in:
orignal 2020-03-01 11:24:18 -05:00
parent de4cb74173
commit ae20e3aa95
2 changed files with 77 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libi2pd/NTCP2.cpp
View file

@ -1184,7 +1184,9 @@ namespace transport
conn->Terminate(); conn->Terminate();
return; return;
} }
if(m_ProxyType == eSocksProxy) switch (m_ProxyType)
{
case eSocksProxy:
{ {
// TODO: support username/password auth etc // TODO: support username/password auth etc
uint8_t buff[3] = {0x05, 0x01, 0x00}; uint8_t buff[3] = {0x05, 0x01, 0x00};
@ -1196,7 +1198,8 @@ namespace transport
} }
}); });
uint8_t readbuff[2]; uint8_t readbuff[2];
boost::asio::async_read(conn->GetSocket(), boost::asio::buffer(readbuff, 2), [=](const boost::system::error_code & ec, std::size_t transferred) boost::asio::async_read(conn->GetSocket(), boost::asio::buffer(readbuff, 2),
[=](const boost::system::error_code & ec, std::size_t transferred)
{ {
LogPrint(eLogError, "NTCP2: ", transferred); LogPrint(eLogError, "NTCP2: ", transferred);
if(ec) if(ec)
@ -1226,8 +1229,9 @@ namespace transport
timer->cancel(); timer->cancel();
conn->Terminate(); conn->Terminate();
}); });
break;
} }
else if(m_ProxyType == eHTTPProxy) case eHTTPProxy:
{ {
i2p::http::HTTPReq req; i2p::http::HTTPReq req;
req.method = "CONNECT"; req.method = "CONNECT";
@ -1248,7 +1252,9 @@ namespace transport
}); });
boost::asio::streambuf * readbuff = new boost::asio::streambuf; boost::asio::streambuf * readbuff = new boost::asio::streambuf;
boost::asio::async_read_until(conn->GetSocket(), *readbuff, "\r\n\r\n", [=] (const boost::system::error_code & ec, std::size_t transferred) { boost::asio::async_read_until(conn->GetSocket(), *readbuff, "\r\n\r\n",
[=] (const boost::system::error_code & ec, std::size_t transferred)
{
if(ec) if(ec)
{ {
LogPrint(eLogError, "NTCP2: http proxy read error ", ec.message()); LogPrint(eLogError, "NTCP2: http proxy read error ", ec.message());
@ -1280,17 +1286,16 @@ namespace transport
delete readbuff; delete readbuff;
} }
}); });
break;
} }
else default:
LogPrint(eLogError, "NTCP2: unknown proxy type, invalid state"); LogPrint(eLogError, "NTCP2: unknown proxy type, invalid state");
} }
}
void NTCP2Server::ConnectWithProxy (const std::string& host, uint16_t port, RemoteAddressType addrtype, std::shared_ptr<NTCP2Session> conn) void NTCP2Server::ConnectWithProxy (const std::string& host, uint16_t port, RemoteAddressType addrtype, std::shared_ptr<NTCP2Session> conn)
{ {
if(m_ProxyEndpoint == nullptr) if(!m_ProxyEndpoint) return
{
return;
}
GetService().post([=]() { GetService().post([=]() {
if (this->AddNTCP2Session (conn)) if (this->AddNTCP2Session (conn))
{ {
@ -1359,9 +1364,8 @@ namespace transport
} }
NTCP2Server::NTCP2Server (): NTCP2Server::NTCP2Server ():
RunnableServiceWithWork ("NTCP2"), RunnableServiceWithWork ("NTCP2"), m_TerminationTimer (GetService ()),
m_ProxyType(eNoProxy), m_Resolver(GetService ()), m_ProxyEndpoint(nullptr), m_Resolver(GetService ())
m_TerminationTimer (GetService ())
{ {
} }
@ -1388,11 +1392,9 @@ namespace transport
} }
else else
{ {
m_ProxyEndpoint = new boost::asio::ip::tcp::endpoint(*itr); m_ProxyEndpoint.reset (new boost::asio::ip::tcp::endpoint(*itr));
if (m_ProxyEndpoint) if (m_ProxyEndpoint)
{ LogPrint(eLogError, "NTCP2: m_ProxyEndpoint ", *m_ProxyEndpoint);
LogPrint(eLogError, "NTCP2: m_ProxyEndpoint %s", m_ProxyEndpoint);
}
} }
} }
else else
@ -1461,12 +1463,8 @@ namespace transport
if (IsRunning ()) if (IsRunning ())
{ {
m_TerminationTimer.cancel (); m_TerminationTimer.cancel ();
if(m_ProxyEndpoint)
{
delete m_ProxyEndpoint;
m_ProxyEndpoint = nullptr; m_ProxyEndpoint = nullptr;
} }
}
StopIOService (); StopIOService ();
} }

4
libi2pd/NTCP2.h
View file

@ -274,11 +274,11 @@ namespace transport
std::map<i2p::data::IdentHash, std::shared_ptr<NTCP2Session> > m_NTCP2Sessions; std::map<i2p::data::IdentHash, std::shared_ptr<NTCP2Session> > m_NTCP2Sessions;
std::list<std::shared_ptr<NTCP2Session> > m_PendingIncomingSessions; std::list<std::shared_ptr<NTCP2Session> > m_PendingIncomingSessions;
ProxyType m_ProxyType; ProxyType m_ProxyType =eNoProxy;
std::string m_ProxyAddress; std::string m_ProxyAddress;
uint16_t m_ProxyPort; uint16_t m_ProxyPort;
boost::asio::ip::tcp::resolver m_Resolver; boost::asio::ip::tcp::resolver m_Resolver;
boost::asio::ip::tcp::endpoint * m_ProxyEndpoint; std::unique_ptr<boost::asio::ip::tcp::endpoint> m_ProxyEndpoint;
public: public: