From fc4aabc6c91483155dade6fbb627cc953a723260 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sat, 16 Nov 2019 14:14:03 +0100 Subject: [PATCH] ipv4, ipv6: use SockFprog definitions from x/sys/unix This fixes the mips{,64}{,le} builders failing the bpf-related tests and also avoids duplicating these consts/types across packages. Fixes golang/go#35669 Change-Id: I1ea96817464e3040e8cc00bff63c168fa5e75a71 Reviewed-on: https://go-review.googlesource.com/c/net/+/207286 Reviewed-by: Ian Lance Taylor --- ipv4/defs_linux.go | 9 --------- ipv4/sys_bpf.go | 7 ++++--- ipv4/sys_linux.go | 3 ++- ipv4/zsys_linux_386.go | 18 ------------------ ipv4/zsys_linux_amd64.go | 18 ------------------ ipv4/zsys_linux_arm.go | 18 ------------------ ipv4/zsys_linux_arm64.go | 18 ------------------ ipv4/zsys_linux_mips.go | 18 ------------------ ipv4/zsys_linux_mips64.go | 18 ------------------ ipv4/zsys_linux_mips64le.go | 18 ------------------ ipv4/zsys_linux_mipsle.go | 18 ------------------ ipv4/zsys_linux_ppc.go | 18 ------------------ ipv4/zsys_linux_ppc64.go | 18 ------------------ ipv4/zsys_linux_ppc64le.go | 18 ------------------ ipv4/zsys_linux_riscv64.go | 17 ----------------- ipv4/zsys_linux_s390x.go | 18 ------------------ ipv6/defs_linux.go | 9 --------- ipv6/sys_bpf.go | 7 ++++--- ipv6/sys_linux.go | 3 ++- ipv6/zsys_linux_386.go | 18 ------------------ ipv6/zsys_linux_amd64.go | 18 ------------------ ipv6/zsys_linux_arm.go | 18 ------------------ ipv6/zsys_linux_arm64.go | 18 ------------------ ipv6/zsys_linux_mips.go | 18 ------------------ ipv6/zsys_linux_mips64.go | 18 ------------------ ipv6/zsys_linux_mips64le.go | 18 ------------------ ipv6/zsys_linux_mipsle.go | 18 ------------------ ipv6/zsys_linux_ppc.go | 18 ------------------ ipv6/zsys_linux_ppc64.go | 18 ------------------ ipv6/zsys_linux_ppc64le.go | 18 ------------------ ipv6/zsys_linux_riscv64.go | 17 ----------------- ipv6/zsys_linux_s390x.go | 18 ------------------ 32 files changed, 12 insertions(+), 492 deletions(-) diff --git a/ipv4/defs_linux.go b/ipv4/defs_linux.go index beb11071..7d05c1dc 100644 --- a/ipv4/defs_linux.go +++ b/ipv4/defs_linux.go @@ -78,9 +78,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = C.SO_EE_ORIGIN_TXSTATUS sysSO_EE_ORIGIN_TIMESTAMPING = C.SO_EE_ORIGIN_TIMESTAMPING - sysSOL_SOCKET = C.SOL_SOCKET - sysSO_ATTACH_FILTER = C.SO_ATTACH_FILTER - sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage sizeofSockaddrInet = C.sizeof_struct_sockaddr_in sizeofInetPktinfo = C.sizeof_struct_in_pktinfo @@ -93,8 +90,6 @@ const ( sizeofGroupSourceReq = C.sizeof_struct_group_source_req sizeofICMPFilter = C.sizeof_struct_icmp_filter - - sizeofSockFprog = C.sizeof_struct_sock_fprog ) type kernelSockaddrStorage C.struct___kernel_sockaddr_storage @@ -116,7 +111,3 @@ type groupReq C.struct_group_req type groupSourceReq C.struct_group_source_req type icmpFilter C.struct_icmp_filter - -type sockFProg C.struct_sock_fprog - -type sockFilter C.struct_sock_filter diff --git a/ipv4/sys_bpf.go b/ipv4/sys_bpf.go index 9f30b730..5c03dce3 100644 --- a/ipv4/sys_bpf.go +++ b/ipv4/sys_bpf.go @@ -11,13 +11,14 @@ import ( "golang.org/x/net/bpf" "golang.org/x/net/internal/socket" + "golang.org/x/sys/unix" ) func (so *sockOpt) setAttachFilter(c *socket.Conn, f []bpf.RawInstruction) error { - prog := sockFProg{ + prog := unix.SockFprog{ Len: uint16(len(f)), - Filter: (*sockFilter)(unsafe.Pointer(&f[0])), + Filter: (*unix.SockFilter)(unsafe.Pointer(&f[0])), } - b := (*[sizeofSockFprog]byte)(unsafe.Pointer(&prog))[:sizeofSockFprog] + b := (*[unix.SizeofSockFprog]byte)(unsafe.Pointer(&prog))[:unix.SizeofSockFprog] return so.Set(c, b) } diff --git a/ipv4/sys_linux.go b/ipv4/sys_linux.go index 60defe13..cf755c7f 100644 --- a/ipv4/sys_linux.go +++ b/ipv4/sys_linux.go @@ -11,6 +11,7 @@ import ( "golang.org/x/net/internal/iana" "golang.org/x/net/internal/socket" + "golang.org/x/sys/unix" ) var ( @@ -35,7 +36,7 @@ var ( ssoLeaveSourceGroup: {Option: socket.Option{Level: iana.ProtocolIP, Name: sysMCAST_LEAVE_SOURCE_GROUP, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, ssoBlockSourceGroup: {Option: socket.Option{Level: iana.ProtocolIP, Name: sysMCAST_BLOCK_SOURCE, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, ssoUnblockSourceGroup: {Option: socket.Option{Level: iana.ProtocolIP, Name: sysMCAST_UNBLOCK_SOURCE, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, - ssoAttachFilter: {Option: socket.Option{Level: sysSOL_SOCKET, Name: sysSO_ATTACH_FILTER, Len: sizeofSockFprog}}, + ssoAttachFilter: {Option: socket.Option{Level: unix.SOL_SOCKET, Name: unix.SO_ATTACH_FILTER, Len: unix.SizeofSockFprog}}, } ) diff --git a/ipv4/zsys_linux_386.go b/ipv4/zsys_linux_386.go index 43ef8e59..1c7fdfa1 100644 --- a/ipv4/zsys_linux_386.go +++ b/ipv4/zsys_linux_386.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -133,16 +128,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_amd64.go b/ipv4/zsys_linux_amd64.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_amd64.go +++ b/ipv4/zsys_linux_amd64.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_arm.go b/ipv4/zsys_linux_arm.go index 43ef8e59..1c7fdfa1 100644 --- a/ipv4/zsys_linux_arm.go +++ b/ipv4/zsys_linux_arm.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -133,16 +128,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_arm64.go b/ipv4/zsys_linux_arm64.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_arm64.go +++ b/ipv4/zsys_linux_arm64.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_mips.go b/ipv4/zsys_linux_mips.go index 43ef8e59..1c7fdfa1 100644 --- a/ipv4/zsys_linux_mips.go +++ b/ipv4/zsys_linux_mips.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -133,16 +128,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_mips64.go b/ipv4/zsys_linux_mips64.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_mips64.go +++ b/ipv4/zsys_linux_mips64.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_mips64le.go b/ipv4/zsys_linux_mips64le.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_mips64le.go +++ b/ipv4/zsys_linux_mips64le.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_mipsle.go b/ipv4/zsys_linux_mipsle.go index 43ef8e59..1c7fdfa1 100644 --- a/ipv4/zsys_linux_mipsle.go +++ b/ipv4/zsys_linux_mipsle.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -133,16 +128,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_ppc.go b/ipv4/zsys_linux_ppc.go index fa1b6bc6..3c5ea547 100644 --- a/ipv4/zsys_linux_ppc.go +++ b/ipv4/zsys_linux_ppc.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -133,16 +128,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_ppc64.go b/ipv4/zsys_linux_ppc64.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_ppc64.go +++ b/ipv4/zsys_linux_ppc64.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_ppc64le.go b/ipv4/zsys_linux_ppc64le.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_ppc64le.go +++ b/ipv4/zsys_linux_ppc64le.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_riscv64.go b/ipv4/zsys_linux_riscv64.go index 0c0d4801..e626134a 100644 --- a/ipv4/zsys_linux_riscv64.go +++ b/ipv4/zsys_linux_riscv64.go @@ -57,9 +57,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -72,8 +69,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -137,15 +132,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv4/zsys_linux_s390x.go b/ipv4/zsys_linux_s390x.go index ee8204da..a04e7851 100644 --- a/ipv4/zsys_linux_s390x.go +++ b/ipv4/zsys_linux_s390x.go @@ -55,9 +55,6 @@ const ( sysSO_EE_ORIGIN_TXSTATUS = 0x4 sysSO_EE_ORIGIN_TIMESTAMPING = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet = 0x10 sizeofInetPktinfo = 0xc @@ -70,8 +67,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPFilter = 0x4 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -135,16 +130,3 @@ type groupSourceReq struct { type icmpFilter struct { Data uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/defs_linux.go b/ipv6/defs_linux.go index 3308cb2c..3b697bee 100644 --- a/ipv6/defs_linux.go +++ b/ipv6/defs_linux.go @@ -106,9 +106,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = C.ICMPV6_FILTER_BLOCKOTHERS sysICMPV6_FILTER_PASSONLY = C.ICMPV6_FILTER_PASSONLY - sysSOL_SOCKET = C.SOL_SOCKET - sysSO_ATTACH_FILTER = C.SO_ATTACH_FILTER - sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 sizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo @@ -120,8 +117,6 @@ const ( sizeofGroupSourceReq = C.sizeof_struct_group_source_req sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter - - sizeofSockFprog = C.sizeof_struct_sock_fprog ) type kernelSockaddrStorage C.struct___kernel_sockaddr_storage @@ -141,7 +136,3 @@ type groupReq C.struct_group_req type groupSourceReq C.struct_group_source_req type icmpv6Filter C.struct_icmp6_filter - -type sockFProg C.struct_sock_fprog - -type sockFilter C.struct_sock_filter diff --git a/ipv6/sys_bpf.go b/ipv6/sys_bpf.go index b2dbcb2f..90ef4dfa 100644 --- a/ipv6/sys_bpf.go +++ b/ipv6/sys_bpf.go @@ -11,13 +11,14 @@ import ( "golang.org/x/net/bpf" "golang.org/x/net/internal/socket" + "golang.org/x/sys/unix" ) func (so *sockOpt) setAttachFilter(c *socket.Conn, f []bpf.RawInstruction) error { - prog := sockFProg{ + prog := unix.SockFprog{ Len: uint16(len(f)), - Filter: (*sockFilter)(unsafe.Pointer(&f[0])), + Filter: (*unix.SockFilter)(unsafe.Pointer(&f[0])), } - b := (*[sizeofSockFprog]byte)(unsafe.Pointer(&prog))[:sizeofSockFprog] + b := (*[unix.SizeofSockFprog]byte)(unsafe.Pointer(&prog))[:unix.SizeofSockFprog] return so.Set(c, b) } diff --git a/ipv6/sys_linux.go b/ipv6/sys_linux.go index bc218103..96e8093a 100644 --- a/ipv6/sys_linux.go +++ b/ipv6/sys_linux.go @@ -11,6 +11,7 @@ import ( "golang.org/x/net/internal/iana" "golang.org/x/net/internal/socket" + "golang.org/x/sys/unix" ) var ( @@ -40,7 +41,7 @@ var ( ssoLeaveSourceGroup: {Option: socket.Option{Level: iana.ProtocolIPv6, Name: sysMCAST_LEAVE_SOURCE_GROUP, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, ssoBlockSourceGroup: {Option: socket.Option{Level: iana.ProtocolIPv6, Name: sysMCAST_BLOCK_SOURCE, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, ssoUnblockSourceGroup: {Option: socket.Option{Level: iana.ProtocolIPv6, Name: sysMCAST_UNBLOCK_SOURCE, Len: sizeofGroupSourceReq}, typ: ssoTypeGroupSourceReq}, - ssoAttachFilter: {Option: socket.Option{Level: sysSOL_SOCKET, Name: sysSO_ATTACH_FILTER, Len: sizeofSockFprog}}, + ssoAttachFilter: {Option: socket.Option{Level: unix.SOL_SOCKET, Name: unix.SO_ATTACH_FILTER, Len: unix.SizeofSockFprog}}, } ) diff --git a/ipv6/zsys_linux_386.go b/ipv6/zsys_linux_386.go index 14155dec..bde4a8f8 100644 --- a/ipv6/zsys_linux_386.go +++ b/ipv6/zsys_linux_386.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -155,16 +150,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_amd64.go b/ipv6/zsys_linux_amd64.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_amd64.go +++ b/ipv6/zsys_linux_amd64.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_arm.go b/ipv6/zsys_linux_arm.go index 14155dec..bde4a8f8 100644 --- a/ipv6/zsys_linux_arm.go +++ b/ipv6/zsys_linux_arm.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -155,16 +150,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_arm64.go b/ipv6/zsys_linux_arm64.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_arm64.go +++ b/ipv6/zsys_linux_arm64.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_mips.go b/ipv6/zsys_linux_mips.go index 14155dec..bde4a8f8 100644 --- a/ipv6/zsys_linux_mips.go +++ b/ipv6/zsys_linux_mips.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -155,16 +150,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_mips64.go b/ipv6/zsys_linux_mips64.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_mips64.go +++ b/ipv6/zsys_linux_mips64.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_mips64le.go b/ipv6/zsys_linux_mips64le.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_mips64le.go +++ b/ipv6/zsys_linux_mips64le.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_mipsle.go b/ipv6/zsys_linux_mipsle.go index 14155dec..bde4a8f8 100644 --- a/ipv6/zsys_linux_mipsle.go +++ b/ipv6/zsys_linux_mipsle.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -155,16 +150,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_ppc.go b/ipv6/zsys_linux_ppc.go index a51e142b..66fd2361 100644 --- a/ipv6/zsys_linux_ppc.go +++ b/ipv6/zsys_linux_ppc.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x104 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x8 ) type kernelSockaddrStorage struct { @@ -155,16 +150,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [2]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_ppc64.go b/ipv6/zsys_linux_ppc64.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_ppc64.go +++ b/ipv6/zsys_linux_ppc64.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_ppc64le.go b/ipv6/zsys_linux_ppc64le.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_ppc64le.go +++ b/ipv6/zsys_linux_ppc64le.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_riscv64.go b/ipv6/zsys_linux_riscv64.go index 1ee237b2..6083ddce 100644 --- a/ipv6/zsys_linux_riscv64.go +++ b/ipv6/zsys_linux_riscv64.go @@ -86,9 +86,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -100,8 +97,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -159,15 +154,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -} diff --git a/ipv6/zsys_linux_s390x.go b/ipv6/zsys_linux_s390x.go index 9566d764..992ac9ec 100644 --- a/ipv6/zsys_linux_s390x.go +++ b/ipv6/zsys_linux_s390x.go @@ -84,9 +84,6 @@ const ( sysICMPV6_FILTER_BLOCKOTHERS = 0x3 sysICMPV6_FILTER_PASSONLY = 0x4 - sysSOL_SOCKET = 0x1 - sysSO_ATTACH_FILTER = 0x1a - sizeofKernelSockaddrStorage = 0x80 sizeofSockaddrInet6 = 0x1c sizeofInet6Pktinfo = 0x14 @@ -98,8 +95,6 @@ const ( sizeofGroupSourceReq = 0x108 sizeofICMPv6Filter = 0x20 - - sizeofSockFprog = 0x10 ) type kernelSockaddrStorage struct { @@ -157,16 +152,3 @@ type groupSourceReq struct { type icmpv6Filter struct { Data [8]uint32 } - -type sockFProg struct { - Len uint16 - Pad_cgo_0 [6]byte - Filter *sockFilter -} - -type sockFilter struct { - Code uint16 - Jt uint8 - Jf uint8 - K uint32 -}