void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove TCP binding logic from Binder to fix #2105

Browse source
This commit is contained in:
Joseph Henry 2023-08-24 13:52:57 -07:00
parent 452e845cf6
commit f0d649dfbd
No known key found for this signature in database
GPG key ID: C45B33FF5EBC9344
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
osdep/Binder.hpp
View file

@ -87,11 +87,10 @@ namespace ZeroTier {
class Binder { class Binder {
private: private:
struct _Binding { struct _Binding {
_Binding() : udpSock((PhySocket*)0), tcpListenSock((PhySocket*)0) _Binding() : udpSock((PhySocket*)0)
{ {
} }
PhySocket* udpSock; PhySocket* udpSock;
PhySocket* tcpListenSock;
InetAddress address; InetAddress address;
char ifname[256] = {}; char ifname[256] = {};
}; };
@ -111,7 +110,6 @@ class Binder {
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
for (unsigned int b = 0, c = _bindingCount; b < c; ++b) { for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
phy.close(_bindings[b].udpSock, false); phy.close(_bindings[b].udpSock, false);
phy.close(_bindings[b].tcpListenSock, false);
} }
_bindingCount = 0; _bindingCount = 0;
} }
@ -133,7 +131,7 @@ class Binder {
template <typename PHY_HANDLER_TYPE, typename INTERFACE_CHECKER> void refresh(Phy<PHY_HANDLER_TYPE>& phy, unsigned int* ports, unsigned int portCount, const std::vector<InetAddress> explicitBind, INTERFACE_CHECKER& ifChecker) template <typename PHY_HANDLER_TYPE, typename INTERFACE_CHECKER> void refresh(Phy<PHY_HANDLER_TYPE>& phy, unsigned int* ports, unsigned int portCount, const std::vector<InetAddress> explicitBind, INTERFACE_CHECKER& ifChecker)
{ {
std::map<InetAddress, std::string> localIfAddrs; std::map<InetAddress, std::string> localIfAddrs;
PhySocket *udps, *tcps; PhySocket *udps;
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
bool interfacesEnumerated = true; bool interfacesEnumerated = true;
@ -419,11 +417,8 @@ class Binder {
} }
else { else {
PhySocket* const udps = _bindings[b].udpSock; PhySocket* const udps = _bindings[b].udpSock;
PhySocket* const tcps = _bindings[b].tcpListenSock;
_bindings[b].udpSock = (PhySocket*)0; _bindings[b].udpSock = (PhySocket*)0;
_bindings[b].tcpListenSock = (PhySocket*)0;
phy.close(udps, false); phy.close(udps, false);
phy.close(tcps, false);
} }
} }
@ -437,24 +432,20 @@ class Binder {
} }
if (bi == _bindingCount) { if (bi == _bindingCount) {
udps = phy.udpBind(reinterpret_cast<const struct sockaddr*>(&(ii->first)), (void*)0, ZT_UDP_DESIRED_BUF_SIZE); udps = phy.udpBind(reinterpret_cast<const struct sockaddr*>(&(ii->first)), (void*)0, ZT_UDP_DESIRED_BUF_SIZE);
tcps = phy.tcpListen(reinterpret_cast<const struct sockaddr*>(&(ii->first)), (void*)0); if (udps) {
if ((udps) && (tcps)) {
#ifdef __LINUX__ #ifdef __LINUX__
// Bind Linux sockets to their device so routes that we manage do not override physical routes (wish all platforms had this!) // Bind Linux sockets to their device so routes that we manage do not override physical routes (wish all platforms had this!)
if (ii->second.length() > 0) { if (ii->second.length() > 0) {
char tmp[256]; char tmp[256];
Utils::scopy(tmp, sizeof(tmp), ii->second.c_str()); Utils::scopy(tmp, sizeof(tmp), ii->second.c_str());
int fd = (int)Phy<PHY_HANDLER_TYPE>::getDescriptor(udps); int fd = (int)Phy<PHY_HANDLER_TYPE>::getDescriptor(udps);
if (fd >= 0) if (fd >= 0) {
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, tmp, strlen(tmp));
fd = (int)Phy<PHY_HANDLER_TYPE>::getDescriptor(tcps);
if (fd >= 0)
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, tmp, strlen(tmp)); setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, tmp, strlen(tmp));
} }
}
#endif // __LINUX__ #endif // __LINUX__
if (_bindingCount < ZT_BINDER_MAX_BINDINGS) { if (_bindingCount < ZT_BINDER_MAX_BINDINGS) {
_bindings[_bindingCount].udpSock = udps; _bindings[_bindingCount].udpSock = udps;
_bindings[_bindingCount].tcpListenSock = tcps;
_bindings[_bindingCount].address = ii->first; _bindings[_bindingCount].address = ii->first;
memcpy(_bindings[_bindingCount].ifname, (char*)ii->second.c_str(), (int)ii->second.length()); memcpy(_bindings[_bindingCount].ifname, (char*)ii->second.c_str(), (int)ii->second.length());
++_bindingCount; ++_bindingCount;
@ -462,7 +453,6 @@ class Binder {
} }
else { else {
phy.close(udps, false); phy.close(udps, false);
phy.close(tcps, false);
} }
} }
} }

6
service/OneService.cpp
View file

@ -2130,7 +2130,11 @@ public:
} }
if(!_controlPlane.bind_to_port("0.0.0.0", _primaryPort)) { if(!_controlPlane.bind_to_port("0.0.0.0", _primaryPort)) {
fprintf(stderr, "Error binding control plane to port %d\n", _primaryPort); fprintf(stderr, "Error binding control plane to 0.0.0.0:%d\n", _primaryPort);
exit(-1);
}
if(!_controlPlane.bind_to_port("::", _primaryPort)) {
fprintf(stderr, "Error binding control plane to :::%d\n", _primaryPort);
exit(-1); exit(-1);
} }