void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1559 from zerotier/oldlinux

Browse source 
potential fix for 2.6.x kernels
This commit is contained in:
Adam Ierymenko 2022-02-11 17:59:53 -05:00 • committed by GitHub
commit bb2b109707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
osdep/LinuxEthernetTap.cpp
View file

@ -52,6 +52,10 @@
#include <utility> #include <utility>
#include <string> #include <string>
#include <ctype.h>
#include <sys/utsname.h>
#ifndef IFNAMSIZ #ifndef IFNAMSIZ
#define IFNAMSIZ 16 #define IFNAMSIZ 16
#endif #endif
@ -63,6 +67,35 @@ static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC
namespace ZeroTier { namespace ZeroTier {
// determine if we're running a really old linux kernel.
// Kernels in the 2.6.x series don't behave the same when bringing up
// the tap devices.
//
// Returns true if the kernel major version is < 3
bool isOldLinuxKernel() {
struct utsname buffer;
char *p;
long ver[16];
int i = 0;
if (uname(&buffer) != 0) {
perror("uname");
exit(EXIT_FAILURE);
}
p = buffer.release;
while (*p) {
if (isdigit(*p)) {
ver[i] = strtol(p, &p, 10);
i++;
} else {
p++;
}
}
return ver[0] < 3;
}
static const char _base32_chars[32] = { 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','2','3','4','5','6','7' }; static const char _base32_chars[32] = { 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','2','3','4','5','6','7' };
static void _base32_5_to_8(const uint8_t *in,char *out) static void _base32_5_to_8(const uint8_t *in,char *out)
{ {
@ -213,6 +246,13 @@ LinuxEthernetTap::LinuxEthernetTap(
return; return;
} }
ifr.ifr_ifru.ifru_mtu = (int)_mtu;
if (ioctl(sock,SIOCSIFMTU,(void *)&ifr) < 0) {
::close(sock);
printf("WARNING: ioctl() failed setting up Linux tap device (set MTU)\n");
return;
}
usleep(100000); usleep(100000);
ifr.ifr_flags |= IFF_MULTICAST; ifr.ifr_flags |= IFF_MULTICAST;
@ -225,19 +265,21 @@ LinuxEthernetTap::LinuxEthernetTap(
usleep(100000); usleep(100000);
ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER; if (!isOldLinuxKernel()) {
_mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6); ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) { _mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6);
::close(sock); if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) {
printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n"); ::close(sock);
return; printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n");
} return;
}
ifr.ifr_ifru.ifru_mtu = (int)_mtu; ifr.ifr_ifru.ifru_mtu = (int)_mtu;
if (ioctl(sock,SIOCSIFMTU,(void *)&ifr) < 0) { if (ioctl(sock,SIOCSIFMTU,(void *)&ifr) < 0) {
::close(sock); ::close(sock);
printf("WARNING: ioctl() failed setting up Linux tap device (set MTU)\n"); printf("WARNING: ioctl() failed setting up Linux tap device (set MTU)\n");
return; return;
}
} }
fcntl(_fd,F_SETFL,O_NONBLOCK); fcntl(_fd,F_SETFL,O_NONBLOCK);