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

Allow macOS interfaces to use multiple IP addresses (#1879)

Browse source 
Co-authored-by: Sean OMeara <someara@users.noreply.github.com>
Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com>
This commit is contained in:
Travis LaDuke 2023-03-06 10:21:58 -08:00 • committed by GitHub
parent cc4251c5b7
commit 9d5b9efc2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
service/OneService.cpp
View file

@ -2271,6 +2271,12 @@ public:
if (syncIps) { if (syncIps) {
std::vector<InetAddress> newManagedIps; std::vector<InetAddress> newManagedIps;
newManagedIps.reserve(n.config().assignedAddressCount); newManagedIps.reserve(n.config().assignedAddressCount);
#ifdef __APPLE__
std::vector<InetAddress> newManagedIps2;
newManagedIps2.reserve(n.config().assignedAddressCount);
#endif
for(unsigned int i=0;i<n.config().assignedAddressCount;++i) { for(unsigned int i=0;i<n.config().assignedAddressCount;++i) {
const InetAddress *ii = reinterpret_cast<const InetAddress *>(&(n.config().assignedAddresses[i])); const InetAddress *ii = reinterpret_cast<const InetAddress *>(&(n.config().assignedAddresses[i]));
if (checkIfManagedIsAllowed(n,*ii)) if (checkIfManagedIsAllowed(n,*ii))
@ -2290,15 +2296,41 @@ public:
} }
} }
for(std::vector<InetAddress>::iterator ip(newManagedIps.begin());ip!=newManagedIps.end();++ip) { for(std::vector<InetAddress>::iterator ip(newManagedIps.begin());ip!=newManagedIps.end();++ip) {
#ifdef __APPLE__
// We can't add multiple addresses to an interface on macOs unless we futz with the netmask.
// see `man ifconfig`, alias section
// "If the address is on the same subnet as the first network address for this interface, a non-conflicting netmask must be given. Usually 0xffffffff is most appropriate."
auto same_subnet = [ip](InetAddress i){
return ip->network() == i.network();
};
if (std::find(n.managedIps().begin(),n.managedIps().end(),*ip) == n.managedIps().end()) { if (std::find(n.managedIps().begin(),n.managedIps().end(),*ip) == n.managedIps().end()) {
// if same subnet as a previously added address
if (
std::find_if(n.managedIps().begin(),n.managedIps().end(), same_subnet) != n.managedIps().end() ||
std::find_if(newManagedIps2.begin(),newManagedIps2.end(), same_subnet) != newManagedIps2.end()
) {
if (ip->isV4()) {
ip->setPort(32);
} else {
ip->setPort(128);
}
} else {
newManagedIps2.push_back(*ip);
}
}
#endif
if (!n.tap()->addIp(*ip)) if (!n.tap()->addIp(*ip))
fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf)); fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
#ifdef __WINDOWS__ #ifdef __WINDOWS__
WinFWHelper::newICMPRule(*ip, n.config().nwid); WinFWHelper::newICMPRule(*ip, n.config().nwid);
#endif #endif
}
} }
#ifdef __APPLE__ #ifdef __APPLE__