github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-15 01:23:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix for issue #6: OSX tap device forgets it has IPv6

Browse source
This commit is contained in:
Adam Ierymenko 2013-07-08 20:36:33 -04:00
parent 366f556e5b
commit 6eb77da094
4 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
node/EthernetTap.cpp
View file

@ -164,6 +164,11 @@ EthernetTap::~EthernetTap()
delete [] _putBuf;
}
void EthernetTap::whack()
{
// Linux requires nothing here
}
static bool ___removeIp(const char *_dev,std::set<InetAddress> &_ips,const InetAddress &ip)
{
long cpid;
@ -461,18 +466,7 @@ EthernetTap::EthernetTap(const RuntimeEnvironment *renv,const MAC &mac,unsigned
}
}
// OSX seems to require that IPv6 be turned on on tap devices
if ((cpid = (int)fork()) == 0) {
execl(ZT_MAC_IPCONFIG,ZT_MAC_IPCONFIG,"set",_dev,"AUTOMATIC-V6",(const char *)0);
exit(-1);
} else {
int exitcode = -1;
waitpid(cpid,&exitcode,0);
if (exitcode) {
::close(_fd);
throw std::runtime_error("ipconfig failure enabling IPv6 link-local addressing");
}
}
whack(); // turns on IPv6 on OSX
_putBuf = new unsigned char[((mtu + 14) * 2)];
_getBuf = _putBuf + (mtu + 14);
@ -484,6 +478,21 @@ EthernetTap::~EthernetTap()
delete [] _putBuf;
}
void EthernetTap::whack()
{
int cpid = fork();
if (cpid == 0) {
execl(ZT_MAC_IPCONFIG,ZT_MAC_IPCONFIG,"set",_dev,"AUTOMATIC-V6",(const char *)0);
exit(-1);
} else {
int exitcode = -1;
waitpid(cpid,&exitcode,0);
if (exitcode) {
LOG("%s: ipconfig set AUTOMATIC-V6 failed",_dev);
}
}
}
// Helper function to actually remove IP from network device, execs ifconfig
static bool ___removeIp(const char *_dev,const InetAddress &ip)
{