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/netcheck: fix tests on Windows

Browse Source 
Updates #50
This commit is contained in:
Brad Fitzpatrick 2020-10-28 09:10:35 -07:00
parent fd2a30cd32
commit 7ac91c15bd
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/netcheck/netcheck.go
View File

@ -161,6 +161,10 @@ type Client struct {
// in tests to avoid probing the local LAN's router, etc. // in tests to avoid probing the local LAN's router, etc.
SkipExternalNetwork bool SkipExternalNetwork bool
// UDPBindAddr, if non-empty, is the address to listen on for UDP.
// It defaults to ":0".
UDPBindAddr string
mu sync.Mutex // guards following mu sync.Mutex // guards following
nextFull bool // do a full region scan, even if last != nil nextFull bool // do a full region scan, even if last != nil
prev map[time.Time]*Report // some previous reports prev map[time.Time]*Report // some previous reports
@ -777,6 +781,13 @@ func newReport() *Report {
} }
} }
func (c *Client) udpBindAddr() string {
if v := c.UDPBindAddr; v != "" {
return v
}
return ":0"
}
// GetReport gets a report. // GetReport gets a report.
// //
// It may not be called concurrently with itself. // It may not be called concurrently with itself.
@ -857,7 +868,7 @@ func (c *Client) GetReport(ctx context.Context, dm *tailcfg.DERPMap) (*Report, e
if f := c.GetSTUNConn4; f != nil { if f := c.GetSTUNConn4; f != nil {
rs.pc4 = f() rs.pc4 = f()
} else { } else {
u4, err := netns.Listener().ListenPacket(ctx, "udp4", ":0") u4, err := netns.Listener().ListenPacket(ctx, "udp4", c.udpBindAddr())
if err != nil { if err != nil {
c.logf("udp4: %v", err) c.logf("udp4: %v", err)
return nil, err return nil, err
@ -870,7 +881,7 @@ func (c *Client) GetReport(ctx context.Context, dm *tailcfg.DERPMap) (*Report, e
if f := c.GetSTUNConn6; f != nil { if f := c.GetSTUNConn6; f != nil {
rs.pc6 = f() rs.pc6 = f()
} else { } else {
u6, err := netns.Listener().ListenPacket(ctx, "udp6", ":0") u6, err := netns.Listener().ListenPacket(ctx, "udp6", c.udpBindAddr())
if err != nil { if err != nil {
c.logf("udp6: %v", err) c.logf("udp6: %v", err)
} else { } else {

3
net/netcheck/netcheck_test.go
View File

@ -50,7 +50,8 @@ func TestBasic(t *testing.T) {
defer cleanup() defer cleanup()
c := &Client{ c := &Client{
Logf: t.Logf, Logf: t.Logf,
UDPBindAddr: "127.0.0.1:0",
} }
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)