Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-06-21 21:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

implemented ssu2.firewalled4 and ssu2.firewalled6 params
Some checks failed
Build containers / Building container for linux/amd64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm/v7 (push) Has been cancelled
Details
Build containers / Building container for linux/386 (push) Has been cancelled
Details
Build Debian packages / bookworm (push) Has been cancelled
Details
Build Debian packages / bullseye (push) Has been cancelled
Details
Build Debian packages / buster (push) Has been cancelled
Details
Build on FreeBSD / with UPnP (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=no (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=yes (push) Has been cancelled
Details
Build on Windows / clang-x86_64 (push) Has been cancelled
Details
Build on Windows / i686 (push) Has been cancelled
Details
Build on Windows / ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / x86_64 (push) Has been cancelled
Details
Build on Windows / CMake clang-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake i686 (push) Has been cancelled
Details
Build on Windows / CMake ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake x86_64 (push) Has been cancelled
Details
Build on Windows / XP (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=no (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=yes (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Has been cancelled
Details
Build containers / Pushing merged manifest (push) Has been cancelled
Details

Browse source
This commit is contained in:
orignal 2025-06-09 16:05:56 -04:00
parent 46154dabd5
commit 4828d93257
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libi2pd/Config.cpp
View file

@ -305,6 +305,8 @@ namespace config {
("ssu2.mtu4", value<uint16_t>()->default_value(0), "MTU for ipv4 address (default: detect)")
("ssu2.mtu6", value<uint16_t>()->default_value(0), "MTU for ipv6 address (default: detect)")
("ssu2.proxy", value<std::string>()->default_value(""), "Socks5 proxy URL for SSU2 transport")
("ssu2.firewalled4", value<bool>()->default_value(false), "Set ipv4 network status to Firewalled even if OK (default: disabled)")
("ssu2.firewalled6", value<bool>()->default_value(false), "Set ipv6 network status to Firewalled even if OK (default: disabled)")
;
options_description nettime("Time sync options");

5
libi2pd/SSU2.cpp
View file

@ -25,7 +25,8 @@ namespace transport
m_TerminationTimer (GetService ()), m_CleanupTimer (GetService ()), m_ResendTimer (GetService ()),
m_IntroducersUpdateTimer (GetService ()), m_IntroducersUpdateTimerV6 (GetService ()),
m_IsPublished (true), m_IsSyncClockFromPeers (true), m_PendingTimeOffset (0),
m_Rng(i2p::util::GetMonotonicMicroseconds ()%1000000LL), m_IsThroughProxy (false)
m_Rng(i2p::util::GetMonotonicMicroseconds ()%1000000LL), m_IsForcedFirewalled4 (false),
m_IsForcedFirewalled6 (false), m_IsThroughProxy (false)
{
}
@ -79,6 +80,7 @@ namespace transport
if (address->IsV4 ())
{
found = true;
i2p::config::GetOption ("ssu2.firewalled4", m_IsForcedFirewalled4);
LogPrint (eLogDebug, "SSU2: Opening IPv4 socket at Start");
OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV4, port));
boost::asio::post (m_ReceiveService.GetService (),
@ -91,6 +93,7 @@ namespace transport
if (address->IsV6 ())
{
found = true;
i2p::config::GetOption ("ssu2.firewalled6", m_IsForcedFirewalled6);
LogPrint (eLogDebug, "SSU2: Opening IPv6 socket at Start");
OpenSocket (boost::asio::ip::udp::endpoint (m_AddressV6, port));
boost::asio::post (m_ReceiveService.GetService (),

2
libi2pd/SSU2.h
View file

@ -79,6 +79,7 @@ namespace transport
bool UsesProxy () const { return m_IsThroughProxy; };
bool IsSupported (const boost::asio::ip::address& addr) const;
uint16_t GetPort (bool v4) const;
bool IsForcedFirewalled (bool v4) const { return v4 ? m_IsForcedFirewalled4 : m_IsForcedFirewalled6; }
bool IsConnectedRecently (const boost::asio::ip::udp::endpoint& ep, bool max = true);
void AddConnectedRecently (const boost::asio::ip::udp::endpoint& ep, uint64_t ts);
std::mt19937& GetRng () { return m_Rng; }
@ -208,6 +209,7 @@ namespace transport
i2p::crypto::AEADChaCha20Poly1305Encryptor m_Encryptor;
i2p::crypto::AEADChaCha20Poly1305Decryptor m_Decryptor;
i2p::crypto::ChaCha20Context m_ChaCha20;
bool m_IsForcedFirewalled4, m_IsForcedFirewalled6;
// proxy
bool m_IsThroughProxy;

3
libi2pd/SSU2OutOfSession.cpp
View file

@ -90,6 +90,9 @@ namespace transport
if (htobe64 (((uint64_t)nonce << 32) | nonce) == GetSourceConnID ())
{
m_PeerTestResendTimer.cancel (); // cancel delayed msg 6 if any
if (GetServer ().IsForcedFirewalled (GetRemoteEndpoint ().address().is_v4()))
// we assume that msg 5 was not received if forced firewalled
return;
m_IsConnectedRecently = GetServer ().IsConnectedRecently (GetRemoteEndpoint ());
if (GetAddress ())
{