Skip to content

Commit a33c5aa

Browse files
ianlancetaylorgopherbot
ianlancetaylor
authored and
gopherbot
committed
route: import syscall rather than golang.org/x/sys/unix
It happens that everything we need is already defined in syscall. This avoids problems when this package is vendored into the standard library. For golang/go#54259 Change-Id: I86bfe44f20c9db2ecfdb8dbb2ef798391da2bfa6 Reviewed-on: https://go-review.googlesource.com/c/net/+/421425 TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 7431dee commit a33c5aa

18 files changed

+170
-189
lines changed

Diff for: ‎route/address.go

+17-18
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ package route
99

1010
import (
1111
"runtime"
12-
13-
"golang.org/x/sys/unix"
12+
"syscall"
1413
)
1514

1615
// An Addr represents an address associated with packet routing.
@@ -27,7 +26,7 @@ type LinkAddr struct {
2726
}
2827

2928
// Family implements the Family method of Addr interface.
30-
func (a *LinkAddr) Family() int { return unix.AF_LINK }
29+
func (a *LinkAddr) Family() int { return syscall.AF_LINK }
3130

3231
func (a *LinkAddr) lenAndSpace() (int, int) {
3332
l := 8 + len(a.Name) + len(a.Addr)
@@ -44,7 +43,7 @@ func (a *LinkAddr) marshal(b []byte) (int, error) {
4443
return 0, errInvalidAddr
4544
}
4645
b[0] = byte(l)
47-
b[1] = unix.AF_LINK
46+
b[1] = syscall.AF_LINK
4847
if a.Index > 0 {
4948
nativeEndian.PutUint16(b[2:4], uint16(a.Index))
5049
}
@@ -66,7 +65,7 @@ func parseLinkAddr(b []byte) (Addr, error) {
6665
if len(b) < 8 {
6766
return nil, errInvalidAddr
6867
}
69-
_, a, err := parseKernelLinkAddr(unix.AF_LINK, b[4:])
68+
_, a, err := parseKernelLinkAddr(syscall.AF_LINK, b[4:])
7069
if err != nil {
7170
return nil, err
7271
}
@@ -126,7 +125,7 @@ type Inet4Addr struct {
126125
}
127126

128127
// Family implements the Family method of Addr interface.
129-
func (a *Inet4Addr) Family() int { return unix.AF_INET }
128+
func (a *Inet4Addr) Family() int { return syscall.AF_INET }
130129

131130
func (a *Inet4Addr) lenAndSpace() (int, int) {
132131
return sizeofSockaddrInet, roundup(sizeofSockaddrInet)
@@ -138,7 +137,7 @@ func (a *Inet4Addr) marshal(b []byte) (int, error) {
138137
return 0, errShortBuffer
139138
}
140139
b[0] = byte(l)
141-
b[1] = unix.AF_INET
140+
b[1] = syscall.AF_INET
142141
copy(b[4:8], a.IP[:])
143142
return ll, nil
144143
}
@@ -150,7 +149,7 @@ type Inet6Addr struct {
150149
}
151150

152151
// Family implements the Family method of Addr interface.
153-
func (a *Inet6Addr) Family() int { return unix.AF_INET6 }
152+
func (a *Inet6Addr) Family() int { return syscall.AF_INET6 }
154153

155154
func (a *Inet6Addr) lenAndSpace() (int, int) {
156155
return sizeofSockaddrInet6, roundup(sizeofSockaddrInet6)
@@ -162,7 +161,7 @@ func (a *Inet6Addr) marshal(b []byte) (int, error) {
162161
return 0, errShortBuffer
163162
}
164163
b[0] = byte(l)
165-
b[1] = unix.AF_INET6
164+
b[1] = syscall.AF_INET6
166165
copy(b[8:24], a.IP[:])
167166
if a.ZoneID > 0 {
168167
nativeEndian.PutUint32(b[24:28], uint32(a.ZoneID))
@@ -173,14 +172,14 @@ func (a *Inet6Addr) marshal(b []byte) (int, error) {
173172
// parseInetAddr parses b as an internet address for IPv4 or IPv6.
174173
func parseInetAddr(af int, b []byte) (Addr, error) {
175174
switch af {
176-
case unix.AF_INET:
175+
case syscall.AF_INET:
177176
if len(b) < sizeofSockaddrInet {
178177
return nil, errInvalidAddr
179178
}
180179
a := &Inet4Addr{}
181180
copy(a.IP[:], b[4:8])
182181
return a, nil
183-
case unix.AF_INET6:
182+
case syscall.AF_INET6:
184183
if len(b) < sizeofSockaddrInet6 {
185184
return nil, errInvalidAddr
186185
}
@@ -249,7 +248,7 @@ func parseKernelInetAddr(af int, b []byte) (int, Addr, error) {
249248
a := &Inet6Addr{}
250249
copy(a.IP[:], b[off6:off6+16])
251250
return int(b[0]), a, nil
252-
case af == unix.AF_INET6:
251+
case af == syscall.AF_INET6:
253252
a := &Inet6Addr{}
254253
if l-1 < off6 {
255254
copy(a.IP[:], b[1:l])
@@ -369,15 +368,15 @@ func marshalAddrs(b []byte, as []Addr) (uint, error) {
369368
}
370369

371370
func parseAddrs(attrs uint, fn func(int, []byte) (int, Addr, error), b []byte) ([]Addr, error) {
372-
var as [unix.RTAX_MAX]Addr
373-
af := int(unix.AF_UNSPEC)
374-
for i := uint(0); i < unix.RTAX_MAX && len(b) >= roundup(0); i++ {
371+
var as [syscall.RTAX_MAX]Addr
372+
af := int(syscall.AF_UNSPEC)
373+
for i := uint(0); i < syscall.RTAX_MAX && len(b) >= roundup(0); i++ {
375374
if attrs&(1<<i) == 0 {
376375
continue
377376
}
378-
if i <= unix.RTAX_BRD {
377+
if i <= syscall.RTAX_BRD {
379378
switch b[1] {
380-
case unix.AF_LINK:
379+
case syscall.AF_LINK:
381380
a, err := parseLinkAddr(b)
382381
if err != nil {
383382
return nil, err
@@ -388,7 +387,7 @@ func parseAddrs(attrs uint, fn func(int, []byte) (int, Addr, error), b []byte) (
388387
return nil, errMessageTooShort
389388
}
390389
b = b[l:]
391-
case unix.AF_INET, unix.AF_INET6:
390+
case syscall.AF_INET, syscall.AF_INET6:
392391
af = int(b[1])
393392
a, err := parseInetAddr(af, b)
394393
if err != nil {

Diff for: ‎route/address_darwin_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ package route
66

77
import (
88
"reflect"
9+
"syscall"
910
"testing"
10-
11-
"golang.org/x/sys/unix"
1211
)
1312

1413
type parseAddrsOnDarwinTest struct {
@@ -20,7 +19,7 @@ type parseAddrsOnDarwinTest struct {
2019

2120
var parseAddrsOnDarwinLittleEndianTests = []parseAddrsOnDarwinTest{
2221
{
23-
unix.RTA_DST | unix.RTA_GATEWAY | unix.RTA_NETMASK,
22+
syscall.RTA_DST | syscall.RTA_GATEWAY | syscall.RTA_NETMASK,
2423
parseKernelInetAddr,
2524
[]byte{
2625
0x10, 0x2, 0x0, 0x0, 0xc0, 0xa8, 0x56, 0x0,

Diff for: ‎route/address_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ package route
99

1010
import (
1111
"reflect"
12+
"syscall"
1213
"testing"
13-
14-
"golang.org/x/sys/unix"
1514
)
1615

1716
type parseAddrsTest struct {
@@ -23,7 +22,7 @@ type parseAddrsTest struct {
2322

2423
var parseAddrsLittleEndianTests = []parseAddrsTest{
2524
{
26-
unix.RTA_DST | unix.RTA_GATEWAY | unix.RTA_NETMASK | unix.RTA_BRD,
25+
syscall.RTA_DST | syscall.RTA_GATEWAY | syscall.RTA_NETMASK | syscall.RTA_BRD,
2726
parseKernelInetAddr,
2827
[]byte{
2928
0x38, 0x12, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0,
@@ -60,7 +59,7 @@ var parseAddrsLittleEndianTests = []parseAddrsTest{
6059
},
6160
},
6261
{
63-
unix.RTA_NETMASK | unix.RTA_IFP | unix.RTA_IFA,
62+
syscall.RTA_NETMASK | syscall.RTA_IFP | syscall.RTA_IFA,
6463
parseKernelInetAddr,
6564
[]byte{
6665
0x7, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0,

Diff for: ‎route/interface_classic.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ package route
99

1010
import (
1111
"runtime"
12-
13-
"golang.org/x/sys/unix"
12+
"syscall"
1413
)
1514

1615
func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
@@ -22,13 +21,13 @@ func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error)
2221
return nil, errInvalidMessage
2322
}
2423
attrs := uint(nativeEndian.Uint32(b[4:8]))
25-
if attrs&unix.RTA_IFP == 0 {
24+
if attrs&syscall.RTA_IFP == 0 {
2625
return nil, nil
2726
}
2827
m := &InterfaceMessage{
2928
Version: int(b[2]),
3029
Type: int(b[3]),
31-
Addrs: make([]Addr, unix.RTAX_MAX),
30+
Addrs: make([]Addr, syscall.RTAX_MAX),
3231
Flags: int(nativeEndian.Uint32(b[8:12])),
3332
Index: int(nativeEndian.Uint16(b[12:14])),
3433
extOff: w.extOff,
@@ -38,7 +37,7 @@ func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error)
3837
if err != nil {
3938
return nil, err
4039
}
41-
m.Addrs[unix.RTAX_IFP] = a
40+
m.Addrs[syscall.RTAX_IFP] = a
4241
m.Name = a.(*LinkAddr).Name
4342
return m, nil
4443
}

Diff for: ‎route/interface_freebsd.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
package route
66

7-
import "golang.org/x/sys/unix"
7+
import "syscall"
88

99
func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, error) {
1010
var extOff, bodyOff int
11-
if typ == unix.NET_RT_IFLISTL {
11+
if typ == syscall.NET_RT_IFLISTL {
1212
if len(b) < 20 {
1313
return nil, errMessageTooShort
1414
}
@@ -26,30 +26,30 @@ func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, erro
2626
return nil, errInvalidMessage
2727
}
2828
attrs := uint(nativeEndian.Uint32(b[4:8]))
29-
if attrs&unix.RTA_IFP == 0 {
29+
if attrs&syscall.RTA_IFP == 0 {
3030
return nil, nil
3131
}
3232
m := &InterfaceMessage{
3333
Version: int(b[2]),
3434
Type: int(b[3]),
3535
Flags: int(nativeEndian.Uint32(b[8:12])),
3636
Index: int(nativeEndian.Uint16(b[12:14])),
37-
Addrs: make([]Addr, unix.RTAX_MAX),
37+
Addrs: make([]Addr, syscall.RTAX_MAX),
3838
extOff: extOff,
3939
raw: b[:l],
4040
}
4141
a, err := parseLinkAddr(b[bodyOff:])
4242
if err != nil {
4343
return nil, err
4444
}
45-
m.Addrs[unix.RTAX_IFP] = a
45+
m.Addrs[syscall.RTAX_IFP] = a
4646
m.Name = a.(*LinkAddr).Name
4747
return m, nil
4848
}
4949

5050
func (w *wireFormat) parseInterfaceAddrMessage(typ RIBType, b []byte) (Message, error) {
5151
var bodyOff int
52-
if typ == unix.NET_RT_IFLISTL {
52+
if typ == syscall.NET_RT_IFLISTL {
5353
if len(b) < 24 {
5454
return nil, errMessageTooShort
5555
}

Diff for: ‎route/interface_openbsd.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package route
66

7-
import "golang.org/x/sys/unix"
7+
import "syscall"
88

99
func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
1010
if len(b) < 32 {
@@ -15,15 +15,15 @@ func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
1515
return nil, errInvalidMessage
1616
}
1717
attrs := uint(nativeEndian.Uint32(b[12:16]))
18-
if attrs&unix.RTA_IFP == 0 {
18+
if attrs&syscall.RTA_IFP == 0 {
1919
return nil, nil
2020
}
2121
m := &InterfaceMessage{
2222
Version: int(b[2]),
2323
Type: int(b[3]),
2424
Flags: int(nativeEndian.Uint32(b[16:20])),
2525
Index: int(nativeEndian.Uint16(b[6:8])),
26-
Addrs: make([]Addr, unix.RTAX_MAX),
26+
Addrs: make([]Addr, syscall.RTAX_MAX),
2727
raw: b[:l],
2828
}
2929
ll := int(nativeEndian.Uint16(b[4:6]))
@@ -34,7 +34,7 @@ func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
3434
if err != nil {
3535
return nil, err
3636
}
37-
m.Addrs[unix.RTAX_IFP] = a
37+
m.Addrs[syscall.RTAX_IFP] = a
3838
m.Name = a.(*LinkAddr).Name
3939
return m, nil
4040
}

Diff for: ‎route/message_darwin_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
package route
66

77
import (
8+
"syscall"
89
"testing"
9-
10-
"golang.org/x/sys/unix"
1110
)
1211

1312
func TestFetchAndParseRIBOnDarwin(t *testing.T) {
14-
for _, typ := range []RIBType{unix.NET_RT_FLAGS, unix.NET_RT_DUMP2, unix.NET_RT_IFLIST2} {
13+
for _, typ := range []RIBType{syscall.NET_RT_FLAGS, syscall.NET_RT_DUMP2, syscall.NET_RT_IFLIST2} {
1514
var lastErr error
1615
var ms []Message
17-
for _, af := range []int{unix.AF_UNSPEC, unix.AF_INET, unix.AF_INET6} {
16+
for _, af := range []int{syscall.AF_UNSPEC, syscall.AF_INET, syscall.AF_INET6} {
1817
rs, err := fetchAndParseRIB(af, typ)
1918
if err != nil {
2019
lastErr = err

Diff for: ‎route/message_freebsd_test.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
package route
66

77
import (
8+
"syscall"
89
"testing"
9-
10-
"golang.org/x/sys/unix"
1110
)
1211

1312
func TestFetchAndParseRIBOnFreeBSD(t *testing.T) {
14-
for _, typ := range []RIBType{unix.NET_RT_IFMALIST} {
13+
for _, typ := range []RIBType{syscall.NET_RT_IFMALIST} {
1514
var lastErr error
1615
var ms []Message
17-
for _, af := range []int{unix.AF_UNSPEC, unix.AF_INET, unix.AF_INET6} {
16+
for _, af := range []int{syscall.AF_UNSPEC, syscall.AF_INET, syscall.AF_INET6} {
1817
rs, err := fetchAndParseRIB(af, typ)
1918
if err != nil {
2019
lastErr = err
@@ -38,7 +37,7 @@ func TestFetchAndParseRIBOnFreeBSD(t *testing.T) {
3837
}
3938

4039
func TestFetchAndParseRIBOnFreeBSD10AndAbove(t *testing.T) {
41-
if _, err := FetchRIB(unix.AF_UNSPEC, unix.NET_RT_IFLISTL, 0); err != nil {
40+
if _, err := FetchRIB(syscall.AF_UNSPEC, syscall.NET_RT_IFLISTL, 0); err != nil {
4241
t.Skip("NET_RT_IFLISTL not supported")
4342
}
4443
if compatFreeBSD32 {
@@ -51,12 +50,12 @@ func TestFetchAndParseRIBOnFreeBSD10AndAbove(t *testing.T) {
5150
msgs []Message
5251
ss []string
5352
}{
54-
{typ: unix.NET_RT_IFLIST},
55-
{typ: unix.NET_RT_IFLISTL},
53+
{typ: syscall.NET_RT_IFLIST},
54+
{typ: syscall.NET_RT_IFLISTL},
5655
}
5756
for i := range tests {
5857
var lastErr error
59-
for _, af := range []int{unix.AF_UNSPEC, unix.AF_INET, unix.AF_INET6} {
58+
for _, af := range []int{syscall.AF_UNSPEC, syscall.AF_INET, syscall.AF_INET6} {
6059
rs, err := fetchAndParseRIB(af, tests[i].typ)
6160
if err != nil {
6261
lastErr = err

0 commit comments

Comments
 (0)