mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2024-12-20 21:43:08 +00:00
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
This commit is contained in:
Adam Ierymenko
commit
dee3361c1d
335
osdep/Binder.hpp
335
osdep/Binder.hpp
@ -22,37 +22,43 @@
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include <ShlObj.h>
|
||||
#include <WinSock2.h>
|
||||
#include <Windows.h>
|
||||
#include <ShlObj.h>
|
||||
#include <netioapi.h>
|
||||
#include <iphlpapi.h>
|
||||
#include <netioapi.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#include <ifaddrs.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <ifaddrs.h>
|
||||
#ifdef __LINUX__
|
||||
#include <sys/ioctl.h>
|
||||
#include <net/if.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/if_addr.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <atomic>
|
||||
#if defined(__APPLE__) && defined(TARGET_OS_MAC)
|
||||
#include <net/if.h>
|
||||
#include <netinet6/in6_var.h>
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#include "../node/InetAddress.hpp"
|
||||
#include "../node/Mutex.hpp"
|
||||
#include "../node/Utils.hpp"
|
||||
|
||||
#include "Phy.hpp"
|
||||
#include "OSUtils.hpp"
|
||||
#include "Phy.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <atomic>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
// Period between refreshes of bindings
|
||||
#define ZT_BINDER_REFRESH_PERIOD 30000
|
||||
@ -73,32 +79,33 @@ namespace ZeroTier {
|
||||
* On OSes that do not support local port enumeration or where this is not
|
||||
* meaningful, this degrades to binding to wildcard.
|
||||
*/
|
||||
class Binder
|
||||
{
|
||||
private:
|
||||
struct _Binding
|
||||
{
|
||||
_Binding() : udpSock((PhySocket *)0),tcpListenSock((PhySocket *)0) {}
|
||||
PhySocket *udpSock;
|
||||
PhySocket *tcpListenSock;
|
||||
class Binder {
|
||||
private:
|
||||
struct _Binding {
|
||||
_Binding() : udpSock((PhySocket*)0), tcpListenSock((PhySocket*)0)
|
||||
{
|
||||
}
|
||||
PhySocket* udpSock;
|
||||
PhySocket* tcpListenSock;
|
||||
InetAddress address;
|
||||
};
|
||||
|
||||
public:
|
||||
Binder() : _bindingCount(0) {}
|
||||
public:
|
||||
Binder() : _bindingCount(0)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Close all bound ports, should be called on shutdown
|
||||
*
|
||||
* @param phy Physical interface
|
||||
*/
|
||||
template<typename PHY_HANDLER_TYPE>
|
||||
void closeAll(Phy<PHY_HANDLER_TYPE> &phy)
|
||||
template <typename PHY_HANDLER_TYPE> void closeAll(Phy<PHY_HANDLER_TYPE>& phy)
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
for(unsigned int b=0,c=_bindingCount;b<c;++b) {
|
||||
phy.close(_bindings[b].udpSock,false);
|
||||
phy.close(_bindings[b].tcpListenSock,false);
|
||||
for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
|
||||
phy.close(_bindings[b].udpSock, false);
|
||||
phy.close(_bindings[b].tcpListenSock, false);
|
||||
}
|
||||
_bindingCount = 0;
|
||||
}
|
||||
@ -117,11 +124,10 @@ public:
|
||||
* @tparam PHY_HANDLER_TYPE Type for Phy<> template
|
||||
* @tparam INTERFACE_CHECKER Type for class containing shouldBindInterface() method
|
||||
*/
|
||||
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;
|
||||
PhySocket *udps,*tcps;
|
||||
std::map<InetAddress, std::string> localIfAddrs;
|
||||
PhySocket *udps, *tcps;
|
||||
Mutex::Lock _l(_lock);
|
||||
bool interfacesEnumerated = true;
|
||||
|
||||
@ -130,7 +136,7 @@ public:
|
||||
|
||||
char aabuf[32768];
|
||||
ULONG aalen = sizeof(aabuf);
|
||||
if (GetAdaptersAddresses(AF_UNSPEC,GAA_FLAG_SKIP_ANYCAST|GAA_FLAG_SKIP_MULTICAST|GAA_FLAG_SKIP_DNS_SERVER,(void *)0,reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf),&aalen) == NO_ERROR) {
|
||||
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER, (void*)0, reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf), &aalen) == NO_ERROR) {
|
||||
PIP_ADAPTER_ADDRESSES a = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
|
||||
while (a) {
|
||||
PIP_ADAPTER_UNICAST_ADDRESS ua = a->FirstUnicastAddress;
|
||||
@ -165,7 +171,7 @@ public:
|
||||
interfacesEnumerated = false;
|
||||
}
|
||||
|
||||
#else // not __WINDOWS__
|
||||
#else // not __WINDOWS__
|
||||
|
||||
/* On Linux we use an alternative method if available since getifaddrs()
|
||||
* gets very slow when there are lots of network namespaces. This won't
|
||||
@ -173,21 +179,21 @@ public:
|
||||
* embedded systems, so revert to getifaddrs() there. */
|
||||
|
||||
#ifdef __LINUX__
|
||||
char fn[256],tmp[256];
|
||||
char fn[256], tmp[256];
|
||||
std::set<std::string> ifnames;
|
||||
const unsigned long pid = (unsigned long)getpid();
|
||||
|
||||
// Get all device names
|
||||
OSUtils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/dev",pid);
|
||||
FILE *procf = fopen(fn,"r");
|
||||
OSUtils::ztsnprintf(fn, sizeof(fn), "/proc/%lu/net/dev", pid);
|
||||
FILE* procf = fopen(fn, "r");
|
||||
if (procf) {
|
||||
while (fgets(tmp,sizeof(tmp),procf)) {
|
||||
while (fgets(tmp, sizeof(tmp), procf)) {
|
||||
tmp[255] = 0;
|
||||
char *saveptr = (char *)0;
|
||||
for(char *f=Utils::stok(tmp," \t\r\n:|",&saveptr);(f);f=Utils::stok((char *)0," \t\r\n:|",&saveptr)) {
|
||||
if ((strcmp(f,"Inter-") != 0)&&(strcmp(f,"face") != 0)&&(f[0] != 0))
|
||||
char* saveptr = (char*)0;
|
||||
for (char* f = Utils::stok(tmp, " \t\r\n:|", &saveptr); (f); f = Utils::stok((char*)0, " \t\r\n:|", &saveptr)) {
|
||||
if ((strcmp(f, "Inter-") != 0) && (strcmp(f, "face") != 0) && (f[0] != 0))
|
||||
ifnames.insert(f);
|
||||
break; // we only want the first field
|
||||
break; // we only want the first field
|
||||
}
|
||||
}
|
||||
fclose(procf);
|
||||
@ -197,39 +203,48 @@ public:
|
||||
}
|
||||
|
||||
// Get IPv6 addresses (and any device names we don't already know)
|
||||
OSUtils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/if_inet6",pid);
|
||||
procf = fopen(fn,"r");
|
||||
OSUtils::ztsnprintf(fn, sizeof(fn), "/proc/%lu/net/if_inet6", pid);
|
||||
procf = fopen(fn, "r");
|
||||
if (procf) {
|
||||
while (fgets(tmp,sizeof(tmp),procf)) {
|
||||
while (fgets(tmp, sizeof(tmp), procf)) {
|
||||
tmp[255] = 0;
|
||||
char *saveptr = (char *)0;
|
||||
char* saveptr = (char*)0;
|
||||
unsigned char ipbits[16];
|
||||
memset(ipbits,0,sizeof(ipbits));
|
||||
char *devname = (char *)0;
|
||||
memset(ipbits, 0, sizeof(ipbits));
|
||||
char* devname = (char*)0;
|
||||
int flags = 0;
|
||||
int n = 0;
|
||||
for(char *f=Utils::stok(tmp," \t\r\n",&saveptr);(f);f=Utils::stok((char *)0," \t\r\n",&saveptr)) {
|
||||
switch(n++) {
|
||||
case 0: // IP in hex
|
||||
Utils::unhex(f,32,ipbits,16);
|
||||
for (char* f = Utils::stok(tmp, " \t\r\n", &saveptr); (f); f = Utils::stok((char*)0, " \t\r\n", &saveptr)) {
|
||||
switch (n++) {
|
||||
case 0: // IP in hex
|
||||
Utils::unhex(f, 32, ipbits, 16);
|
||||
break;
|
||||
case 5: // device name
|
||||
case 4:
|
||||
flags = atoi(f);
|
||||
break;
|
||||
case 5: // device name
|
||||
devname = f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( (flags & IFA_F_TEMPORARY) != 0) {
|
||||
continue;
|
||||
}
|
||||
if (devname) {
|
||||
ifnames.insert(devname);
|
||||
InetAddress ip(ipbits,16,0);
|
||||
if (ifChecker.shouldBindInterface(devname,ip)) {
|
||||
switch(ip.ipScope()) {
|
||||
default: break;
|
||||
InetAddress ip(ipbits, 16, 0);
|
||||
if (ifChecker.shouldBindInterface(devname, ip)) {
|
||||
switch (ip.ipScope()) {
|
||||
default:
|
||||
break;
|
||||
case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
|
||||
case InetAddress::IP_SCOPE_GLOBAL:
|
||||
case InetAddress::IP_SCOPE_SHARED:
|
||||
case InetAddress::IP_SCOPE_PRIVATE:
|
||||
for(int x=0;x<(int)portCount;++x) {
|
||||
for (int x = 0; x < (int)portCount; ++x) {
|
||||
ip.setPort(ports[x]);
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(ip,std::string(devname)));
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string(devname)));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -240,71 +255,108 @@ public:
|
||||
}
|
||||
|
||||
// Get IPv4 addresses for each device
|
||||
if (!ifnames.empty()) {
|
||||
const int controlfd = (int)socket(AF_INET,SOCK_DGRAM,0);
|
||||
if (! ifnames.empty()) {
|
||||
const int controlfd = (int)socket(AF_INET, SOCK_DGRAM, 0);
|
||||
struct ifconf configuration;
|
||||
configuration.ifc_len = 0;
|
||||
configuration.ifc_buf = nullptr;
|
||||
|
||||
if (controlfd < 0) goto ip4_address_error;
|
||||
if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0) goto ip4_address_error;
|
||||
if (controlfd < 0)
|
||||
goto ip4_address_error;
|
||||
if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0)
|
||||
goto ip4_address_error;
|
||||
configuration.ifc_buf = (char*)malloc(configuration.ifc_len);
|
||||
if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0) goto ip4_address_error;
|
||||
if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0)
|
||||
goto ip4_address_error;
|
||||
|
||||
for (int i=0; i < (int)(configuration.ifc_len / sizeof(ifreq)); i ++) {
|
||||
for (int i = 0; i < (int)(configuration.ifc_len / sizeof(ifreq)); i++) {
|
||||
struct ifreq& request = configuration.ifc_req[i];
|
||||
struct sockaddr* addr = &request.ifr_ifru.ifru_addr;
|
||||
if (addr->sa_family != AF_INET) continue;
|
||||
if (addr->sa_family != AF_INET)
|
||||
continue;
|
||||
std::string ifname = request.ifr_ifrn.ifrn_name;
|
||||
// name can either be just interface name or interface name followed by ':' and arbitrary label
|
||||
if (ifname.find(':') != std::string::npos)
|
||||
ifname = ifname.substr(0, ifname.find(':'));
|
||||
|
||||
InetAddress ip(&(((struct sockaddr_in *)addr)->sin_addr),4,0);
|
||||
InetAddress ip(&(((struct sockaddr_in*)addr)->sin_addr), 4, 0);
|
||||
if (ifChecker.shouldBindInterface(ifname.c_str(), ip)) {
|
||||
switch(ip.ipScope()) {
|
||||
default: break;
|
||||
case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
|
||||
case InetAddress::IP_SCOPE_GLOBAL:
|
||||
case InetAddress::IP_SCOPE_SHARED:
|
||||
case InetAddress::IP_SCOPE_PRIVATE:
|
||||
for(int x=0;x<(int)portCount;++x) {
|
||||
ip.setPort(ports[x]);
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(ip,ifname));
|
||||
}
|
||||
break;
|
||||
switch (ip.ipScope()) {
|
||||
default:
|
||||
break;
|
||||
case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
|
||||
case InetAddress::IP_SCOPE_GLOBAL:
|
||||
case InetAddress::IP_SCOPE_SHARED:
|
||||
case InetAddress::IP_SCOPE_PRIVATE:
|
||||
for (int x = 0; x < (int)portCount; ++x) {
|
||||
ip.setPort(ports[x]);
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, ifname));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ip4_address_error:
|
||||
free(configuration.ifc_buf);
|
||||
if (controlfd > 0) close(controlfd);
|
||||
if (controlfd > 0)
|
||||
close(controlfd);
|
||||
}
|
||||
|
||||
const bool gotViaProc = (!localIfAddrs.empty());
|
||||
const bool gotViaProc = (! localIfAddrs.empty());
|
||||
#else
|
||||
const bool gotViaProc = false;
|
||||
#endif
|
||||
#if !defined(ZT_SDK) || !defined(__ANDROID__) // getifaddrs() freeifaddrs() not available on Android
|
||||
if (!gotViaProc) {
|
||||
struct ifaddrs *ifatbl = (struct ifaddrs *)0;
|
||||
struct ifaddrs *ifa;
|
||||
if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) {
|
||||
#if ! defined(ZT_SDK) || ! defined(__ANDROID__) // getifaddrs() freeifaddrs() not available on Android
|
||||
if (! gotViaProc) {
|
||||
struct ifaddrs* ifatbl = (struct ifaddrs*)0;
|
||||
struct ifaddrs* ifa;
|
||||
|
||||
#if defined(__APPLE__)
|
||||
// set up an IPv6 socket so we can check the state of interfaces via SIOCGIFAFLAG_IN6
|
||||
int infoSock = socket(AF_INET6, SOCK_DGRAM, 0);
|
||||
#endif
|
||||
if ((getifaddrs(&ifatbl) == 0) && (ifatbl)) {
|
||||
ifa = ifatbl;
|
||||
while (ifa) {
|
||||
if ((ifa->ifa_name)&&(ifa->ifa_addr)) {
|
||||
if ((ifa->ifa_name) && (ifa->ifa_addr)) {
|
||||
InetAddress ip = *(ifa->ifa_addr);
|
||||
if (ifChecker.shouldBindInterface(ifa->ifa_name,ip)) {
|
||||
switch(ip.ipScope()) {
|
||||
default: break;
|
||||
#if defined(__APPLE__) && defined(TARGET_OS_MAC)
|
||||
// Check if the address is an IPv6 Temporary Address, macOS version
|
||||
if (ifa->ifa_addr->sa_family == AF_INET6) {
|
||||
struct sockaddr_in6* sa6 = (struct sockaddr_in6*)ifa->ifa_addr;
|
||||
struct in6_ifreq ifr6;
|
||||
memset(&ifr6, 0, sizeof(ifr6));
|
||||
strcpy(ifr6.ifr_name, ifa->ifa_name);
|
||||
ifr6.ifr_ifru.ifru_addr = *sa6;
|
||||
|
||||
int flags = 0;
|
||||
if (ioctl(infoSock, SIOCGIFAFLAG_IN6, (unsigned long long)&ifr6) != -1) {
|
||||
flags = ifr6.ifr_ifru.ifru_flags6;
|
||||
}
|
||||
|
||||
// if this is a temporary IPv6 address, skip to the next address
|
||||
if (flags & IN6_IFF_TEMPORARY) {
|
||||
char buf[64];
|
||||
#ifdef ZT_TRACE
|
||||
fprintf(stderr, "skip binding to temporary IPv6 address: %s\n", ip.toIpString(buf));
|
||||
#endif
|
||||
ifa = ifa->ifa_next;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (ifChecker.shouldBindInterface(ifa->ifa_name, ip)) {
|
||||
switch (ip.ipScope()) {
|
||||
default:
|
||||
break;
|
||||
case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
|
||||
case InetAddress::IP_SCOPE_GLOBAL:
|
||||
case InetAddress::IP_SCOPE_SHARED:
|
||||
case InetAddress::IP_SCOPE_PRIVATE:
|
||||
for(int x=0;x<(int)portCount;++x) {
|
||||
for (int x = 0; x < (int)portCount; ++x) {
|
||||
ip.setPort(ports[x]);
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(ip,std::string(ifa->ifa_name)));
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string(ifa->ifa_name)));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -317,20 +369,24 @@ public:
|
||||
else {
|
||||
interfacesEnumerated = false;
|
||||
}
|
||||
#if defined(__APPLE__)
|
||||
close(infoSock);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
} else {
|
||||
for(std::vector<InetAddress>::const_iterator i(explicitBind.begin());i!=explicitBind.end();++i)
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(*i,std::string()));
|
||||
}
|
||||
else {
|
||||
for (std::vector<InetAddress>::const_iterator i(explicitBind.begin()); i != explicitBind.end(); ++i)
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(*i, std::string()));
|
||||
}
|
||||
|
||||
// Default to binding to wildcard if we can't enumerate addresses
|
||||
if (!interfacesEnumerated && localIfAddrs.empty()) {
|
||||
for(int x=0;x<(int)portCount;++x) {
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(InetAddress((uint32_t)0,ports[x]),std::string()));
|
||||
localIfAddrs.insert(std::pair<InetAddress,std::string>(InetAddress((const void *)"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",16,ports[x]),std::string()));
|
||||
if (! interfacesEnumerated && localIfAddrs.empty()) {
|
||||
for (int x = 0; x < (int)portCount; ++x) {
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(InetAddress((uint32_t)0, ports[x]), std::string()));
|
||||
localIfAddrs.insert(std::pair<InetAddress, std::string>(InetAddress((const void*)"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16, ports[x]), std::string()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -338,35 +394,36 @@ public:
|
||||
_bindingCount = 0;
|
||||
|
||||
// Save bindings that are still valid, close those that are not
|
||||
for(unsigned int b=0;b<oldBindingCount;++b) {
|
||||
for (unsigned int b = 0; b < oldBindingCount; ++b) {
|
||||
if (localIfAddrs.find(_bindings[b].address) != localIfAddrs.end()) {
|
||||
if (_bindingCount != b)
|
||||
_bindings[(unsigned int)_bindingCount] = _bindings[b];
|
||||
++_bindingCount;
|
||||
} else {
|
||||
PhySocket *const udps = _bindings[b].udpSock;
|
||||
PhySocket *const tcps = _bindings[b].tcpListenSock;
|
||||
_bindings[b].udpSock = (PhySocket *)0;
|
||||
_bindings[b].tcpListenSock = (PhySocket *)0;
|
||||
phy.close(udps,false);
|
||||
phy.close(tcps,false);
|
||||
}
|
||||
else {
|
||||
PhySocket* const udps = _bindings[b].udpSock;
|
||||
PhySocket* const tcps = _bindings[b].tcpListenSock;
|
||||
_bindings[b].udpSock = (PhySocket*)0;
|
||||
_bindings[b].tcpListenSock = (PhySocket*)0;
|
||||
phy.close(udps, false);
|
||||
phy.close(tcps, false);
|
||||
}
|
||||
}
|
||||
|
||||
// Generate set of unique interface names (used for formation of logical link set in multipath code)
|
||||
// TODO: Could be gated not to run if multipath is not enabled.
|
||||
for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) {
|
||||
for (std::map<InetAddress, std::string>::const_iterator ii(localIfAddrs.begin()); ii != localIfAddrs.end(); ++ii) {
|
||||
linkIfNames.insert(ii->second);
|
||||
}
|
||||
for (std::set<std::string>::iterator si(linkIfNames.begin());si!=linkIfNames.end();) {
|
||||
for (std::set<std::string>::iterator si(linkIfNames.begin()); si != linkIfNames.end();) {
|
||||
bool bFoundMatch = false;
|
||||
for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) {
|
||||
for (std::map<InetAddress, std::string>::const_iterator ii(localIfAddrs.begin()); ii != localIfAddrs.end(); ++ii) {
|
||||
if (ii->second == *si) {
|
||||
bFoundMatch = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!bFoundMatch) {
|
||||
if (! bFoundMatch) {
|
||||
linkIfNames.erase(si++);
|
||||
}
|
||||
else {
|
||||
@ -375,7 +432,7 @@ public:
|
||||
}
|
||||
|
||||
// Create new bindings for those not already bound
|
||||
for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) {
|
||||
for (std::map<InetAddress, std::string>::const_iterator ii(localIfAddrs.begin()); ii != localIfAddrs.end(); ++ii) {
|
||||
unsigned int bi = 0;
|
||||
while (bi != _bindingCount) {
|
||||
if (_bindings[bi].address == ii->first)
|
||||
@ -383,32 +440,33 @@ public:
|
||||
++bi;
|
||||
}
|
||||
if (bi == _bindingCount) {
|
||||
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)&&(tcps)) {
|
||||
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) && (tcps)) {
|
||||
#ifdef __LINUX__
|
||||
// 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) {
|
||||
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);
|
||||
if (fd >= 0)
|
||||
setsockopt(fd,SOL_SOCKET,SO_BINDTODEVICE,tmp,strlen(tmp));
|
||||
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) {
|
||||
_bindings[_bindingCount].udpSock = udps;
|
||||
_bindings[_bindingCount].tcpListenSock = tcps;
|
||||
_bindings[_bindingCount].address = ii->first;
|
||||
phy.setIfName(udps,(char*)ii->second.c_str(),(int)ii->second.length());
|
||||
phy.setIfName(udps, (char*)ii->second.c_str(), (int)ii->second.length());
|
||||
++_bindingCount;
|
||||
}
|
||||
} else {
|
||||
phy.close(udps,false);
|
||||
phy.close(tcps,false);
|
||||
}
|
||||
else {
|
||||
phy.close(udps, false);
|
||||
phy.close(tcps, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -421,7 +479,7 @@ public:
|
||||
{
|
||||
std::vector<InetAddress> aa;
|
||||
Mutex::Lock _l(_lock);
|
||||
for(unsigned int b=0,c=_bindingCount;b<c;++b)
|
||||
for (unsigned int b = 0, c = _bindingCount; b < c; ++b)
|
||||
aa.push_back(_bindings[b].address);
|
||||
return aa;
|
||||
}
|
||||
@ -429,15 +487,17 @@ public:
|
||||
/**
|
||||
* Send from all bound UDP sockets
|
||||
*/
|
||||
template<typename PHY_HANDLER_TYPE>
|
||||
inline bool udpSendAll(Phy<PHY_HANDLER_TYPE> &phy,const struct sockaddr_storage *addr,const void *data,unsigned int len,unsigned int ttl)
|
||||
template <typename PHY_HANDLER_TYPE> inline bool udpSendAll(Phy<PHY_HANDLER_TYPE>& phy, const struct sockaddr_storage* addr, const void* data, unsigned int len, unsigned int ttl)
|
||||
{
|
||||
bool r = false;
|
||||
Mutex::Lock _l(_lock);
|
||||
for(unsigned int b=0,c=_bindingCount;b<c;++b) {
|
||||
if (ttl) phy.setIp4UdpTtl(_bindings[b].udpSock,ttl);
|
||||
if (phy.udpSend(_bindings[b].udpSock,(const struct sockaddr *)addr,data,len)) r = true;
|
||||
if (ttl) phy.setIp4UdpTtl(_bindings[b].udpSock,255);
|
||||
for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
|
||||
if (ttl)
|
||||
phy.setIp4UdpTtl(_bindings[b].udpSock, ttl);
|
||||
if (phy.udpSend(_bindings[b].udpSock, (const struct sockaddr*)addr, data, len))
|
||||
r = true;
|
||||
if (ttl)
|
||||
phy.setIp4UdpTtl(_bindings[b].udpSock, 255);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
@ -446,10 +506,10 @@ public:
|
||||
* @param addr Address to check
|
||||
* @return True if this is a bound local interface address
|
||||
*/
|
||||
inline bool isBoundLocalInterfaceAddress(const InetAddress &addr) const
|
||||
inline bool isBoundLocalInterfaceAddress(const InetAddress& addr) const
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
for(unsigned int b=0;b<_bindingCount;++b) {
|
||||
for (unsigned int b = 0; b < _bindingCount; ++b) {
|
||||
if (_bindings[b].address == addr)
|
||||
return true;
|
||||
}
|
||||
@ -462,11 +522,11 @@ public:
|
||||
* @param udpSock UDP socket to check
|
||||
* @return True if socket is currently bound/allocated
|
||||
*/
|
||||
inline bool isUdpSocketValid(PhySocket *const udpSock)
|
||||
inline bool isUdpSocketValid(PhySocket* const udpSock)
|
||||
{
|
||||
for(unsigned int b=0,c=_bindingCount;b<c;++b) {
|
||||
for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
|
||||
if (_bindings[b].udpSock == udpSock)
|
||||
return (b < _bindingCount); // double check atomic which may have changed
|
||||
return (b < _bindingCount); // double check atomic which may have changed
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -477,14 +537,13 @@ public:
|
||||
return linkIfNames;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
std::set<std::string> linkIfNames;
|
||||
_Binding _bindings[ZT_BINDER_MAX_BINDINGS];
|
||||
std::atomic<unsigned int> _bindingCount;
|
||||
Mutex _lock;
|
||||
};
|
||||
|
||||
} // namespace ZeroTier
|
||||
} // namespace ZeroTier
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user