vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-05-07 04:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

hotfix(pmtud/icmp): set IPv6 dont fragment options just in case

Browse Source
This commit is contained in:
Quentin McGaw
2026-02-19 16:32:33 +00:00
parent 8d86470905
commit 67b66bba9e
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/pmtud/icmp/df_linux.go
+7 -3
View File
@@ -4,7 +4,11 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func setDontFragment(fd uintptr) (err error) { func setDontFragment(fd uintptr, ipv4 bool) (err error) {
return unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, if ipv4 {
unix.IP_MTU_DISCOVER, unix.IP_PMTUDISC_PROBE) return unix.SetsockoptInt(int(fd), unix.IPPROTO_IP,
unix.IP_MTU_DISCOVER, unix.IP_PMTUDISC_PROBE)
}
return unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6,
unix.IPV6_MTU_DISCOVER, unix.IPV6_PMTUDISC_PROBE)
} }
internal/pmtud/icmp/df.go → internal/pmtud/icmp/df_unspecified.go
+1 -1
View File
@@ -5,6 +5,6 @@ package icmp
// setDontFragment for platforms other than Linux and Windows // setDontFragment for platforms other than Linux and Windows
// is not implemented, so we just return assuming the don't // is not implemented, so we just return assuming the don't
// fragment flag is set on IP packets. // fragment flag is set on IP packets.
func setDontFragment(fd uintptr) (err error) { func setDontFragment(fd uintptr, ipv4 bool) (err error) {
return nil return nil
} }
internal/pmtud/icmp/df_windows.go
+7 -4
View File
@@ -4,8 +4,11 @@ import (
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )
func setDontFragment(fd uintptr) (err error) { func setDontFragment(fd uintptr, ipv4 bool) (err error) {
// https://docs.microsoft.com/en-us/troubleshoot/windows/win32/header-library-requirement-socket-ipproto-ip if ipv4 {
// #define IP_DONTFRAGMENT 14 /* don't fragment IP datagrams */ // https://docs.microsoft.com/en-us/troubleshoot/windows/win32/header-library-requirement-socket-ipproto-ip
return windows.SetsockoptInt(windows.Handle(fd), windows.IPPROTO_IP, 14, 1) // #define IP_DONTFRAGMENT 14 /* don't fragment IP datagrams */
return windows.SetsockoptInt(windows.Handle(fd), windows.IPPROTO_IP, 14, 1)
}
return windows.SetsockoptInt(windows.Handle(fd), windows.IPPROTO_IPV6, 14, 1)
} }
internal/pmtud/icmp/ipv4.go
+2 -1
View File
@@ -25,7 +25,8 @@ func listenICMPv4(ctx context.Context) (conn net.PacketConn, err error) {
listenConfig.Control = func(_, _ string, rawConn syscall.RawConn) error { listenConfig.Control = func(_, _ string, rawConn syscall.RawConn) error {
var setDFErr error var setDFErr error
err := rawConn.Control(func(fd uintptr) { err := rawConn.Control(func(fd uintptr) {
setDFErr = setDontFragment(fd) // runs when calling ListenPacket const ipv4 = true
setDFErr = setDontFragment(fd, ipv4) // runs when calling ListenPacket
}) })
if err == nil { if err == nil {
err = setDFErr err = setDFErr
internal/pmtud/icmp/ipv6.go
+12
View File
@@ -6,6 +6,7 @@ import (
"net" "net"
"net/netip" "net/netip"
"strings" "strings"
"syscall"
"time" "time"
"github.com/qdm12/gluetun/internal/pmtud/constants" "github.com/qdm12/gluetun/internal/pmtud/constants"
@@ -19,6 +20,17 @@ const (
func listenICMPv6(ctx context.Context) (conn net.PacketConn, err error) { func listenICMPv6(ctx context.Context) (conn net.PacketConn, err error) {
var listenConfig net.ListenConfig var listenConfig net.ListenConfig
listenConfig.Control = func(_, _ string, rawConn syscall.RawConn) error {
var setDFErr error
err := rawConn.Control(func(fd uintptr) {
const ipv4 = false
setDFErr = setDontFragment(fd, ipv4) // runs when calling ListenPacket
})
if err == nil {
err = setDFErr
}
return err
}
const listenAddress = "" const listenAddress = ""
packetConn, err := listenConfig.ListenPacket(ctx, "ip6:ipv6-icmp", listenAddress) packetConn, err := listenConfig.ListenPacket(ctx, "ip6:ipv6-icmp", listenAddress)
if err != nil { if err != nil {