diff --git a/src/yggdrasil/tun_linux.go b/src/yggdrasil/tun_linux.go index 24c5aa92..a1f8abdf 100644 --- a/src/yggdrasil/tun_linux.go +++ b/src/yggdrasil/tun_linux.go @@ -29,6 +29,18 @@ func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) } tun.iface = iface tun.mtu = getSupportedMTU(mtu) + // The following check is specific to Linux, as the TAP driver only supports + // an MTU of 65535-14 to make room for the ethernet headers. This makes sure + // that the MTU gets rounded down to 65521 instead of causing a panic. + if iftapmode { + if tun.mtu > 65535-tun_ETHER_HEADER_LENGTH { + tun.mtu = 65535-tun_ETHER_HEADER_LENGTH + } + } + // Friendly output + tun.core.log.Printf("Interface name: %s", tun.iface.Name()) + tun.core.log.Printf("Interface IPv6: %s", addr) + tun.core.log.Printf("Interface MTU: %d", tun.mtu) return tun.setupAddress(addr) } diff --git a/src/yggdrasil/tun_windows.go b/src/yggdrasil/tun_windows.go index c6e57705..d3420df8 100644 --- a/src/yggdrasil/tun_windows.go +++ b/src/yggdrasil/tun_windows.go @@ -57,6 +57,10 @@ func (tun *tunDevice) setup(ifname string, iftapmode bool, addr string, mtu int) if err != nil { panic(err) } + // Friendly output + tun.core.log.Printf("Interface name: %s", tun.iface.Name()) + tun.core.log.Printf("Interface IPv6: %s", addr) + tun.core.log.Printf("Interface MTU: %d", tun.mtu) return tun.setupAddress(addr) }