ipv4: use IP_PKTINFO const from x/sys/unix

Change-Id: I9b9bbebe0cfe36585709e9cbc7b8216d6427376a Reviewed-on: https://go-review.googlesource.com/c/net/+/305590 Trust: Tobias Klauser <tobias.klauser@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Matt Layher <mdlayher@gmail.com>
2026-03-31 10:27:08 +09:00 · 2021-03-30 12:35:40 +02:00
parent 22f4162a90
commit c8897c278d
19 changed files with 3 additions and 21 deletions
--- a/ipv4/control_pktinfo.go
+++ b/ipv4/control_pktinfo.go
@@ -13,11 +13,13 @@ import (

 	"golang.org/x/net/internal/iana"
 	"golang.org/x/net/internal/socket"
+
+	"golang.org/x/sys/unix"
 )

 func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
 	m := socket.ControlMessage(b)
-	m.MarshalHeader(iana.ProtocolIP, sysIP_PKTINFO, sizeofInetPktinfo)
+	m.MarshalHeader(iana.ProtocolIP, unix.IP_PKTINFO, sizeofInetPktinfo)
 	if cm != nil {
 		pi := (*inetPktinfo)(unsafe.Pointer(&m.Data(sizeofInetPktinfo)[0]))
 		if ip := cm.Src.To4(); ip != nil {
--- a/ipv4/defs_darwin.go
+++ b/ipv4/defs_darwin.go
@@ -20,7 +20,6 @@ const (
 	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
 	sysIP_RECVIF      = C.IP_RECVIF
 	sysIP_RECVTTL     = C.IP_RECVTTL
-	sysIP_PKTINFO     = C.IP_PKTINFO

 	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
 	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
--- a/ipv4/defs_linux.go
+++ b/ipv4/defs_linux.go
@@ -21,7 +21,6 @@ package ipv4
 import "C"

 const (
-	sysIP_PKTINFO = C.IP_PKTINFO
 	sysIP_RECVTTL = C.IP_RECVTTL

 	sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage
--- a/ipv4/defs_solaris.go
+++ b/ipv4/defs_solaris.go
@@ -21,8 +21,6 @@ const (
 	sysIP_RECVIF      = C.IP_RECVIF
 	sysIP_RECVTTL     = C.IP_RECVTTL

-	sysIP_PKTINFO = C.IP_PKTINFO
-
 	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
 	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
 	sizeofInetPktinfo     = C.sizeof_struct_in_pktinfo
--- a/ipv4/zsys_darwin.go
+++ b/ipv4/zsys_darwin.go
@@ -7,7 +7,6 @@ const (
 	sysIP_RECVDSTADDR = 0x7
 	sysIP_RECVIF      = 0x14
 	sysIP_RECVTTL     = 0x18
-	sysIP_PKTINFO     = 0x1a

 	sizeofSockaddrStorage = 0x80
 	sizeofSockaddrInet    = 0x10
--- a/ipv4/zsys_linux_386.go
+++ b/ipv4/zsys_linux_386.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_amd64.go
+++ b/ipv4/zsys_linux_amd64.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_arm.go
+++ b/ipv4/zsys_linux_arm.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_arm64.go
+++ b/ipv4/zsys_linux_arm64.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_mips.go
+++ b/ipv4/zsys_linux_mips.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_mips64.go
+++ b/ipv4/zsys_linux_mips64.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_mips64le.go
+++ b/ipv4/zsys_linux_mips64le.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_mipsle.go
+++ b/ipv4/zsys_linux_mipsle.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_ppc.go
+++ b/ipv4/zsys_linux_ppc.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_ppc64.go
+++ b/ipv4/zsys_linux_ppc64.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_ppc64le.go
+++ b/ipv4/zsys_linux_ppc64le.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_riscv64.go
+++ b/ipv4/zsys_linux_riscv64.go
@@ -7,7 +7,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_linux_s390x.go
+++ b/ipv4/zsys_linux_s390x.go
@@ -4,7 +4,6 @@
 package ipv4

 const (
-	sysIP_PKTINFO = 0x8
 	sysIP_RECVTTL = 0xc

 	sizeofKernelSockaddrStorage = 0x80
--- a/ipv4/zsys_solaris.go
+++ b/ipv4/zsys_solaris.go
@@ -8,8 +8,6 @@ const (
 	sysIP_RECVIF      = 0x9
 	sysIP_RECVTTL     = 0xb

-	sysIP_PKTINFO = 0x1a
-
 	sizeofSockaddrStorage = 0x100
 	sizeofSockaddrInet    = 0x10
 	sizeofInetPktinfo     = 0xc