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

wgengine/magicsock: remove DisableSTUNForTesting

Browse Source
This commit is contained in:
Brad Fitzpatrick
2020-07-08 15:50:41 -07:00
parent ecf5d69c7c
commit de875a4d87
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wgengine/magicsock/magicsock.go
View File

@@ -210,8 +210,6 @@ type activeDerp struct {
// The current default (zero) means to auto-select a random free port. // The current default (zero) means to auto-select a random free port.
const DefaultPort = 0 const DefaultPort = 0
var DisableSTUNForTesting bool
// Options contains options for Listen. // Options contains options for Listen.
type Options struct { type Options struct {
// Logf optionally provides a log function to use. // Logf optionally provides a log function to use.
@@ -367,7 +365,7 @@ func (c *Conn) updateNetInfo(ctx context.Context) (*netcheck.Report, error) {
dm := c.derpMap dm := c.derpMap
c.mu.Unlock() c.mu.Unlock()
if DisableSTUNForTesting || dm == nil { if dm == nil {
return new(netcheck.Report), nil return new(netcheck.Report), nil
} }