cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-26 16:31:41 +00:00
Code Releases Activity

Merge pull request #612 from neilalexander/mtuagain

Browse Source 
Fix couple of issues with MTU bounds
This commit is contained in:
Neil Alexander 2019-11-20 22:43:46 +00:00 committed by GitHub
commit 789307d52b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tuntap/tun.go
View File

@ -102,7 +102,7 @@ func DefaultName() string {
func DefaultMTU() int { func DefaultMTU() int {
ehbytes := 0 ehbytes := 0
if DefaultIsTAP() { if DefaultIsTAP() {
ehbytes = 14 ehbytes = tun_ETHER_HEADER_LENGTH
} }
return defaults.GetDefaults().DefaultIfMTU - ehbytes return defaults.GetDefaults().DefaultIfMTU - ehbytes
} }
@ -119,7 +119,7 @@ func DefaultIsTAP() bool {
func MaximumMTU(iftapmode bool) int { func MaximumMTU(iftapmode bool) int {
ehbytes := 0 ehbytes := 0
if iftapmode { if iftapmode {
ehbytes = 14 ehbytes = tun_ETHER_HEADER_LENGTH
} }
return defaults.GetDefaults().MaximumIfMTU - ehbytes return defaults.GetDefaults().MaximumIfMTU - ehbytes
} }
@ -170,22 +170,17 @@ func (tun *TunAdapter) _start() error {
nodeID := crypto.GetNodeID(&boxPub) nodeID := crypto.GetNodeID(&boxPub)
tun.addr = *address.AddrForNodeID(nodeID) tun.addr = *address.AddrForNodeID(nodeID)
tun.subnet = *address.SubnetForNodeID(nodeID) tun.subnet = *address.SubnetForNodeID(nodeID)
tun.mtu = current.IfMTU
ifname := current.IfName
iftapmode := current.IfTAPMode
addr := fmt.Sprintf("%s/%d", net.IP(tun.addr[:]).String(), 8*len(address.GetPrefix())-1) addr := fmt.Sprintf("%s/%d", net.IP(tun.addr[:]).String(), 8*len(address.GetPrefix())-1)
if ifname != "none" { if current.IfName == "none" || current.IfName == "dummy" {
if err := tun.setup(ifname, iftapmode, addr, tun.mtu); err != nil { tun.log.Debugln("Not starting TUN/TAP as ifname is none or dummy")
return nil
}
if err := tun.setup(current.IfName, current.IfTAPMode, addr, current.IfMTU); err != nil {
return err return err
} }
if tun.MTU() != current.IfMTU { if tun.MTU() != current.IfMTU {
tun.log.Warnf("Warning: Interface MTU %d automatically adjusted to %d (supported range is 1280-%d)", current.IfMTU, tun.MTU(), MaximumMTU(tun.IsTAP())) tun.log.Warnf("Warning: Interface MTU %d automatically adjusted to %d (supported range is 1280-%d)", current.IfMTU, tun.MTU(), MaximumMTU(tun.IsTAP()))
} }
}
if ifname == "none" || ifname == "dummy" {
tun.log.Debugln("Not starting TUN/TAP as ifname is none or dummy")
return nil
}
tun.isOpen = true tun.isOpen = true
go tun.handler() go tun.handler()
tun.reader.Act(nil, tun.reader._read) // Start the reader tun.reader.Act(nil, tun.reader._read) // Start the reader

8
src/tuntap/tun_linux.go
View File

@ -27,14 +27,6 @@ func (tun *TunAdapter) setup(ifname string, iftapmode bool, addr string, mtu int
} }
tun.iface = iface tun.iface = iface
tun.mtu = getSupportedMTU(mtu, iftapmode) tun.mtu = getSupportedMTU(mtu, iftapmode)
// 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 // Friendly output
tun.log.Infof("Interface name: %s", tun.iface.Name()) tun.log.Infof("Interface name: %s", tun.iface.Name())
tun.log.Infof("Interface IPv6: %s", addr) tun.log.Infof("Interface IPv6: %s", addr)