gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix.

Browse Source
This commit is contained in:
Adam Ierymenko
2020-11-11 15:14:08 -05:00
parent 36e167013a
commit 59dd71187e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osdep/LinuxEthernetTap.cpp
View File

@@ -80,6 +80,7 @@ LinuxEthernetTap::LinuxEthernetTap(
_handler(handler), _handler(handler),
_arg(arg), _arg(arg),
_nwid(nwid), _nwid(nwid),
_mac(mac),
_homePath(homePath), _homePath(homePath),
_mtu(mtu), _mtu(mtu),
_fd(0), _fd(0),
@@ -432,7 +433,7 @@ void LinuxEthernetTap::threadMain()
Thread::sleep(500); Thread::sleep(500);
ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER; ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6); _mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6);
if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) { if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) {
::close(sock); ::close(sock);
printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n"); printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n");

1
osdep/LinuxEthernetTap.hpp
View File

@@ -63,6 +63,7 @@ private:
void (*_handler)(void *,void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int); void (*_handler)(void *,void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
void *_arg; void *_arg;
uint64_t _nwid; uint64_t _nwid;
MAC _mac;
Thread _thread; Thread _thread;
std::string _homePath; std::string _homePath;
std::string _dev; std::string _dev;