PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

[SOCKS] overwrite connection info after establishing connection to i2p host (closes #1336)

Browse Source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2020-05-25 03:53:54 +03:00
parent 1975adc48f
commit 50c8a84037
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libi2pd_client/SOCKS.cpp
View File

@ -227,38 +227,50 @@ namespace proxy
boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS4Response(SOCKSHandler::errTypes error, uint32_t ip, uint16_t port) boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS4Response(SOCKSHandler::errTypes error, uint32_t ip, uint16_t port)
{ {
assert(error >= SOCKS4_OK); assert(error >= SOCKS4_OK);
m_response[0] = '\x00'; //Version m_response[0] = '\x00'; // version
m_response[1] = error; //Response code m_response[1] = error; // response code
htobe16buf(m_response + 2, port); //Port htobe16buf(m_response + 2, port); // port
htobe32buf(m_response + 4, ip); //IP htobe32buf(m_response + 4, ip); // IP
return boost::asio::const_buffers_1(m_response,8); return boost::asio::const_buffers_1(m_response,8);
} }
boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS5Response(SOCKSHandler::errTypes error, SOCKSHandler::addrTypes type, const SOCKSHandler::address &addr, uint16_t port) boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS5Response(SOCKSHandler::errTypes error, SOCKSHandler::addrTypes type, const SOCKSHandler::address &addr, uint16_t port)
{ {
size_t size = 6; // header + port size_t size = 6; // header + port
assert(error <= SOCKS5_ADDR_UNSUP); assert(error <= SOCKS5_ADDR_UNSUP);
m_response[0] = '\x05'; //Version m_response[0] = '\x05'; // version
m_response[1] = error; //Response code m_response[1] = error; // response code
m_response[2] = '\x00'; //RSV m_response[2] = '\x00'; // reserved
m_response[3] = type; //Address type m_response[3] = type; // address type
switch (type) switch (type)
{ {
case ADDR_IPV4: case ADDR_IPV4:
size += 4; size += 4;
htobe32buf(m_response + 4, addr.ip); htobe32buf(m_response + 4, addr.ip);
htobe16buf(m_response + size - 2, port);
break; break;
case ADDR_IPV6: case ADDR_IPV6:
size += 16; size += 16;
memcpy(m_response + 4, addr.ipv6, 16); memcpy(m_response + 4, addr.ipv6, 16);
htobe16buf(m_response + size - 2, port);
break; break;
case ADDR_DNS: case ADDR_DNS:
size += (1 + addr.dns.size); /* name length + domain name */ std::string address(addr.dns.value, addr.dns.size);
m_response[4] = addr.dns.size; if(address.substr(addr.dns.size - 4, 4) == ".i2p") // overwrite if requested address inside I2P
memcpy(m_response + 5, addr.dns.value, addr.dns.size); {
m_response[3] = ADDR_IPV4;
size += 4;
memset(m_response + 4, 0, 6); // six HEX zeros
}
else
{
size += (1 + addr.dns.size); /* name length + resolved address */
m_response[4] = addr.dns.size;
memcpy(m_response + 5, addr.dns.value, addr.dns.size);
htobe16buf(m_response + size - 2, port);
}
break; break;
} }
htobe16buf(m_response + size - 2, port); //Port
return boost::asio::const_buffers_1(m_response, size); return boost::asio::const_buffers_1(m_response, size);
} }