github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for MacOS interface setup and config timing bugs.

Browse source
This commit is contained in:
Adam Ierymenko 2021-09-09 09:30:48 -04:00
commit 1b8917a57c
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
4 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
osdep/MacEthernetTap.cpp
View file

@ -209,8 +209,30 @@ MacEthernetTap::MacEthernetTap(
::_exit(-1);
} else {
_agentPid = apid;
// Wait up to 10 seconds for the subprocess to actually create the device. This prevents
// things like routes from being created before the device exists.
for(int waitLoops=0;;++waitLoops) {
struct ifaddrs *ifa = (struct ifaddrs *)0;
if (!getifaddrs(&ifa)) {
struct ifaddrs *p = ifa;
while (p) {
if ((p->ifa_name)&&(!strcmp(devstr, p->ifa_name))) {
waitLoops = -1;
break;
}
p = p->ifa_next;
}
freeifaddrs(ifa);
}
if (waitLoops == -1) {
break;
} else if (waitLoops >= 100) { // 10 seconds
throw std::runtime_error("feth device creation timed out");
}
Thread::sleep(100);
}
}
Thread::sleep(100); // this causes them to come up in a more user-friendly order on launch
_thread = Thread::start(this);
}