View | Details | Raw Unified | Return to bug 247047
Collapse All | Expand All

(-)net/cloudflared/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go (+96 lines)
Line 0 Link Here
1 
--- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:45 UTC
2 
+++ vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go
3 
@@ -0,0 +1,93 @@
4 
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
5 
+// cgo -godefs defs_freebsd.go
6 
+
7 
+package ipv4
8 
+
9 
+const (
10 
+	sysIP_OPTIONS     = 0x1
11 
+	sysIP_HDRINCL     = 0x2
12 
+	sysIP_TOS         = 0x3
13 
+	sysIP_TTL         = 0x4
14 
+	sysIP_RECVOPTS    = 0x5
15 
+	sysIP_RECVRETOPTS = 0x6
16 
+	sysIP_RECVDSTADDR = 0x7
17 
+	sysIP_SENDSRCADDR = 0x7
18 
+	sysIP_RETOPTS     = 0x8
19 
+	sysIP_RECVIF      = 0x14
20 
+	sysIP_ONESBCAST   = 0x17
21 
+	sysIP_BINDANY     = 0x18
22 
+	sysIP_RECVTTL     = 0x41
23 
+	sysIP_MINTTL      = 0x42
24 
+	sysIP_DONTFRAG    = 0x43
25 
+	sysIP_RECVTOS     = 0x44
26 
+
27 
+	sysIP_MULTICAST_IF           = 0x9
28 
+	sysIP_MULTICAST_TTL          = 0xa
29 
+	sysIP_MULTICAST_LOOP         = 0xb
30 
+	sysIP_ADD_MEMBERSHIP         = 0xc
31 
+	sysIP_DROP_MEMBERSHIP        = 0xd
32 
+	sysIP_MULTICAST_VIF          = 0xe
33 
+	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
34 
+	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
35 
+	sysIP_BLOCK_SOURCE           = 0x48
36 
+	sysIP_UNBLOCK_SOURCE         = 0x49
37 
+	sysMCAST_JOIN_GROUP          = 0x50
38 
+	sysMCAST_LEAVE_GROUP         = 0x51
39 
+	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
40 
+	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
41 
+	sysMCAST_BLOCK_SOURCE        = 0x54
42 
+	sysMCAST_UNBLOCK_SOURCE      = 0x55
43 
+
44 
+	sizeofSockaddrStorage = 0x80
45 
+	sizeofSockaddrInet    = 0x10
46 
+
47 
+	sizeofIPMreq         = 0x8
48 
+	sizeofIPMreqn        = 0xc
49 
+	sizeofIPMreqSource   = 0xc
50 
+	sizeofGroupReq       = 0x88
51 
+	sizeofGroupSourceReq = 0x108
52 
+)
53 
+
54 
+type sockaddrStorage struct {
55 
+	Len         uint8
56 
+	Family      uint8
57 
+	X__ss_pad1  [6]uint8
58 
+	X__ss_align int64
59 
+	X__ss_pad2  [112]uint8
60 
+}
61 
+
62 
+type sockaddrInet struct {
63 
+	Len    uint8
64 
+	Family uint8
65 
+	Port   uint16
66 
+	Addr   [4]byte /* in_addr */
67 
+	Zero   [8]uint8
68 
+}
69 
+
70 
+type ipMreq struct {
71 
+	Multiaddr [4]byte /* in_addr */
72 
+	Interface [4]byte /* in_addr */
73 
+}
74 
+
75 
+type ipMreqn struct {
76 
+	Multiaddr [4]byte /* in_addr */
77 
+	Address   [4]byte /* in_addr */
78 
+	Ifindex   int32
79 
+}
80 
+
81 
+type ipMreqSource struct {
82 
+	Multiaddr  [4]byte /* in_addr */
83 
+	Sourceaddr [4]byte /* in_addr */
84 
+	Interface  [4]byte /* in_addr */
85 
+}
86 
+
87 
+type groupReq struct {
88 
+	Interface uint32
89 
+	Group     sockaddrStorage
90 
+}
91 
+
92 
+type groupSourceReq struct {
93 
+	Interface uint32
94 
+	Group     sockaddrStorage
95 
+	Source    sockaddrStorage
96 
+}
(-)net/cloudflared/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go (+125 lines)
Line 0 Link Here
1 
--- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:37 UTC
2 
+++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go
3 
@@ -0,0 +1,122 @@
4 
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
5 
+// cgo -godefs defs_freebsd.go
6 
+
7 
+package ipv6
8 
+
9 
+const (
10 
+	sysIPV6_UNICAST_HOPS   = 0x4
11 
+	sysIPV6_MULTICAST_IF   = 0x9
12 
+	sysIPV6_MULTICAST_HOPS = 0xa
13 
+	sysIPV6_MULTICAST_LOOP = 0xb
14 
+	sysIPV6_JOIN_GROUP     = 0xc
15 
+	sysIPV6_LEAVE_GROUP    = 0xd
16 
+	sysIPV6_PORTRANGE      = 0xe
17 
+	sysICMP6_FILTER        = 0x12
18 
+
19 
+	sysIPV6_CHECKSUM = 0x1a
20 
+	sysIPV6_V6ONLY   = 0x1b
21 
+
22 
+	sysIPV6_IPSEC_POLICY = 0x1c
23 
+
24 
+	sysIPV6_RTHDRDSTOPTS = 0x23
25 
+
26 
+	sysIPV6_RECVPKTINFO  = 0x24
27 
+	sysIPV6_RECVHOPLIMIT = 0x25
28 
+	sysIPV6_RECVRTHDR    = 0x26
29 
+	sysIPV6_RECVHOPOPTS  = 0x27
30 
+	sysIPV6_RECVDSTOPTS  = 0x28
31 
+
32 
+	sysIPV6_USE_MIN_MTU = 0x2a
33 
+	sysIPV6_RECVPATHMTU = 0x2b
34 
+
35 
+	sysIPV6_PATHMTU = 0x2c
36 
+
37 
+	sysIPV6_PKTINFO  = 0x2e
38 
+	sysIPV6_HOPLIMIT = 0x2f
39 
+	sysIPV6_NEXTHOP  = 0x30
40 
+	sysIPV6_HOPOPTS  = 0x31
41 
+	sysIPV6_DSTOPTS  = 0x32
42 
+	sysIPV6_RTHDR    = 0x33
43 
+
44 
+	sysIPV6_RECVTCLASS = 0x39
45 
+
46 
+	sysIPV6_AUTOFLOWLABEL = 0x3b
47 
+
48 
+	sysIPV6_TCLASS   = 0x3d
49 
+	sysIPV6_DONTFRAG = 0x3e
50 
+
51 
+	sysIPV6_PREFER_TEMPADDR = 0x3f
52 
+
53 
+	sysIPV6_BINDANY = 0x40
54 
+
55 
+	sysIPV6_MSFILTER = 0x4a
56 
+
57 
+	sysMCAST_JOIN_GROUP         = 0x50
58 
+	sysMCAST_LEAVE_GROUP        = 0x51
59 
+	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
60 
+	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
61 
+	sysMCAST_BLOCK_SOURCE       = 0x54
62 
+	sysMCAST_UNBLOCK_SOURCE     = 0x55
63 
+
64 
+	sysIPV6_PORTRANGE_DEFAULT = 0x0
65 
+	sysIPV6_PORTRANGE_HIGH    = 0x1
66 
+	sysIPV6_PORTRANGE_LOW     = 0x2
67 
+
68 
+	sizeofSockaddrStorage = 0x80
69 
+	sizeofSockaddrInet6   = 0x1c
70 
+	sizeofInet6Pktinfo    = 0x14
71 
+	sizeofIPv6Mtuinfo     = 0x20
72 
+
73 
+	sizeofIPv6Mreq       = 0x14
74 
+	sizeofGroupReq       = 0x88
75 
+	sizeofGroupSourceReq = 0x108
76 
+
77 
+	sizeofICMPv6Filter = 0x20
78 
+)
79 
+
80 
+type sockaddrStorage struct {
81 
+	Len         uint8
82 
+	Family      uint8
83 
+	X__ss_pad1  [6]uint8
84 
+	X__ss_align int64
85 
+	X__ss_pad2  [112]uint8
86 
+}
87 
+
88 
+type sockaddrInet6 struct {
89 
+	Len      uint8
90 
+	Family   uint8
91 
+	Port     uint16
92 
+	Flowinfo uint32
93 
+	Addr     [16]byte /* in6_addr */
94 
+	Scope_id uint32
95 
+}
96 
+
97 
+type inet6Pktinfo struct {
98 
+	Addr    [16]byte /* in6_addr */
99 
+	Ifindex uint32
100 
+}
101 
+
102 
+type ipv6Mtuinfo struct {
103 
+	Addr sockaddrInet6
104 
+	Mtu  uint32
105 
+}
106 
+
107 
+type ipv6Mreq struct {
108 
+	Multiaddr [16]byte /* in6_addr */
109 
+	Interface uint32
110 
+}
111 
+
112 
+type groupReq struct {
113 
+	Interface uint32
114 
+	Group     sockaddrStorage
115 
+}
116 
+
117 
+type groupSourceReq struct {
118 
+	Interface uint32
119 
+	Group     sockaddrStorage
120 
+	Source    sockaddrStorage
121 
+}
122 
+
123 
+type icmpv6Filter struct {
124 
+	Filt [8]uint32
125 
+}
(-)net/cloudflared/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go (+24 lines)
Line 0 Link Here
1 
From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001
2 
From: Tobias Klauser <tklauser@distanz.ch>
3 
Date: Fri, 25 Oct 2019 21:13:51 +0200
4 
Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64
5 

            

            

              6
              
CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a

            

            

              7
              
type uint128. This type doesn't exist in Go.

            

            

              8
              

            

            

              9
              
Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b

            

            

              10
              
Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419

            

            

              11
              
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>

            

            

              12
              
TryBot-Result: Gobot Gobot <gobot@golang.org>

            

            

              13
              
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

            

            

              14
              
--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2019-08-18 13:42:05 UTC

            

            

              15
              
+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go

            

            

              16
              
@@ -397,7 +397,7 @@ type Reg struct {

            

            

              17
              
 }

            

            

              18
              
 

            

            

              19
              
 type FpReg struct {

            

            

              20
              
-	Fp_q  [32]uint128

            

            

              21
              
+	Fp_q  [512]uint8

            

            

              22
              
 	Fp_sr uint32

            

            

              23
              
 	Fp_cr uint32

            

            

              24
              
 }

            






  

  Return to bug 247047