ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more changes for slow network leaving on Mac.

Browse Source
This commit is contained in:
Adam Ierymenko 2020-11-02 14:00:35 -05:00
parent c9fe04d8ea
commit 763d1cc3dc
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osdep/MacEthernetTap.cpp
View File

@ -214,19 +214,9 @@ MacEthernetTap::~MacEthernetTap()
Mutex::Lock _gl(globalTapCreateLock);
::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit
::close(_shutdownSignalPipe[0]);
::close(_shutdownSignalPipe[1]);
int ec = 0;
::kill(_agentPid,SIGKILL);
::close(_agentStdin);
::close(_agentStdout);
::close(_agentStderr);
::close(_agentStdin2);
::close(_agentStdout2);
::close(_agentStderr2);
::waitpid(_agentPid,&ec,0);
args[0] = "/sbin/ifconfig";
@ -496,6 +486,15 @@ void MacEthernetTap::threadMain()
*/
}
}
::close(_agentStdin);
::close(_agentStdout);
::close(_agentStderr);
::close(_agentStdin2);
::close(_agentStdout2);
::close(_agentStderr2);
::close(_shutdownSignalPipe[0]);
::close(_shutdownSignalPipe[1]);
}
void MacEthernetTap::setDns(const char *domain, const std::vector<InetAddress> &servers)