TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-19 19:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/interfaces: add debugging code for crawshaw

Browse Source
This commit is contained in:
Josh Bleecher Snyder 2021-01-14 17:18:59 -08:00
parent 6e4231c03c
commit 7823f665ad
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/interfaces/interfaces_darwin.go
View File

@ -6,6 +6,9 @@ package interfaces
import ( import (
"errors" "errors"
"fmt"
"io"
"os"
"os/exec" "os/exec"
"go4.org/mem" "go4.org/mem"
@ -46,8 +49,10 @@ func likelyHomeRouterIPDarwinExec() (ret netaddr.IP, ok bool) {
} }
defer cmd.Wait() defer cmd.Wait()
fmt.Println("netstat output:")
tee := io.TeeReader(stdout, os.Stdout)
var f []mem.RO var f []mem.RO
lineread.Reader(stdout, func(lineb []byte) error { lineread.Reader(tee, func(lineb []byte) error {
line := mem.B(lineb) line := mem.B(lineb)
if !mem.Contains(line, mem.S("default")) { if !mem.Contains(line, mem.S("default")) {
return nil return nil

2
net/interfaces/interfaces_darwin_cgo.go
View File

@ -105,6 +105,7 @@ import "C"
import ( import (
"encoding/binary" "encoding/binary"
"fmt"
"inet.af/netaddr" "inet.af/netaddr"
) )
@ -116,6 +117,7 @@ func init() {
func likelyHomeRouterIPDarwinSyscall() (ret netaddr.IP, ok bool) { func likelyHomeRouterIPDarwinSyscall() (ret netaddr.IP, ok bool) {
ip := C.privateGatewayIP() ip := C.privateGatewayIP()
if ip < 255 { if ip < 255 {
fmt.Println("privateGatewayIP failure:", ip)
return netaddr.IP{}, false return netaddr.IP{}, false
} }
var q [4]byte var q [4]byte