diff --git a/wgengine/magicsock/peermtu.go b/wgengine/magicsock/peermtu.go index 7de0d66c6..199585323 100644 --- a/wgengine/magicsock/peermtu.go +++ b/wgengine/magicsock/peermtu.go @@ -104,15 +104,6 @@ func (c *Conn) UpdatePMTUD() { _ = c.setDontFragment("udp6", false) newStatus = false } - err4 = c.setReceiveICMPErrors("udp4", enable) - err6 = c.setReceiveICMPErrors("udp6", enable) - - if err4 != nil || err6 != nil { - c.logf("[unexpected] magicsock: peermtu: enabling receive ICMP errors to %v failed (v4: %v, v6: %v), disabling", enable, err4, err6) - _ = c.setReceiveICMPErrors("udp4", false) - _ = c.setReceiveICMPErrors("udp6", false) - } - if debugPMTUD() { c.logf("magicsock: peermtu: peer MTU probes are %v", tstun.WireMTUsToProbe) } diff --git a/wgengine/magicsock/peermtu_darwin.go b/wgengine/magicsock/peermtu_darwin.go index 4fdc2c19e..a0a1aacb5 100644 --- a/wgengine/magicsock/peermtu_darwin.go +++ b/wgengine/magicsock/peermtu_darwin.go @@ -49,7 +49,3 @@ func (c *Conn) getDontFragment(network string) (bool, error) { } return false, err } - -func (c *Conn) setReceiveICMPErrors(network string, enable bool) error { - return nil -} diff --git a/wgengine/magicsock/peermtu_linux.go b/wgengine/magicsock/peermtu_linux.go index bdbea0696..b76f30f08 100644 --- a/wgengine/magicsock/peermtu_linux.go +++ b/wgengine/magicsock/peermtu_linux.go @@ -47,35 +47,3 @@ func (c *Conn) getDontFragment(network string) (bool, error) { } return false, err } - -func (c *Conn) setReceiveICMPErrors(network string, enable bool) error { - optArg := 1 - if enable == false { - optArg = 0 - } - var err error - rcErr := c.connControl(network, func(fd uintptr) { - err = syscall.SetsockoptInt(int(fd), getIPProto(network), syscall.IP_RECVERR, optArg) - }) - - if rcErr != nil { - return rcErr - } - return err -} - -func (c *Conn) getReceiveICMPErrors(network string, enable bool) (bool, error) { - var v int - var err error - rcErr := c.connControl(network, func(fd uintptr) { - v, err = syscall.GetsockoptInt(int(fd), getIPProto(network), syscall.IP_RECVERR) - }) - - if rcErr != nil { - return false, rcErr - } - if v == 1 { - return true, err - } - return false, err -}