ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 22:10:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when multipath is used with forceTcpRelay

Browse Source
This commit is contained in:
Joseph Henry 2024-03-05 10:44:55 -08:00
parent 1f4c00c7b5
commit d658c1187c
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/OneService.cpp
View File

@ -2445,8 +2445,13 @@ public:
} }
// bondingPolicy cannot be used with allowTcpFallbackRelay // bondingPolicy cannot be used with allowTcpFallbackRelay
_allowTcpFallbackRelay = OSUtils::jsonBool(settings["allowTcpFallbackRelay"],true); bool _forceTcpRelayTmp = (OSUtils::jsonBool(settings["forceTcpRelay"],false));
_forceTcpRelay = OSUtils::jsonBool(settings["forceTcpRelay"],false); bool _bondInUse = _node->bondController()->inUse();
if (_forceTcpRelayTmp && _bondInUse) {
fprintf(stderr, "Warning: forceTcpRelay cannot be used with multipath. Disabling forceTcpRelay\n");
}
_allowTcpFallbackRelay = (OSUtils::jsonBool(settings["allowTcpFallbackRelay"],true) && !_node->bondController()->inUse());
_forceTcpRelay = (_forceTcpRelayTmp && !_node->bondController()->inUse());
#ifdef ZT_TCP_FALLBACK_RELAY #ifdef ZT_TCP_FALLBACK_RELAY
_fallbackRelayAddress = InetAddress(OSUtils::jsonString(settings["tcpFallbackRelay"], ZT_TCP_FALLBACK_RELAY).c_str()); _fallbackRelayAddress = InetAddress(OSUtils::jsonString(settings["tcpFallbackRelay"], ZT_TCP_FALLBACK_RELAY).c_str());