TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/{netns,netstat}: use new x/sys/cpu.IsBigEndian

Browse Source 
See golang/go#57237

Change-Id: If47ab6de7c1610998a5808e945c4177c561eab45
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2023-02-02 07:23:13 -08:00
committed by Brad Fitzpatrick
parent 2755f3843c
commit 03645f0c27
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/netns/netns_windows.go
View File

@@ -8,7 +8,7 @@ import (
"strings"
"syscall"
"github.com/josharian/native"
"golang.org/x/sys/cpu"
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"tailscale.com/net/interfaces"
@@ -118,7 +118,7 @@ func bindSocket6(c syscall.RawConn, ifidx uint32) error {
// representation, suitable for passing to Windows APIs that require a
// mangled uint32.
func nativeToBigEndian(i uint32) uint32 {
if native.IsBigEndian {
if cpu.IsBigEndian {
return i
}
return bits.ReverseBytes32(i)

6
net/netstat/netstat_windows.go
View File

@@ -11,7 +11,7 @@ import (
"net/netip"
"unsafe"
"github.com/josharian/native"
"golang.org/x/sys/cpu"
"golang.org/x/sys/windows"
"tailscale.com/net/netaddr"
)
@@ -202,7 +202,7 @@ func state(v uint32) string {
}
func ipport4(addr uint32, port uint16) netip.AddrPort {
if !native.IsBigEndian {
if !cpu.IsBigEndian {
addr = bits.ReverseBytes32(addr)
}
return netip.AddrPortFrom(
@@ -220,7 +220,7 @@ func ipport6(addr [16]byte, scope uint32, port uint16) netip.AddrPort {
}
func port(v *uint32) uint16 {
if !native.IsBigEndian {
if !cpu.IsBigEndian {
return uint16(bits.ReverseBytes32(*v) >> 16)
}
return uint16(*v >> 16)