Skip to content

Commit c8897c2

Browse files
committedMar 30, 2021
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>
1 parent 22f4162 commit c8897c2

19 files changed

+3
-21
lines changed
 

‎ipv4/control_pktinfo.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ import (
1313

1414
"golang.org/x/net/internal/iana"
1515
"golang.org/x/net/internal/socket"
16+
17+
"golang.org/x/sys/unix"
1618
)
1719

1820
func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
1921
m := socket.ControlMessage(b)
20-
m.MarshalHeader(iana.ProtocolIP, sysIP_PKTINFO, sizeofInetPktinfo)
22+
m.MarshalHeader(iana.ProtocolIP, unix.IP_PKTINFO, sizeofInetPktinfo)
2123
if cm != nil {
2224
pi := (*inetPktinfo)(unsafe.Pointer(&m.Data(sizeofInetPktinfo)[0]))
2325
if ip := cm.Src.To4(); ip != nil {

‎ipv4/defs_darwin.go

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const (
2020
sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
2121
sysIP_RECVIF = C.IP_RECVIF
2222
sysIP_RECVTTL = C.IP_RECVTTL
23-
sysIP_PKTINFO = C.IP_PKTINFO
2423

2524
sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
2625
sizeofSockaddrInet = C.sizeof_struct_sockaddr_in

‎ipv4/defs_linux.go

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package ipv4
2121
import "C"
2222

2323
const (
24-
sysIP_PKTINFO = C.IP_PKTINFO
2524
sysIP_RECVTTL = C.IP_RECVTTL
2625

2726
sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage

‎ipv4/defs_solaris.go

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ const (
2121
sysIP_RECVIF = C.IP_RECVIF
2222
sysIP_RECVTTL = C.IP_RECVTTL
2323

24-
sysIP_PKTINFO = C.IP_PKTINFO
25-
2624
sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
2725
sizeofSockaddrInet = C.sizeof_struct_sockaddr_in
2826
sizeofInetPktinfo = C.sizeof_struct_in_pktinfo

‎ipv4/zsys_darwin.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_386.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_amd64.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_arm.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_arm64.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_mips.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_mips64.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_mips64le.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_mipsle.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_ppc.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_ppc64.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_ppc64le.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_riscv64.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_linux_s390x.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ipv4/zsys_solaris.go

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.