gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #3178 from lucas-clemente/fix-windows-ipv6-dontfragment

Browse Source 
fix DONT_FRAGMENT error when using a IPv6 connection on Windows
This commit is contained in:
Marten Seemann
2021-05-11 12:46:20 -07:00
committed by GitHub
parent 50746dbea6 22a703b669
commit 0bc0e96161
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
conn_windows.go
View File

@@ -13,24 +13,20 @@ import (
const IP_DONTFRAGMENT = 14 const IP_DONTFRAGMENT = 14
func newConn(c net.PacketConn) (connection, error) { func newConn(c OOBCapablePacketConn) (connection, error) {
conn, ok := c.(interface { rawConn, err := c.SyscallConn()
SyscallConn() (syscall.RawConn, error)
})
if !ok {
return nil, errors.New("doesn't have a SyscallConn")
}
rawConn, err := conn.SyscallConn()
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't get syscall.RawConn: %w", err) return nil, fmt.Errorf("couldn't get syscall.RawConn: %w", err)
} }
var serr error
if err := rawConn.Control(func(fd uintptr) { if err := rawConn.Control(func(fd uintptr) {
serr = windows.SetsockoptInt(windows.Handle(fd), windows.IPPROTO_IP, IP_DONTFRAGMENT, 1) // This should succeed if the connection is a IPv4 or a dual-stack connection.
// It will fail for IPv6 connections.
// TODO: properly handle error.
_ = windows.SetsockoptInt(windows.Handle(fd), windows.IPPROTO_IP, IP_DONTFRAGMENT, 1)
}); err != nil { }); err != nil {
return nil, err return nil, err
} }
return &basicConn{PacketConn: c}, serr return &basicConn{PacketConn: c}, nil
} }
func inspectReadBuffer(c net.PacketConn) (int, error) { func inspectReadBuffer(c net.PacketConn) (int, error) {

14
conn_windows_test.go
View File

@@ -10,13 +10,23 @@ import (
) )
var _ = Describe("Windows Conn Test", func() { var _ = Describe("Windows Conn Test", func() {
It("try newConn", func() { It("works on IPv4", func() {
addr, err := net.ResolveUDPAddr("udp4", "localhost:0") addr, err := net.ResolveUDPAddr("udp4", "localhost:0")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
udpConn, err := net.ListenUDP("udp4", addr) udpConn, err := net.ListenUDP("udp4", addr)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
conn, err := newConn(udpConn) conn, err := newConn(udpConn)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
_ = conn.Close() Expect(conn.Close()).To(Succeed())
})
It("works on IPv6", func() {
addr, err := net.ResolveUDPAddr("udp6", "[::1]:0")
Expect(err).ToNot(HaveOccurred())
udpConn, err := net.ListenUDP("udp6", addr)
Expect(err).ToNot(HaveOccurred())
conn, err := newConn(udpConn)
Expect(err).ToNot(HaveOccurred())
Expect(conn.Close()).To(Succeed())
}) })
}) })