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

util/endian: delete package; use updated josharian/native instead

Browse Source 
See josharian/native#3

Updates golang/go#57237

Change-Id: I238c04c6654e5b9e7d9cfb81a7bbc5e1043a84a2
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-12-12 19:40:44 -08:00
committed by Brad Fitzpatrick
parent bd2995c14b
commit ca08e316af
12 changed files with 18 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/dns/nm.go
View File

@@ -14,9 +14,9 @@ import (
"time"
"github.com/godbus/dbus/v5"
"github.com/josharian/native"
"tailscale.com/net/interfaces"
"tailscale.com/util/dnsname"
"tailscale.com/util/endian"
)
const (
@@ -130,7 +130,7 @@ func (m *nmManager) trySet(ctx context.Context, config OSConfig) error {
for _, ip := range config.Nameservers {
b := ip.As16()
if ip.Is4() {
dnsv4 = append(dnsv4, endian.Native.Uint32(b[12:]))
dnsv4 = append(dnsv4, native.Endian.Uint32(b[12:]))
} else {
dnsv6 = append(dnsv6, b[:])
}

4
net/netns/netns_windows.go
View File

@@ -9,11 +9,11 @@ import (
"strings"
"syscall"
"github.com/josharian/native"
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"tailscale.com/net/interfaces"
"tailscale.com/types/logger"
"tailscale.com/util/endian"
)
func interfaceIndex(iface *winipcfg.IPAdapterAddresses) uint32 {
@@ -119,7 +119,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 endian.Big {
if native.IsBigEndian {
return i
}
return bits.ReverseBytes32(i)

8
net/netstat/netstat_windows.go
View File

@@ -13,9 +13,9 @@ import (
"syscall"
"unsafe"
"github.com/josharian/native"
"golang.org/x/sys/windows"
"tailscale.com/net/netaddr"
"tailscale.com/util/endian"
)
// See https://docs.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getextendedtcptable
@@ -94,7 +94,7 @@ func (t *Table) addEntries(fam int) error {
}
buf = buf[:size]
numEntries := endian.Native.Uint32(buf[:4])
numEntries := native.Endian.Uint32(buf[:4])
buf = buf[4:]
var recSize int
@@ -155,7 +155,7 @@ func state(v uint32) string {
}
func ipport4(addr uint32, port uint16) netip.AddrPort {
if !endian.Big {
if !native.IsBigEndian {
addr = bits.ReverseBytes32(addr)
}
return netip.AddrPortFrom(
@@ -173,7 +173,7 @@ func ipport6(addr [16]byte, scope uint32, port uint16) netip.AddrPort {
}
func port(v *uint32) uint16 {
if !endian.Big {
if !native.IsBigEndian {
return uint16(bits.ReverseBytes32(*v) >> 16)
}
return uint16(*v >> 16)