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

More new Mac ethernet tap bugs.

Browse source
This commit is contained in:
Adam Ierymenko 2019-03-29 15:14:03 -07:00
parent d77846dcea
commit 02f0eead1c
2 changed files with 94 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
osdep/MacEthernetTap.cpp
View file

@ -70,6 +70,7 @@ static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC
namespace ZeroTier { namespace ZeroTier {
static Mutex globalTapCreateLock; static Mutex globalTapCreateLock;
static bool globalTapInitialized = false;
MacEthernetTap::MacEthernetTap( MacEthernetTap::MacEthernetTap(
const char *homePath, const char *homePath,
@ -100,17 +101,6 @@ MacEthernetTap::MacEthernetTap(
OSUtils::ztsnprintf(mtustr,sizeof(mtustr),"%u",mtu); OSUtils::ztsnprintf(mtustr,sizeof(mtustr),"%u",mtu);
OSUtils::ztsnprintf(metricstr,sizeof(metricstr),"%u",metric); OSUtils::ztsnprintf(metricstr,sizeof(metricstr),"%u",metric);
struct ifaddrs *ifa = (struct ifaddrs *)0;
std::set<std::string> ifns;
if (!getifaddrs(&ifa)) {
struct ifaddrs *p = ifa;
while (p) {
ifns.insert(std::string(p->ifa_name));
p = p->ifa_next;
}
freeifaddrs(ifa);
}
std::string agentPath(homePath); std::string agentPath(homePath);
agentPath.push_back(ZT_PATH_SEPARATOR); agentPath.push_back(ZT_PATH_SEPARATOR);
agentPath.append("MacEthernetTapAgent"); agentPath.append("MacEthernetTapAgent");
@ -119,15 +109,62 @@ MacEthernetTap::MacEthernetTap(
Mutex::Lock _gl(globalTapCreateLock); // only make one at a time Mutex::Lock _gl(globalTapCreateLock); // only make one at a time
unsigned int devNo = (nwid ^ (nwid >> 32) ^ (nwid >> 48)) % 5000; // Destroy all feth devices on first tap start in case ZeroTier did not exit cleanly last time.
for(int tries=0;tries<16;++tries) { // We leave interfaces less than feth100 alone in case something else is messing with feth devices.
OSUtils::ztsnprintf(devstr,sizeof(devstr),"feth%u",devNo); if (!globalTapInitialized) {
_dev = devstr; globalTapInitialized = true;
if (!ifns.count(_dev)) struct ifaddrs *ifa = (struct ifaddrs *)0;
break; std::set<std::string> deleted;
devNo = (devNo + 1) % 5000; if (!getifaddrs(&ifa)) {
struct ifaddrs *p = ifa;
while (p) {
if ((!strncmp(p->ifa_name,"feth",4))&&(strlen(p->ifa_name) >= 7)&&(deleted.count(std::string(p->ifa_name)) == 0)) {
deleted.insert(std::string(p->ifa_name));
const char *args[4];
args[0] = "/sbin/ifconfig";
args[1] = p->ifa_name;
args[2] = "destroy";
args[3] = (char *)0;
const pid_t pid = vfork();
if (pid == 0) {
execv(args[0],const_cast<char **>(args));
_exit(-1);
} else if (pid > 0) {
int rv = 0;
waitpid(pid,&rv,0);
}
}
p = p->ifa_next;
}
freeifaddrs(ifa);
}
}
unsigned int devNo = 100 + ((nwid ^ (nwid >> 32) ^ (nwid >> 48)) % 4900);
for(;;) {
OSUtils::ztsnprintf(devnostr,sizeof(devnostr),"%u",devNo);
OSUtils::ztsnprintf(devstr,sizeof(devstr),"feth%u",devNo);
bool duplicate = false;
struct ifaddrs *ifa = (struct ifaddrs *)0;
if (!getifaddrs(&ifa)) {
struct ifaddrs *p = ifa;
while (p) {
if (!strcmp(p->ifa_name,devstr)) {
duplicate = true;
break;
}
p = p->ifa_next;
}
freeifaddrs(ifa);
}
if (duplicate) {
devNo = (devNo + 1) % 5000;
if (devNo < 100)
devNo = 100;
} else {
break;
}
} }
OSUtils::ztsnprintf(devnostr,sizeof(devnostr),"%u",devNo);
if (::pipe(_shutdownSignalPipe)) if (::pipe(_shutdownSignalPipe))
throw std::runtime_error("pipe creation failed"); throw std::runtime_error("pipe creation failed");
@ -208,8 +245,10 @@ bool MacEthernetTap::addIp(const InetAddress &ip)
cmd.push_back(0); cmd.push_back(0);
uint16_t l = (uint16_t)cmd.length(); uint16_t l = (uint16_t)cmd.length();
_putLock.lock();
write(_agentStdin,&l,2); write(_agentStdin,&l,2);
write(_agentStdin,cmd.data(),cmd.length()); write(_agentStdin,cmd.data(),cmd.length());
_putLock.unlock();
return true; return true;
} }
@ -231,8 +270,10 @@ bool MacEthernetTap::removeIp(const InetAddress &ip)
cmd.push_back(0); cmd.push_back(0);
uint16_t l = (uint16_t)cmd.length(); uint16_t l = (uint16_t)cmd.length();
_putLock.lock();
write(_agentStdin,&l,2); write(_agentStdin,&l,2);
write(_agentStdin,cmd.data(),cmd.length()); write(_agentStdin,cmd.data(),cmd.length());
_putLock.unlock();
return true; return true;
} }
@ -278,8 +319,8 @@ void MacEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,co
hdr[0] = ZT_MACETHERNETTAPAGENT_STDIN_CMD_PACKET; hdr[0] = ZT_MACETHERNETTAPAGENT_STDIN_CMD_PACKET;
to.copyTo(hdr + 1,6); to.copyTo(hdr + 1,6);
from.copyTo(hdr + 7,6); from.copyTo(hdr + 7,6);
hdr[13] = (char)((etherType >> 8) & 0xff); hdr[13] = (unsigned char)((etherType >> 8) & 0xff);
hdr[14] = (char)(etherType & 0xff); hdr[14] = (unsigned char)(etherType & 0xff);
l = (uint16_t)(len + 15); l = (uint16_t)(len + 15);
iov[0].iov_base = &l; iov[0].iov_base = &l;
iov[0].iov_len = 2; iov[0].iov_len = 2;
@ -336,28 +377,31 @@ void MacEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std:
void MacEthernetTap::setMtu(unsigned int mtu) void MacEthernetTap::setMtu(unsigned int mtu)
{ {
char tmp[16]; if (_mtu != mtu) {
std::string cmd; char tmp[16];
cmd.push_back((char)ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG); std::string cmd;
cmd.append("mtu"); cmd.push_back((char)ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG);
cmd.push_back(0); cmd.append("mtu");
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%u",mtu); cmd.push_back(0);
cmd.append(tmp); OSUtils::ztsnprintf(tmp,sizeof(tmp),"%u",mtu);
cmd.push_back(0); cmd.append(tmp);
uint16_t l = (uint16_t)cmd.length(); cmd.push_back(0);
write(_agentStdin,&l,2); uint16_t l = (uint16_t)cmd.length();
write(_agentStdin,cmd.data(),cmd.length()); _putLock.lock();
_mtu = mtu; write(_agentStdin,&l,2);
write(_agentStdin,cmd.data(),cmd.length());
_putLock.unlock();
_mtu = mtu;
}
} }
#define ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE 1048576 #define ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE 131072
void MacEthernetTap::threadMain() void MacEthernetTap::threadMain()
throw() throw()
{ {
char *const agentReadBuf = (char *)valloc(ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE); char agentReadBuf[ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE];
if (!agentReadBuf) char agentStderrBuf[256];
return;
fd_set readfds,nullfds; fd_set readfds,nullfds;
MAC to,from; MAC to,from;
@ -375,9 +419,10 @@ void MacEthernetTap::threadMain()
FD_SET(_agentStdout,&readfds); FD_SET(_agentStdout,&readfds);
FD_SET(_agentStderr,&readfds); FD_SET(_agentStderr,&readfds);
select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0); select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) {
if (FD_ISSET(_shutdownSignalPipe[0],&readfds))
break; break;
}
if (FD_ISSET(_agentStdout,&readfds)) { if (FD_ISSET(_agentStdout,&readfds)) {
long n = (long)read(_agentStdout,agentReadBuf + agentReadPtr,ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE - agentReadPtr); long n = (long)read(_agentStdout,agentReadBuf + agentReadPtr,ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE - agentReadPtr);
if (n > 0) { if (n > 0) {
@ -404,12 +449,16 @@ void MacEthernetTap::threadMain()
} }
} }
} }
if (FD_ISSET(_agentStderr,&readfds)) { if (FD_ISSET(_agentStderr,&readfds)) {
read(_agentStderr,agentReadBuf,ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE); read(_agentStderr,agentStderrBuf,sizeof(agentStderrBuf));
/*
const ssize_t n = read(_agentStderr,agentStderrBuf,sizeof(agentStderrBuf));
if (n > 0)
write(STDERR_FILENO,agentStderrBuf,(size_t)n);
*/
} }
} }
free(agentReadBuf);
} }
} // namespace ZeroTier } // namespace ZeroTier

