From 7bf7fb77da37559954d6aa2139b664dc78d1fae3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 31 Jul 2020 11:38:00 -0400 Subject: [PATCH] fix mtu to not overflow uint16 --- service/ziti-tunnel/service/ipc.go | 4 ++-- service/ziti-tunnel/service/state.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index c55c5eff..bbe122f0 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -259,12 +259,12 @@ func setTunInfo(s *dto.TunnelStatus, ipv4 string, ipv4mask int) { log.Errorf("error reading MTU - using 0 for MTU: (%v)", err) mtu = 0 } - + umtu := uint16(mtu) //set the tun info into the state s.IpInfo = &dto.TunIpInfo{ Ip: ipv4, DNS: Ipv4dns, - MTU: uint16(mtu), + MTU: umtu, Subnet: ipv4MaskString(ipnet.Mask), } } diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index 4e86942c..a46b9ea2 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -120,7 +120,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error { } log.Infof("creating TUN device: %s", TunName) - tunDevice, err := tun.CreateTUN(TunName, 64*1024) + tunDevice, err := tun.CreateTUN(TunName, 64*1024 - 1) if err == nil { t.tun = &tunDevice tunName, err2 := tunDevice.Name()