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

SSU2: check if socket is opened before sending data, handle network_reset error

Browse Source 
Signed-off-by: r4sas <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2023-05-27 01:00:19 +03:00
parent dc6a42c26f
commit ae439b5385
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libi2pd/SSU2.cpp
View File

@ -78,6 +78,7 @@ namespace transport
if (address->IsV4 ()) if (address->IsV4 ())
{ {
found = true; found = true;
LogPrint (eLogDebug, "SSU2: Opening IPv4 socket at Start");
OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV4, port)); OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV4, port));
m_ReceiveService.GetService ().post( m_ReceiveService.GetService ().post(
[this]() [this]()
@ -89,6 +90,7 @@ namespace transport
if (address->IsV6 ()) if (address->IsV6 ())
{ {
found = true; found = true;
LogPrint (eLogDebug, "SSU2: Opening IPv6 socket at Start");
OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV6, port)); OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV6, port));
m_ReceiveService.GetService ().post( m_ReceiveService.GetService ().post(
[this]() [this]()
@ -243,10 +245,12 @@ namespace transport
if (!ecode if (!ecode
|| ecode == boost::asio::error::connection_refused || ecode == boost::asio::error::connection_refused
|| ecode == boost::asio::error::connection_reset || ecode == boost::asio::error::connection_reset
|| ecode == boost::asio::error::network_reset
|| ecode == boost::asio::error::network_unreachable || ecode == boost::asio::error::network_unreachable
|| ecode == boost::asio::error::host_unreachable || ecode == boost::asio::error::host_unreachable
#ifdef _WIN32 // windows can throw WinAPI error, which is not handled by ASIO #ifdef _WIN32 // windows can throw WinAPI error, which is not handled by ASIO
|| ecode.value() == boost::winapi::ERROR_CONNECTION_REFUSED_ || ecode.value() == boost::winapi::ERROR_CONNECTION_REFUSED_
|| ecode.value() == boost::winapi::WSAENETRESET_ // 10052
|| ecode.value() == boost::winapi::ERROR_NETWORK_UNREACHABLE_ || ecode.value() == boost::winapi::ERROR_NETWORK_UNREACHABLE_
|| ecode.value() == boost::winapi::ERROR_HOST_UNREACHABLE_ || ecode.value() == boost::winapi::ERROR_HOST_UNREACHABLE_
#endif #endif
@ -303,7 +307,7 @@ namespace transport
else else
{ {
auto ep = socket.local_endpoint (); auto ep = socket.local_endpoint ();
socket.close (); LogPrint (eLogCritical, "SSU2: Reopening socket in HandleReceivedFrom: code ", ecode.value(), ": ", ecode.message ());
OpenSocket (ep); OpenSocket (ep);
Receive (socket); Receive (socket);
} }
@ -558,16 +562,25 @@ namespace transport
SendThroughProxy (header, headerLen, nullptr, 0, payload, payloadLen, to); SendThroughProxy (header, headerLen, nullptr, 0, payload, payloadLen, to);
return; return;
} }
std::vector<boost::asio::const_buffer> bufs std::vector<boost::asio::const_buffer> bufs
{ {
boost::asio::buffer (header, headerLen), boost::asio::buffer (header, headerLen),
boost::asio::buffer (payload, payloadLen) boost::asio::buffer (payload, payloadLen)
}; };
boost::system::error_code ec; boost::system::error_code ec;
if (to.address ().is_v6 ()) if (to.address ().is_v6 ())
{
if (!m_SocketV6.is_open ()) return;
m_SocketV6.send_to (bufs, to, 0, ec); m_SocketV6.send_to (bufs, to, 0, ec);
}
else else
{
if (!m_SocketV4.is_open ()) return;
m_SocketV4.send_to (bufs, to, 0, ec); m_SocketV4.send_to (bufs, to, 0, ec);
}
if (!ec) if (!ec)
i2p::transport::transports.UpdateSentBytes (headerLen + payloadLen); i2p::transport::transports.UpdateSentBytes (headerLen + payloadLen);
else else
@ -582,17 +595,25 @@ namespace transport
SendThroughProxy (header, headerLen, headerX, headerXLen, payload, payloadLen, to); SendThroughProxy (header, headerLen, headerX, headerXLen, payload, payloadLen, to);
return; return;
} }
std::vector<boost::asio::const_buffer> bufs std::vector<boost::asio::const_buffer> bufs
{ {
boost::asio::buffer (header, headerLen), boost::asio::buffer (header, headerLen),
boost::asio::buffer (headerX, headerXLen), boost::asio::buffer (headerX, headerXLen),
boost::asio::buffer (payload, payloadLen) boost::asio::buffer (payload, payloadLen)
}; };
boost::system::error_code ec; boost::system::error_code ec;
if (to.address ().is_v6 ()) if (to.address ().is_v6 ())
{
if (!m_SocketV6.is_open ()) return;
m_SocketV6.send_to (bufs, to, 0, ec); m_SocketV6.send_to (bufs, to, 0, ec);
}
else else
{
if (!m_SocketV4.is_open ()) return;
m_SocketV4.send_to (bufs, to, 0, ec); m_SocketV4.send_to (bufs, to, 0, ec);
}
if (!ec) if (!ec)
i2p::transport::transports.UpdateSentBytes (headerLen + headerXLen + payloadLen); i2p::transport::transports.UpdateSentBytes (headerLen + headerXLen + payloadLen);