10
osdep/MacEthernetTapAgent.c
View file

@ -104,8 +104,8 @@
#define P_IFCONFIG "/sbin/ifconfig" #define P_IFCONFIG "/sbin/ifconfig"
static unsigned char s_pktReadBuf[1048576] __attribute__ ((__aligned__(16))); static unsigned char s_pktReadBuf[131072] __attribute__ ((__aligned__(16)));
static unsigned char s_stdinReadBuf[1048576] __attribute__ ((__aligned__(16))); static unsigned char s_stdinReadBuf[131072] __attribute__ ((__aligned__(16)));
static char s_deviceName[IFNAMSIZ]; static char s_deviceName[IFNAMSIZ];
static char s_peerDeviceName[IFNAMSIZ]; static char s_peerDeviceName[IFNAMSIZ];
static int s_bpffd = -1; static int s_bpffd = -1;
@ -247,10 +247,6 @@ int main(int argc,char **argv)
snprintf(s_deviceName,sizeof(s_deviceName),"feth%d",deviceNo); snprintf(s_deviceName,sizeof(s_deviceName),"feth%d",deviceNo);
snprintf(s_peerDeviceName,sizeof(s_peerDeviceName),"feth%d",deviceNo+5000); snprintf(s_peerDeviceName,sizeof(s_peerDeviceName),"feth%d",deviceNo+5000);
run(P_IFCONFIG,s_peerDeviceName,"destroy",(char *)0);
usleep(10);
run(P_IFCONFIG,s_deviceName,"destroy",(char *)0);
usleep(10);
if (run(P_IFCONFIG,s_peerDeviceName,"create",(char *)0) != 0) { if (run(P_IFCONFIG,s_peerDeviceName,"create",(char *)0) != 0) {
fprintf(stderr,"E unable to create %s\n",s_deviceName); fprintf(stderr,"E unable to create %s\n",s_deviceName);
return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE; return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
@ -264,7 +260,7 @@ int main(int argc,char **argv)
usleep(10); usleep(10);
run(P_IFCONFIG,s_peerDeviceName,"peer",s_deviceName,(char *)0); run(P_IFCONFIG,s_peerDeviceName,"peer",s_deviceName,(char *)0);
usleep(10); usleep(10);
run(P_IFCONFIG,s_peerDeviceName,"mtu","10000","up",(char *)0); run(P_IFCONFIG,s_peerDeviceName,"mtu","16370","up",(char *)0); /* 16370 is the largest MTU MacOS/Darwin seems to allow */
usleep(10); usleep(10);
run(P_IFCONFIG,s_deviceName,"mtu",mtu,"metric",metric,"up",(char *)0); run(P_IFCONFIG,s_deviceName,"mtu",mtu,"metric",metric,"up",(char *)0);
usleep(10); usleep(10);