TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 20:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: close derp connections on rebind

Browse Source 
Fixes #276

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-04-09 14:21:36 -07:00 committed by Brad Fitzpatrick
parent 614261d00d
commit a7e7c7b548
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wgengine/magicsock/magicsock.go
View File

@ -479,12 +479,21 @@ func (c *Conn) setNearestDERP(derpNum int) (wantDERP bool) {
for i, ad := range c.activeDerp { for i, ad := range c.activeDerp {
go ad.c.NotePreferred(i == c.myDerp) go ad.c.NotePreferred(i == c.myDerp)
} }
if derpNum != 0 { c.goDerpConnect(derpNum)
go c.derpWriteChanOfAddr(&net.UDPAddr{IP: derpMagicIP, Port: derpNum}, key.Public{})
}
return true return true
} }
// goDerpConnect starts a goroutine to start connecting to the given
// DERP node.
//
// c.mu may be held, but does not need to be.
func (c *Conn) goDerpConnect(node int) {
if node == 0 {
return
}
go c.derpWriteChanOfAddr(&net.UDPAddr{IP: derpMagicIP, Port: node}, key.Public{})
}
// determineEndpoints returns the machine's endpoint addresses. It // determineEndpoints returns the machine's endpoint addresses. It
// does a STUN lookup (via netcheck) to determine its public address. // does a STUN lookup (via netcheck) to determine its public address.
// //
@ -1226,11 +1235,9 @@ func (c *Conn) SetPrivateKey(privateKey wgcfg.PrivateKey) error {
c.closeAllDerpLocked("new-private-key") c.closeAllDerpLocked("new-private-key")
// Key changed. Close existing DERP connections and reconnect to home. // Key changed. Close existing DERP connections and reconnect to home.
oldHome := c.myDerp if c.myDerp != 0 {
c.myDerp = 0 // zero it, so setNearestDERP will do work c.logf("magicsock: private key changed, reconnecting to home derp-%d", c.myDerp)
if oldHome != 0 { c.goDerpConnect(c.myDerp)
c.logf("magicsock: private key set, rebooting connection to home derp-%d", oldHome)
go c.setNearestDERP(oldHome)
} }
return nil return nil
@ -1478,6 +1485,11 @@ func (c *Conn) Rebind() {
return return
} }
c.pconn4.Reset(packetConn.(*net.UDPConn)) c.pconn4.Reset(packetConn.(*net.UDPConn))
c.mu.Lock()
c.closeAllDerpLocked("rebind")
c.mu.Unlock()
c.goDerpConnect(c.myDerp)
c.resetAddrSetStates() c.resetAddrSetStates()
} }