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

Reorder Linux TAP link sequence

Browse Source 
This corrects the flow for bringing up a TAP device under Linux.

Closes #1314
This commit is contained in:
Jonathon Fernyhough
2021-04-21 12:30:51 +01:00
parent e8f7d5ef9e
commit 9374e45449
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osdep/LinuxEthernetTap.cpp
View File

@@ -207,12 +207,6 @@ LinuxEthernetTap::LinuxEthernetTap(
printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n"); printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n");
return; return;
} }
ifr.ifr_flags |= IFF_UP;
if (ioctl(sock,SIOCSIFFLAGS,(void *)&ifr) < 0) {
::close(sock);
printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n");
return;
}
// Some kernel versions seem to require you to yield while the device comes up // Some kernel versions seem to require you to yield while the device comes up
// before they will accept MTU and MAC. For others it doesn't matter, but is // before they will accept MTU and MAC. For others it doesn't matter, but is
@@ -235,6 +229,13 @@ LinuxEthernetTap::LinuxEthernetTap(
return; return;
} }
ifr.ifr_flags |= IFF_UP;
if (ioctl(sock,SIOCSIFFLAGS,(void *)&ifr) < 0) {
::close(sock);
printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n");
return;
}
fcntl(_fd,F_SETFL,O_NONBLOCK); fcntl(_fd,F_SETFL,O_NONBLOCK);
::close(sock); ::close(sock);