TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-28 03:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: log more about why we're re-STUNing

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-03-12 11:56:01 -07:00
parent 5ad947c761
commit eff6dcdb4e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wgengine/magicsock/magicsock.go
View File

@ -46,7 +46,7 @@ import (
type Conn struct { type Conn struct {
pconn *RebindingUDPConn pconn *RebindingUDPConn
pconnPort uint16 pconnPort uint16
startEpUpdate chan struct{} // send to trigger endpoint update startEpUpdate chan string // send (with reason string) to trigger endpoint update
epFunc func(endpoints []string) epFunc func(endpoints []string)
logf logger.Logf logf logger.Logf
sendLogLimit *rate.Limiter sendLogLimit *rate.Limiter
@ -190,7 +190,7 @@ func Listen(opts Options) (*Conn, error) {
pconn: new(RebindingUDPConn), pconn: new(RebindingUDPConn),
pconnPort: opts.Port, pconnPort: opts.Port,
sendLogLimit: rate.NewLimiter(rate.Every(1*time.Minute), 1), sendLogLimit: rate.NewLimiter(rate.Every(1*time.Minute), 1),
startEpUpdate: make(chan struct{}, 1), startEpUpdate: make(chan string, 1),
connCtx: connCtx, connCtx: connCtx,
connCtxCancel: connCtxCancel, connCtxCancel: connCtxCancel,
epFunc: opts.endpointsFunc(), epFunc: opts.endpointsFunc(),
@ -216,7 +216,7 @@ func Listen(opts Options) (*Conn, error) {
c.ignoreSTUNPackets() c.ignoreSTUNPackets()
c.pconn.Reset(packetConn.(*net.UDPConn)) c.pconn.Reset(packetConn.(*net.UDPConn))
c.reSTUN() c.reSTUN("initial")
c.goroutines.Add(1) c.goroutines.Add(1)
go func() { go func() {
@ -251,6 +251,7 @@ func (c *Conn) epUpdate(ctx context.Context) {
} }
for { for {
var why string
select { select {
case <-ctx.Done(): case <-ctx.Done():
if lastCancel != nil { if lastCancel != nil {
@ -258,14 +259,21 @@ func (c *Conn) epUpdate(ctx context.Context) {
<-lastDone <-lastDone
} }
return return
case <-c.startEpUpdate: case why = <-c.startEpUpdate:
case <-regularUpdate: case <-regularUpdate:
why = "timer"
} }
if lastCancel != nil { if lastCancel != nil {
lastCancel() select {
<-lastDone case <-lastDone:
default:
c.logf("magicsock.Conn.epUpdate: starting new endpoint update (for %s) while previous running; cancelling previous...", why)
lastCancel()
<-lastDone
}
} }
c.logf("magicsock.Conn.epUpdate: starting endpoint update (%s)", why)
var epCtx context.Context var epCtx context.Context
epCtx, lastCancel = context.WithCancel(ctx) epCtx, lastCancel = context.WithCancel(ctx)
lastDone = make(chan struct{}) lastDone = make(chan struct{})
@ -1078,9 +1086,9 @@ func (c *Conn) Close() error {
return err return err
} }
func (c *Conn) reSTUN() { func (c *Conn) reSTUN(why string) {
select { select {
case c.startEpUpdate <- struct{}{}: case c.startEpUpdate <- why:
case <-c.donec(): case <-c.donec():
} }
} }
@ -1090,7 +1098,7 @@ func (c *Conn) reSTUN() {
// at the state of the network and decides whether the change from // at the state of the network and decides whether the change from
// before is interesting enough to warrant taking action on. // before is interesting enough to warrant taking action on.
func (c *Conn) LinkChange() { func (c *Conn) LinkChange() {
defer c.reSTUN() defer c.reSTUN("link-change")
c.linkChangeMu.Lock() c.linkChangeMu.Lock()
defer c.linkChangeMu.Unlock() defer c.linkChangeMu.Unlock()