TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-07 08:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "magicsock: call RequestStatus when DERP connects"

Browse Source 
Seems to break linux CI builder. Cannot reproduce locally,
so attempting a rollback.

This reverts commit cd7bc02ab1924a5504c6667ffebdb0635272badd.

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw 2020-08-25 15:14:57 -04:00
parent a3fb422a39
commit a67b174da1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wgengine/magicsock/magicsock.go
View File

@ -1206,7 +1206,6 @@ func (c *Conn) derpWriteChanOfAddr(addr netaddr.IPPort, peer key.Public) chan<-
go c.runDerpReader(ctx, addr, dc, wg, startGate) go c.runDerpReader(ctx, addr, dc, wg, startGate)
go c.runDerpWriter(ctx, dc, ch, wg, startGate) go c.runDerpWriter(ctx, dc, ch, wg, startGate)
go c.epFunc(nil) // call RequestStatus with DERPs change
return ad.writeCh return ad.writeCh
} }

9
wgengine/userspace.go
View File

@ -229,11 +229,10 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
e.linkMon = mon e.linkMon = mon
endpointsFn := func(endpoints []string) { endpointsFn := func(endpoints []string) {
if len(endpoints) != 0 { e.mu.Lock()
e.mu.Lock() e.endpoints = append(e.endpoints[:0], endpoints...)
e.endpoints = append(e.endpoints[:0], endpoints...) e.mu.Unlock()
e.mu.Unlock()
}
e.RequestStatus() e.RequestStatus()
} }
magicsockOpts := magicsock.Options{ magicsockOpts := magicsock.Options{