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

Binder for Windows, and use Binder to get local interface addresses to advertise.

Browse source
This commit is contained in:
Adam Ierymenko 2016-04-05 15:53:19 -07:00
parent 32cd2a02c9
commit 504738b183
2 changed files with 50 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
osdep/Binder.hpp
View file

@ -136,11 +136,37 @@ public:
#ifdef __WINDOWS__ #ifdef __WINDOWS__
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) {
PIP_ADAPTER_ADDRESSES a = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
while (a) {
PIP_ADAPTER_UNICAST_ADDRESS ua = a->FirstUnicastAddress;
while (ua) {
InetAddress ip(ua->Address.lpSockaddr);
if (ifChecker.shouldBindInterface("",ip)) {
switch(ip.ipScope()) {
default: break;
case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
case InetAddress::IP_SCOPE_GLOBAL:
//case InetAddress::IP_SCOPE_LINK_LOCAL:
case InetAddress::IP_SCOPE_SHARED:
case InetAddress::IP_SCOPE_PRIVATE:
ip.setPort(port);
localIfAddrs.push_back(ip);
break;
}
}
ua = ua->Next;
}
a = a->Next;
}
}
#else // not __WINDOWS__ #else // not __WINDOWS__
struct ifaddrs *ifatbl = (struct ifaddrs *)0; struct ifaddrs *ifatbl = (struct ifaddrs *)0;
struct ifaddrs *ifa; struct ifaddrs *ifa;
if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) { if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) {
ifa = ifatbl; ifa = ifatbl;
while (ifa) { while (ifa) {
@ -162,9 +188,8 @@ public:
} }
ifa = ifa->ifa_next; ifa = ifa->ifa_next;
} }
}
freeifaddrs(ifatbl); freeifaddrs(ifatbl);
}
#endif #endif
@ -274,6 +299,18 @@ public:
} }
} }
/**
* @return All currently bound local interface addresses
*/
inline std::vector<InetAddress> allBoundLocalInterfaceAddresses()
{
Mutex::Lock _l(_lock);
std::vector<InetAddress> aa;
for(std::vector<_Binding>::const_iterator i(_bindings.begin());i!=_bindings.end();++i)
aa.push_back(i->address);
return aa;
}
private: private:
std::vector<_Binding> _bindings; std::vector<_Binding> _bindings;
Mutex _lock; Mutex _lock;

67
service/OneService.cpp
View file

@ -878,6 +878,7 @@ public:
lastLocalInterfaceAddressCheck = now; lastLocalInterfaceAddressCheck = now;
_node->clearLocalInterfaceAddresses(); _node->clearLocalInterfaceAddresses();
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
if (_portMapper) { if (_portMapper) {
std::vector<InetAddress> mappedAddresses(_portMapper->get()); std::vector<InetAddress> mappedAddresses(_portMapper->get());
@ -886,69 +887,9 @@ public:
} }
#endif #endif
#ifdef __UNIX_LIKE__ std::vector<InetAddress> boundAddrs(_bindings[0].allBoundLocalInterfaceAddresses());
std::vector<std::string> ztDevices; for(std::vector<InetAddress>::const_iterator i(boundAddrs.begin());i!=boundAddrs.end();++i)
{ _node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&(*i)));
Mutex::Lock _l(_taps_m);
for(std::map< uint64_t,EthernetTap *>::const_iterator t(_taps.begin());t!=_taps.end();++t)
ztDevices.push_back(t->second->deviceName());
}
struct ifaddrs *ifatbl = (struct ifaddrs *)0;
if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) {
struct ifaddrs *ifa = ifatbl;
while (ifa) {
if ((ifa->ifa_name)&&(ifa->ifa_addr)&&(!isBlacklistedLocalInterfaceForZeroTierTraffic(ifa->ifa_name))) {
bool isZT = false;
for(std::vector<std::string>::const_iterator d(ztDevices.begin());d!=ztDevices.end();++d) {
if (*d == ifa->ifa_name) {
isZT = true;
break;
}
}
if (!isZT) {
InetAddress ip(ifa->ifa_addr);
ip.setPort(_ports[0]);
_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&ip));
}
}
ifa = ifa->ifa_next;
}
freeifaddrs(ifatbl);
}
#endif // __UNIX_LIKE__
#ifdef __WINDOWS__
std::vector<NET_LUID> ztDevices;
{
Mutex::Lock _l(_taps_m);
for(std::map< uint64_t,EthernetTap *>::const_iterator t(_taps.begin());t!=_taps.end();++t)
ztDevices.push_back(t->second->luid());
}
char aabuf[16384];
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) {
PIP_ADAPTER_ADDRESSES a = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
while (a) {
bool isZT = false;
for(std::vector<NET_LUID>::const_iterator d(ztDevices.begin());d!=ztDevices.end();++d) {
if (a->Luid.Value == d->Value) {
isZT = true;
break;
}
}
if (!isZT) {
PIP_ADAPTER_UNICAST_ADDRESS ua = a->FirstUnicastAddress;
while (ua) {
InetAddress ip(ua->Address.lpSockaddr);
ip.setPort(_port);
_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&ip));
ua = ua->Next;
}
}
a = a->Next;
}
}
#endif // __WINDOWS__
} }
const unsigned long delay = (dl > now) ? (unsigned long)(dl - now) : 100; const unsigned long delay = (dl > now) ? (unsigned long)(dl - now) : 100;