Attachment 1147705 Details for Bug 1326890 – add s390x support

[patch] add s390x support

file_1326890.txt (text/plain), 9.08 KB, created by Dan Horák on 2016-04-15 16:06:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Horák

Created: 2016-04-15 16:06:39 UTC

Size: 9.08 KB

patch

obsolete

>From 237288c542f1b499d51b37e09b295945bec1a942 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
>Date: Fri, 15 Apr 2016 11:30:00 -0400
>Subject: [PATCH] add linux/s390x support
>
>---
> ipv4/gen.go              |   2 +-
> ipv4/zsys_linux_s390x.go | 134 ++++++++++++++++++++++++++++++++++++++++
> ipv6/gen.go              |   2 +-
> ipv6/zsys_linux_s390x.go | 156 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 292 insertions(+), 2 deletions(-)
> create mode 100644 ipv4/zsys_linux_s390x.go
> create mode 100644 ipv6/zsys_linux_s390x.go
>
>diff --git a/ipv4/gen.go b/ipv4/gen.go
>index 0bc7c15..fb72cdc 100644
>--- a/ipv4/gen.go
>+++ b/ipv4/gen.go
>@@ -58,7 +58,7 @@ func genzsys() error {
> 	switch {
> 	case runtime.GOOS == "dragonfly" || runtime.GOOS == "solaris":
> 		b = bytes.Replace(b, []byte("package ipv4\n"), []byte("// +build "+runtime.GOOS+"\n\npackage ipv4\n"), 1)
>-	case runtime.GOOS == "linux" && (runtime.GOARCH == "arm64" || runtime.GOARCH == "mips64" || runtime.GOARCH == "mips64le" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le"):
>+	case runtime.GOOS == "linux" && (runtime.GOARCH == "arm64" || runtime.GOARCH == "mips64" || runtime.GOARCH == "mips64le" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le" || runtime.GOARCH == "s390x"):
> 		b = bytes.Replace(b, []byte("package ipv4\n"), []byte("// +build "+runtime.GOOS+","+runtime.GOARCH+"\n\npackage ipv4\n"), 1)
> 	}
> 	b, err = format.Source(b)
>diff --git a/ipv4/zsys_linux_s390x.go b/ipv4/zsys_linux_s390x.go
>new file mode 100644
>index 0000000..79a2740
>--- /dev/null
>+++ b/ipv4/zsys_linux_s390x.go
>@@ -0,0 +1,134 @@
>+// Created by cgo -godefs - DO NOT EDIT
>+// cgo -godefs defs_linux.go
>+
>+// +build linux,s390x
>+
>+package ipv4
>+
>+const (
>+	sysIP_TOS		= 0x1
>+	sysIP_TTL		= 0x2
>+	sysIP_HDRINCL		= 0x3
>+	sysIP_OPTIONS		= 0x4
>+	sysIP_ROUTER_ALERT	= 0x5
>+	sysIP_RECVOPTS		= 0x6
>+	sysIP_RETOPTS		= 0x7
>+	sysIP_PKTINFO		= 0x8
>+	sysIP_PKTOPTIONS	= 0x9
>+	sysIP_MTU_DISCOVER	= 0xa
>+	sysIP_RECVERR		= 0xb
>+	sysIP_RECVTTL		= 0xc
>+	sysIP_RECVTOS		= 0xd
>+	sysIP_MTU		= 0xe
>+	sysIP_FREEBIND		= 0xf
>+	sysIP_TRANSPARENT	= 0x13
>+	sysIP_RECVRETOPTS	= 0x7
>+	sysIP_ORIGDSTADDR	= 0x14
>+	sysIP_RECVORIGDSTADDR	= 0x14
>+	sysIP_MINTTL		= 0x15
>+	sysIP_NODEFRAG		= 0x16
>+	sysIP_UNICAST_IF	= 0x32
>+
>+	sysIP_MULTICAST_IF		= 0x20
>+	sysIP_MULTICAST_TTL		= 0x21
>+	sysIP_MULTICAST_LOOP		= 0x22
>+	sysIP_ADD_MEMBERSHIP		= 0x23
>+	sysIP_DROP_MEMBERSHIP		= 0x24
>+	sysIP_UNBLOCK_SOURCE		= 0x25
>+	sysIP_BLOCK_SOURCE		= 0x26
>+	sysIP_ADD_SOURCE_MEMBERSHIP	= 0x27
>+	sysIP_DROP_SOURCE_MEMBERSHIP	= 0x28
>+	sysIP_MSFILTER			= 0x29
>+	sysMCAST_JOIN_GROUP		= 0x2a
>+	sysMCAST_LEAVE_GROUP		= 0x2d
>+	sysMCAST_JOIN_SOURCE_GROUP	= 0x2e
>+	sysMCAST_LEAVE_SOURCE_GROUP	= 0x2f
>+	sysMCAST_BLOCK_SOURCE		= 0x2b
>+	sysMCAST_UNBLOCK_SOURCE		= 0x2c
>+	sysMCAST_MSFILTER		= 0x30
>+	sysIP_MULTICAST_ALL		= 0x31
>+
>+	sysICMP_FILTER	= 0x1
>+
>+	sysSO_EE_ORIGIN_NONE		= 0x0
>+	sysSO_EE_ORIGIN_LOCAL		= 0x1
>+	sysSO_EE_ORIGIN_ICMP		= 0x2
>+	sysSO_EE_ORIGIN_ICMP6		= 0x3
>+	sysSO_EE_ORIGIN_TXSTATUS	= 0x4
>+	sysSO_EE_ORIGIN_TIMESTAMPING	= 0x4
>+
>+	sysSizeofKernelSockaddrStorage	= 0x80
>+	sysSizeofSockaddrInet		= 0x10
>+	sysSizeofInetPktinfo		= 0xc
>+	sysSizeofSockExtendedErr	= 0x10
>+
>+	sysSizeofIPMreq		= 0x8
>+	sysSizeofIPMreqn	= 0xc
>+	sysSizeofIPMreqSource	= 0xc
>+	sysSizeofGroupReq	= 0x88
>+	sysSizeofGroupSourceReq	= 0x108
>+
>+	sysSizeofICMPFilter	= 0x4
>+)
>+
>+type sysKernelSockaddrStorage struct {
>+	Family	uint16
>+	X__data	[126]uint8
>+}
>+
>+type sysSockaddrInet struct {
>+	Family	uint16
>+	Port	uint16
>+	Addr	[4]byte /* in_addr */
>+	X__pad	[8]uint8
>+}
>+
>+type sysInetPktinfo struct {
>+	Ifindex		int32
>+	Spec_dst	[4]byte /* in_addr */
>+	Addr		[4]byte /* in_addr */
>+}
>+
>+type sysSockExtendedErr struct {
>+	Errno	uint32
>+	Origin	uint8
>+	Type	uint8
>+	Code	uint8
>+	Pad	uint8
>+	Info	uint32
>+	Data	uint32
>+}
>+
>+type sysIPMreq struct {
>+	Multiaddr	[4]byte /* in_addr */
>+	Interface	[4]byte /* in_addr */
>+}
>+
>+type sysIPMreqn struct {
>+	Multiaddr	[4]byte /* in_addr */
>+	Address		[4]byte /* in_addr */
>+	Ifindex		int32
>+}
>+
>+type sysIPMreqSource struct {
>+	Multiaddr	uint32
>+	Interface	uint32
>+	Sourceaddr	uint32
>+}
>+
>+type sysGroupReq struct {
>+	Interface	uint32
>+	Pad_cgo_0	[4]byte
>+	Group		sysKernelSockaddrStorage
>+}
>+
>+type sysGroupSourceReq struct {
>+	Interface	uint32
>+	Pad_cgo_0	[4]byte
>+	Group		sysKernelSockaddrStorage
>+	Source		sysKernelSockaddrStorage
>+}
>+
>+type sysICMPFilter struct {
>+	Data uint32
>+}
>diff --git a/ipv6/gen.go b/ipv6/gen.go
>index 3924b47..4e7ca78 100644
>--- a/ipv6/gen.go
>+++ b/ipv6/gen.go
>@@ -58,7 +58,7 @@ func genzsys() error {
> 	switch {
> 	case runtime.GOOS == "dragonfly" || runtime.GOOS == "solaris":
> 		b = bytes.Replace(b, []byte("package ipv6\n"), []byte("// +build "+runtime.GOOS+"\n\npackage ipv6\n"), 1)
>-	case runtime.GOOS == "linux" && (runtime.GOARCH == "arm64" || runtime.GOARCH == "mips64" || runtime.GOARCH == "mips64le" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le"):
>+	case runtime.GOOS == "linux" && (runtime.GOARCH == "arm64" || runtime.GOARCH == "mips64" || runtime.GOARCH == "mips64le" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le" || runtime.GOARCH == "s390x"):
> 		b = bytes.Replace(b, []byte("package ipv6\n"), []byte("// +build "+runtime.GOOS+","+runtime.GOARCH+"\n\npackage ipv6\n"), 1)
> 	}
> 	b, err = format.Source(b)
>diff --git a/ipv6/zsys_linux_s390x.go b/ipv6/zsys_linux_s390x.go
>new file mode 100644
>index 0000000..e80e278
>--- /dev/null
>+++ b/ipv6/zsys_linux_s390x.go
>@@ -0,0 +1,156 @@
>+// Created by cgo -godefs - DO NOT EDIT
>+// cgo -godefs defs_linux.go
>+
>+// +build linux,s390x
>+
>+package ipv6
>+
>+const (
>+	sysIPV6_ADDRFORM	= 0x1
>+	sysIPV6_2292PKTINFO	= 0x2
>+	sysIPV6_2292HOPOPTS	= 0x3
>+	sysIPV6_2292DSTOPTS	= 0x4
>+	sysIPV6_2292RTHDR	= 0x5
>+	sysIPV6_2292PKTOPTIONS	= 0x6
>+	sysIPV6_CHECKSUM	= 0x7
>+	sysIPV6_2292HOPLIMIT	= 0x8
>+	sysIPV6_NEXTHOP		= 0x9
>+	sysIPV6_FLOWINFO	= 0xb
>+
>+	sysIPV6_UNICAST_HOPS		= 0x10
>+	sysIPV6_MULTICAST_IF		= 0x11
>+	sysIPV6_MULTICAST_HOPS		= 0x12
>+	sysIPV6_MULTICAST_LOOP		= 0x13
>+	sysIPV6_ADD_MEMBERSHIP		= 0x14
>+	sysIPV6_DROP_MEMBERSHIP		= 0x15
>+	sysMCAST_JOIN_GROUP		= 0x2a
>+	sysMCAST_LEAVE_GROUP		= 0x2d
>+	sysMCAST_JOIN_SOURCE_GROUP	= 0x2e
>+	sysMCAST_LEAVE_SOURCE_GROUP	= 0x2f
>+	sysMCAST_BLOCK_SOURCE		= 0x2b
>+	sysMCAST_UNBLOCK_SOURCE		= 0x2c
>+	sysMCAST_MSFILTER		= 0x30
>+	sysIPV6_ROUTER_ALERT		= 0x16
>+	sysIPV6_MTU_DISCOVER		= 0x17
>+	sysIPV6_MTU			= 0x18
>+	sysIPV6_RECVERR			= 0x19
>+	sysIPV6_V6ONLY			= 0x1a
>+	sysIPV6_JOIN_ANYCAST		= 0x1b
>+	sysIPV6_LEAVE_ANYCAST		= 0x1c
>+
>+	sysIPV6_FLOWLABEL_MGR	= 0x20
>+	sysIPV6_FLOWINFO_SEND	= 0x21
>+
>+	sysIPV6_IPSEC_POLICY	= 0x22
>+	sysIPV6_XFRM_POLICY	= 0x23
>+
>+	sysIPV6_RECVPKTINFO	= 0x31
>+	sysIPV6_PKTINFO		= 0x32
>+	sysIPV6_RECVHOPLIMIT	= 0x33
>+	sysIPV6_HOPLIMIT	= 0x34
>+	sysIPV6_RECVHOPOPTS	= 0x35
>+	sysIPV6_HOPOPTS		= 0x36
>+	sysIPV6_RTHDRDSTOPTS	= 0x37
>+	sysIPV6_RECVRTHDR	= 0x38
>+	sysIPV6_RTHDR		= 0x39
>+	sysIPV6_RECVDSTOPTS	= 0x3a
>+	sysIPV6_DSTOPTS		= 0x3b
>+	sysIPV6_RECVPATHMTU	= 0x3c
>+	sysIPV6_PATHMTU		= 0x3d
>+	sysIPV6_DONTFRAG	= 0x3e
>+
>+	sysIPV6_RECVTCLASS	= 0x42
>+	sysIPV6_TCLASS		= 0x43
>+
>+	sysIPV6_ADDR_PREFERENCES	= 0x48
>+
>+	sysIPV6_PREFER_SRC_TMP			= 0x1
>+	sysIPV6_PREFER_SRC_PUBLIC		= 0x2
>+	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT	= 0x100
>+	sysIPV6_PREFER_SRC_COA			= 0x4
>+	sysIPV6_PREFER_SRC_HOME			= 0x400
>+	sysIPV6_PREFER_SRC_CGA			= 0x8
>+	sysIPV6_PREFER_SRC_NONCGA		= 0x800
>+
>+	sysIPV6_MINHOPCOUNT	= 0x49
>+
>+	sysIPV6_ORIGDSTADDR	= 0x4a
>+	sysIPV6_RECVORIGDSTADDR	= 0x4a
>+	sysIPV6_TRANSPARENT	= 0x4b
>+	sysIPV6_UNICAST_IF	= 0x4c
>+
>+	sysICMPV6_FILTER	= 0x1
>+
>+	sysICMPV6_FILTER_BLOCK		= 0x1
>+	sysICMPV6_FILTER_PASS		= 0x2
>+	sysICMPV6_FILTER_BLOCKOTHERS	= 0x3
>+	sysICMPV6_FILTER_PASSONLY	= 0x4
>+
>+	sysSizeofKernelSockaddrStorage	= 0x80
>+	sysSizeofSockaddrInet6		= 0x1c
>+	sysSizeofInet6Pktinfo		= 0x14
>+	sysSizeofIPv6Mtuinfo		= 0x20
>+	sysSizeofIPv6FlowlabelReq	= 0x20
>+
>+	sysSizeofIPv6Mreq	= 0x14
>+	sysSizeofGroupReq	= 0x88
>+	sysSizeofGroupSourceReq	= 0x108
>+
>+	sysSizeofICMPv6Filter	= 0x20
>+)
>+
>+type sysKernelSockaddrStorage struct {
>+	Family	uint16
>+	X__data	[126]uint8
>+}
>+
>+type sysSockaddrInet6 struct {
>+	Family		uint16
>+	Port		uint16
>+	Flowinfo	uint32
>+	Addr		[16]byte /* in6_addr */
>+	Scope_id	uint32
>+}
>+
>+type sysInet6Pktinfo struct {
>+	Addr	[16]byte /* in6_addr */
>+	Ifindex	int32
>+}
>+
>+type sysIPv6Mtuinfo struct {
>+	Addr	sysSockaddrInet6
>+	Mtu	uint32
>+}
>+
>+type sysIPv6FlowlabelReq struct {
>+	Dst		[16]byte /* in6_addr */
>+	Label		uint32
>+	Action		uint8
>+	Share		uint8
>+	Flags		uint16
>+	Expires		uint16
>+	Linger		uint16
>+	X__flr_pad	uint32
>+}
>+
>+type sysIPv6Mreq struct {
>+	Multiaddr	[16]byte /* in6_addr */
>+	Ifindex		int32
>+}
>+
>+type sysGroupReq struct {
>+	Interface	uint32
>+	Pad_cgo_0	[4]byte
>+	Group		sysKernelSockaddrStorage
>+}
>+
>+type sysGroupSourceReq struct {
>+	Interface	uint32
>+	Pad_cgo_0	[4]byte
>+	Group		sysKernelSockaddrStorage
>+	Source		sysKernelSockaddrStorage
>+}
>+
>+type sysICMPv6Filter struct {
>+	Data [8]uint32
>+}
>-- 
>2.7.3
>

Actions: View | Diff

Attachments on bug 1326890: 1146911 | 1147705