From f59cd928f86ee797bd89640f8099f12f16cfa851 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 4 Dec 2020 10:08:51 +0700 Subject: [PATCH] use golang.org/x/sys/unix instead of syscall --- conn_ecn.go | 14 ++++++++------ conn_ecn_test.go | 11 ++++++----- conn_helper_darwin.go | 12 ++---------- conn_helper_linux.go | 8 ++------ conn_windows.go | 2 +- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/conn_ecn.go b/conn_ecn.go index 97db6e7a..5f8d6d87 100644 --- a/conn_ecn.go +++ b/conn_ecn.go @@ -9,6 +9,8 @@ import ( "syscall" "time" + "golang.org/x/sys/unix" + "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" ) @@ -29,7 +31,7 @@ func inspectReadBuffer(c net.PacketConn) (int, error) { var size int var serr error if err := rawConn.Control(func(fd uintptr) { - size, serr = syscall.GetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_RCVBUF) + size, serr = unix.GetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF) }); err != nil { return 0, err } @@ -53,12 +55,12 @@ func newConn(c ECNCapablePacketConn) (*ecnConn, error) { // We expect at least one of those syscalls to succeed. var errIPv4, errIPv6 error if err := rawConn.Control(func(fd uintptr) { - errIPv4 = setRECVTOS(fd) + errIPv4 = unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_RECVTOS, 1) }); err != nil { return nil, err } if err := rawConn.Control(func(fd uintptr) { - errIPv6 = syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_RECVTCLASS, 1) + errIPv6 = unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_RECVTCLASS, 1) }); err != nil { return nil, err } @@ -88,17 +90,17 @@ func (c *ecnConn) ReadPacket() (*receivedPacket, error) { if err != nil { return nil, err } - ctrlMsgs, err := syscall.ParseSocketControlMessage(c.oobBuffer[:oobn]) + ctrlMsgs, err := unix.ParseSocketControlMessage(c.oobBuffer[:oobn]) if err != nil { return nil, err } var ecn protocol.ECN for _, ctrlMsg := range ctrlMsgs { - if ctrlMsg.Header.Level == syscall.IPPROTO_IP && ctrlMsg.Header.Type == msgTypeIPTOS { + if ctrlMsg.Header.Level == unix.IPPROTO_IP && ctrlMsg.Header.Type == msgTypeIPTOS { ecn = protocol.ECN(ctrlMsg.Data[0] & ecnMask) break } - if ctrlMsg.Header.Level == syscall.IPPROTO_IPV6 && ctrlMsg.Header.Type == syscall.IPV6_TCLASS { + if ctrlMsg.Header.Level == unix.IPPROTO_IPV6 && ctrlMsg.Header.Type == unix.IPV6_TCLASS { ecn = protocol.ECN(ctrlMsg.Data[0] & ecnMask) break } diff --git a/conn_ecn_test.go b/conn_ecn_test.go index 7498e1ef..dbcc46f3 100644 --- a/conn_ecn_test.go +++ b/conn_ecn_test.go @@ -4,9 +4,10 @@ package quic import ( "net" - "syscall" "time" + "golang.org/x/sys/unix" + "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" @@ -60,7 +61,7 @@ var _ = Describe("Basic Conn Test", func() { "udp4", conn.LocalAddr().(*net.UDPAddr), func(fd uintptr) { - Expect(syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_TOS, 2)).To(Succeed()) + Expect(unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_TOS, 2)).To(Succeed()) }, ) @@ -80,7 +81,7 @@ var _ = Describe("Basic Conn Test", func() { "udp6", conn.LocalAddr().(*net.UDPAddr), func(fd uintptr) { - Expect(syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_TCLASS, 3)).To(Succeed()) + Expect(unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_TCLASS, 3)).To(Succeed()) }, ) @@ -102,7 +103,7 @@ var _ = Describe("Basic Conn Test", func() { "udp4", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: port}, func(fd uintptr) { - Expect(syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_TOS, 3)).To(Succeed()) + Expect(unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_TOS, 3)).To(Succeed()) }, ) @@ -116,7 +117,7 @@ var _ = Describe("Basic Conn Test", func() { "udp6", &net.UDPAddr{IP: net.IPv6loopback, Port: port}, func(fd uintptr) { - Expect(syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_TCLASS, 1)).To(Succeed()) + Expect(unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_TCLASS, 1)).To(Succeed()) }, ) diff --git a/conn_helper_darwin.go b/conn_helper_darwin.go index 8a144ade..129d5332 100644 --- a/conn_helper_darwin.go +++ b/conn_helper_darwin.go @@ -2,14 +2,6 @@ package quic -import "syscall" +import "golang.org/x/sys/unix" -const ( - //nolint:stylecheck - ip_recvtos = 27 - msgTypeIPTOS = ip_recvtos -) - -func setRECVTOS(fd uintptr) error { - return syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, ip_recvtos, 1) -} +const msgTypeIPTOS = unix.IP_RECVTOS diff --git a/conn_helper_linux.go b/conn_helper_linux.go index 1a798d4b..eb37f5cf 100644 --- a/conn_helper_linux.go +++ b/conn_helper_linux.go @@ -2,10 +2,6 @@ package quic -import "syscall" +import "golang.org/x/sys/unix" -const msgTypeIPTOS = syscall.IP_TOS - -func setRECVTOS(fd uintptr) error { - return syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_RECVTOS, 1) -} +const msgTypeIPTOS = unix.IP_TOS diff --git a/conn_windows.go b/conn_windows.go index db893983..1d80eefe 100644 --- a/conn_windows.go +++ b/conn_windows.go @@ -29,7 +29,7 @@ func inspectReadBuffer(c net.PacketConn) (int, error) { var size int var serr error if err := rawConn.Control(func(fd uintptr) { - size, serr = windows.GetsockoptInt(windows.Handle(fd), syscall.SOL_SOCKET, syscall.SO_RCVBUF) + size, serr = windows.GetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVBUF) }); err != nil { return 0, err }