lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine/magicsock: reconnect to DERP home after network comes back up 

Updates #1310
bradfitz/proposed-1.4.5
Brad Fitzpatrick 2021-02-10 10:04:42 -08:00 committed by David Anderson
parent d2c1ae7ed4
commit cc2ec141fe
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wgengine/magicsock/magicsock.go
View File

@ -961,6 +961,13 @@ func (c *Conn) setNearestDERP(derpNum int) (wantDERP bool) {
return true return true
} }
// startDerpHomeConnectLocked starts connecting to our DERP home, if any.
//
// c.mu must be held.
func (c *Conn) startDerpHomeConnectLocked() {
c.goDerpConnect(c.myDerp)
}
// goDerpConnect starts a goroutine to start connecting to the given // goDerpConnect starts a goroutine to start connecting to the given
// DERP node. // DERP node.
// //
@ -2123,7 +2130,9 @@ func (c *Conn) SetNetworkUp(up bool) {
c.logf("magicsock: SetNetworkUp(%v)", up) c.logf("magicsock: SetNetworkUp(%v)", up)
c.networkUp.Set(up) c.networkUp.Set(up)
if !up { if up {
c.startDerpHomeConnectLocked()
} else {
c.closeAllDerpLocked("network-down") c.closeAllDerpLocked("network-down")
} }
} }
@ -2165,7 +2174,7 @@ func (c *Conn) SetPrivateKey(privateKey wgkey.Private) error {
// Key changed. Close existing DERP connections and reconnect to home. // Key changed. Close existing DERP connections and reconnect to home.
if c.myDerp != 0 && !newKey.IsZero() { if c.myDerp != 0 && !newKey.IsZero() {
c.logf("magicsock: private key changed, reconnecting to home derp-%d", c.myDerp) c.logf("magicsock: private key changed, reconnecting to home derp-%d", c.myDerp)
c.goDerpConnect(c.myDerp) c.startDerpHomeConnectLocked()
} }
if newKey.IsZero() { if newKey.IsZero() {
@ -2628,12 +2637,11 @@ func (c *Conn) Rebind() {
c.mu.Lock() c.mu.Lock()
c.closeAllDerpLocked("rebind") c.closeAllDerpLocked("rebind")
haveKey := !c.privateKey.IsZero() if !c.privateKey.IsZero() {
c.startDerpHomeConnectLocked()
}
c.mu.Unlock() c.mu.Unlock()
if haveKey {
c.goDerpConnect(c.myDerp)
}
c.resetEndpointStates() c.resetEndpointStates()
} }