diff options
Diffstat (limited to 'node/EthernetTap.cpp')
| -rw-r--r-- | node/EthernetTap.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/node/EthernetTap.cpp b/node/EthernetTap.cpp index b90c8708..62eee69c 100644 --- a/node/EthernetTap.cpp +++ b/node/EthernetTap.cpp @@ -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) { |