From 48a2f4386db41e354ac9e32bd81eff38e763a50a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 9 Sep 2021 17:04:31 +0200 Subject: tunnel: disable dad and router discovery on v4 too Oddly enough, these mean something for IPv4. Signed-off-by: Jason A. Donenfeld --- tunnel/addressconfig.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'tunnel/addressconfig.go') diff --git a/tunnel/addressconfig.go b/tunnel/addressconfig.go index 74ad75b3..3cd35c0c 100644 --- a/tunnel/addressconfig.go +++ b/tunnel/addressconfig.go @@ -147,24 +147,17 @@ func configureInterface(family winipcfg.AddressFamily, conf *conf.Config, luid w if err != nil { return err } + ipif.RouterDiscoveryBehavior = winipcfg.RouterDiscoveryDisabled + ipif.DadTransmits = 0 if conf.Interface.MTU > 0 { ipif.NLMTU = uint32(conf.Interface.MTU) if clamper != nil { clamper.ForceMTU(int(ipif.NLMTU)) } } - if family == windows.AF_INET { - if foundDefault4 { - ipif.UseAutomaticMetric = false - ipif.Metric = 0 - } - } else if family == windows.AF_INET6 { - if foundDefault6 { - ipif.UseAutomaticMetric = false - ipif.Metric = 0 - } - ipif.DadTransmits = 0 - ipif.RouterDiscoveryBehavior = winipcfg.RouterDiscoveryDisabled + if (family == windows.AF_INET && foundDefault4) || (family == windows.AF_INET6 && foundDefault6) { + ipif.UseAutomaticMetric = false + ipif.Metric = 0 } err = ipif.Set() if err != nil { -- cgit v1.2.3-59-g8ed1b