dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-09-01 17:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct RESOLVE response

Browse Source
This commit is contained in:
orignal
2026-06-25 18:42:56 -04:00
parent 42d036a93f
commit 18d4c82090
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libi2pd_client/SOCKS.cpp
+17 -10
View File
@@ -40,6 +40,7 @@ namespace proxy
memcpy(value,str.c_str(),size);
}
std::string ToString() { return std::string(value, size); }
std::string_view GetString () const { return std::string_view(value, size); }
void push_back (char c) { value[size++] = c; }
};
@@ -637,16 +638,22 @@ namespace proxy
{
if (m_state == READY)
{
if (m_addrtype == ADDR_IPV4 && (m_address.ip & 0xFF000000) == 0xFF000000) // 255.x.x.x
std::string resolved;
if (m_addrtype == ADDR_IPV4)
{
boost::asio::ip::address_v4 addr(m_address.ip);
std::string resolved = GetServer ()->GetResolvedAddress (addr);
if (!resolved.empty ())
{
LogPrint(eLogInfo, "SOCKS: Replaced ", addr, " -> " , resolved);
m_address.dns.FromString (resolved);
m_addrtype = ADDR_DNS;
}
if ((m_address.ip & 0xFF000000) == 0xFF000000) // 255.x.x.x
resolved = GetServer ()->GetResolvedAddress (boost::asio::ip::address_v4(m_address.ip));
}
else if (m_addrtype == ADDR_DNS)
{
if (m_address.dns.GetString ().substr (0, 4) == "255.")
resolved = GetServer ()->GetResolvedAddress (boost::asio::ip::make_address (m_address.dns.GetString ()).to_v4());
}
if (!resolved.empty ())
{
LogPrint(eLogInfo, "SOCKS: Replaced to ", resolved);
m_address.dns.FromString (resolved);
m_addrtype = ADDR_DNS;
}
const std::string addr = m_address.dns.ToString();
@@ -681,7 +688,7 @@ namespace proxy
{
address ad;
ad.ip = GetServer ()->ResolveAddress (m_address.dns.ToString()).to_uint();
boost::asio::async_write(*m_sock, GenerateSOCKS5Response(SOCKS5_OK, ADDR_DNS, ad, m_port),
boost::asio::async_write(*m_sock, GenerateSOCKS5Response(SOCKS5_OK, ADDR_IPV4, ad, m_port),
std::bind(&SOCKSHandler::SentSocksDone, shared_from_this(), std::placeholders::_1));
});
break;