diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-29 11:43:54 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-29 11:43:54 +0200 |
| commit | 1f29b775a581597acacc718f494f6b814a862a0a (patch) | |
| tree | f5702ebc73b4ceed5b08e5138b240d049c44a5bb /tunnel | |
| parent | global: several helpers are now upstream (diff) | |
| download | wireguard-windows-1f29b775a581597acacc718f494f6b814a862a0a.tar.xz wireguard-windows-1f29b775a581597acacc718f494f6b814a862a0a.zip | |
tunnel: allow for disabled ipv6
Diffstat (limited to 'tunnel')
| -rw-r--r-- | tunnel/defaultroutemonitor.go | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tunnel/defaultroutemonitor.go b/tunnel/defaultroutemonitor.go index 8dd3273c..6291b695 100644 --- a/tunnel/defaultroutemonitor.go +++ b/tunnel/defaultroutemonitor.go @@ -54,8 +54,7 @@ func bindSocketRoute(family winipcfg.AddressFamily, device *device.Device, ourLU return nil } -func getIPInterfaceRetry(luid winipcfg.LUID, family winipcfg.AddressFamily, retry bool) (ipi *winipcfg.MibIPInterfaceRow, err error) { - const maxRetries = 100 +func getIPInterfaceRetry(luid winipcfg.LUID, family winipcfg.AddressFamily, retry bool, maxRetries int) (ipi *winipcfg.MibIPInterfaceRow, err error) { for i := 0; i < maxRetries; i++ { ipi, err = luid.IPInterface(family) if retry && i != maxRetries-1 && err == windows.ERROR_NOT_FOUND { @@ -106,7 +105,7 @@ func monitorDefaultRoutes(device *device.Device, autoMTU bool, tun *tun.NativeTu } } if mtu > 0 && (lastMTU == 0 || lastMTU != mtu) { - iface, err := getIPInterfaceRetry(ourLUID, windows.AF_INET, retry) + iface, err := getIPInterfaceRetry(ourLUID, windows.AF_INET, retry, 100) if err != nil { return err } @@ -119,17 +118,16 @@ func monitorDefaultRoutes(device *device.Device, autoMTU bool, tun *tun.NativeTu return err } tun.ForceMTU(int(iface.NLMTU)) //TODO: it sort of breaks the model with v6 mtu and v4 mtu being different. Just set v4 one for now. - iface, err = getIPInterfaceRetry(ourLUID, windows.AF_INET6, retry) - if err != nil { - return err - } - iface.NLMTU = mtu - 80 - if iface.NLMTU < 1280 { - iface.NLMTU = 1280 - } - err = iface.Set() - if err != nil { - return err + iface, err = getIPInterfaceRetry(ourLUID, windows.AF_INET6, retry, 3) + if err == nil { // People seem to like to disable IPv6, so we make this non-fatal. + iface.NLMTU = mtu - 80 + if iface.NLMTU < 1280 { + iface.NLMTU = 1280 + } + err = iface.Set() + if err != nil { + return err + } } lastMTU = mtu } |