diff --git a/ipv4/control_pktinfo.go b/ipv4/control_pktinfo.go index b0a8dbe4..0e748dbd 100644 --- 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 { diff --git a/ipv4/defs_darwin.go b/ipv4/defs_darwin.go index 9c682769..162f3108 100644 --- 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 diff --git a/ipv4/defs_linux.go b/ipv4/defs_linux.go index c1768507..31bdd609 100644 --- 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 diff --git a/ipv4/defs_solaris.go b/ipv4/defs_solaris.go index dcf1f6c4..daf74e55 100644 --- 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 diff --git a/ipv4/zsys_darwin.go b/ipv4/zsys_darwin.go index 345932b8..d14b8717 100644 --- 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 diff --git a/ipv4/zsys_linux_386.go b/ipv4/zsys_linux_386.go index a1cbb950..8c5795ea 100644 --- 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 diff --git a/ipv4/zsys_linux_amd64.go b/ipv4/zsys_linux_amd64.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_arm.go b/ipv4/zsys_linux_arm.go index a1cbb950..8c5795ea 100644 --- 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 diff --git a/ipv4/zsys_linux_arm64.go b/ipv4/zsys_linux_arm64.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_mips.go b/ipv4/zsys_linux_mips.go index a1cbb950..8c5795ea 100644 --- 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 diff --git a/ipv4/zsys_linux_mips64.go b/ipv4/zsys_linux_mips64.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_mips64le.go b/ipv4/zsys_linux_mips64le.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_mipsle.go b/ipv4/zsys_linux_mipsle.go index a1cbb950..8c5795ea 100644 --- 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 diff --git a/ipv4/zsys_linux_ppc.go b/ipv4/zsys_linux_ppc.go index 714ae0a4..2c9e7e3c 100644 --- 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 diff --git a/ipv4/zsys_linux_ppc64.go b/ipv4/zsys_linux_ppc64.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_ppc64le.go b/ipv4/zsys_linux_ppc64le.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_linux_riscv64.go b/ipv4/zsys_linux_riscv64.go index bd325674..b31766a0 100644 --- 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 diff --git a/ipv4/zsys_linux_s390x.go b/ipv4/zsys_linux_s390x.go index fcf9fa2e..7b40aa1b 100644 --- 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 diff --git a/ipv4/zsys_solaris.go b/ipv4/zsys_solaris.go index c110b208..1cdc45c2 100644 --- 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