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

Remove deprecated vfork call on Mac, and make Mac route application more robust.

Browse Source
This commit is contained in:
Adam Ierymenko 2021-10-26 22:15:06 -04:00
parent cce8411c22
commit 594853e251
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osdep/MacEthernetTapAgent.c
View File

@ -157,7 +157,7 @@ static int run(const char *path,...)
args[argNo++] = (char *)0; args[argNo++] = (char *)0;
va_end(ap); va_end(ap);
pid_t pid = vfork(); pid_t pid = fork();
if (pid < 0) { if (pid < 0) {
return -1; return -1;
} else if (pid == 0) { } else if (pid == 0) {

10
osdep/ManagedRoute.cpp
View File

@ -507,15 +507,15 @@ bool ManagedRoute::sync()
} }
} }
if (!_applied.count(leftt)) { //if (!_applied.count(leftt)) {
_applied[leftt] = !_via; _applied[leftt] = !_via;
_routeCmd("delete",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device); //_routeCmd("delete",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
_routeCmd("add",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device); _routeCmd("add",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
//_routeCmd("change",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device); //_routeCmd("change",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
} //}
if ((rightt)&&(!_applied.count(rightt))) { if (rightt) {
_applied[rightt] = !_via; _applied[rightt] = !_via;
_routeCmd("delete",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device); //_routeCmd("delete",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
_routeCmd("add",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device); _routeCmd("add",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
//_routeCmd("change",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device); //_routeCmd("change",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
} }