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

router/dns: detect host endianness for NetworkManager.

Browse Source 
Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
This commit is contained in:
Dmytro Shynkevych 2020-08-12 16:02:52 -04:00
parent b97aac1718
commit 95a18f815c
No known key found for this signature in database
GPG Key ID: FF5E2F3DAD97EA23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wgengine/router/dns/nm.go
View File

@ -14,11 +14,25 @@ import (
"fmt"
"os"
"os/exec"
"unsafe"
"github.com/godbus/dbus/v5"
)
type nmConnectionSettings map[string]map[string]dbus.Variant
var nativeEndian binary.ByteOrder
func init() {
// TODO(dmytro): use DBus endianness flag when available.
// A more elegant way to do this is by looking at the first byte of a raw DBus message.
// However, that requires a change in godbus, which has slow maintainer response.
i := uint32(1)
p := unsafe.Pointer(&i)
if *(*byte)(p) == 1 {
nativeEndian = binary.LittleEndian
} else {
nativeEndian = binary.BigEndian
}
}
// isNMActive determines if NetworkManager is currently managing system DNS settings.
func isNMActive() bool {
@ -61,6 +75,8 @@ func newNMManager(mconfig ManagerConfig) managerImpl {
}
}
type nmConnectionSettings map[string]map[string]dbus.Variant
// Up implements managerImpl.
func (m nmManager) Up(config Config) error {
ctx, cancel := context.WithTimeout(context.Background(), reconfigTimeout)
@ -129,7 +145,7 @@ func (m nmManager) Up(config Config) error {
for _, ip := range config.Nameservers {
b := ip.As16()
if ip.Is4() {
dnsv4 = append(dnsv4, binary.LittleEndian.Uint32(b[12:]))
dnsv4 = append(dnsv4, nativeEndian.Uint32(b[12:]))
} else {
dnsv6 = append(dnsv6, b[:])
}