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

wgengine/magicsock: move more legacy endpoint handling.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-12-18 00:31:48 -08:00 committed by Dave Anderson
parent 58fcd103c4
commit f873da5b16
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wgengine/magicsock/legacy.go
View File

@ -13,6 +13,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/device" "github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"inet.af/netaddr" "inet.af/netaddr"
@ -23,6 +24,26 @@ import (
var errNoDestinations = errors.New("magicsock: no destinations") var errNoDestinations = errors.New("magicsock: no destinations")
func (c *Conn) findLegacyEndpointLocked(ipp netaddr.IPPort, addr *net.UDPAddr) conn.Endpoint {
// Pre-disco: look up their addrSet.
if as, ok := c.addrsByUDP[ipp]; ok {
return as
}
// Pre-disco: the peer that sent this packet has roamed beyond
// the knowledge provided by the control server. If the
// packet is valid wireguard will call UpdateDst on the
// original endpoint using this addr.
return (*singleEndpoint)(addr)
}
func (c *Conn) resetAddrSetStatesLocked() {
for _, as := range c.addrsByKey {
as.curAddr = -1
as.stopSpray = as.timeNow().Add(sprayPeriod)
}
}
func (c *Conn) sendSingleEndpoint(b []byte, se *singleEndpoint) error { func (c *Conn) sendSingleEndpoint(b []byte, se *singleEndpoint) error {
addr := (*net.UDPAddr)(se) addr := (*net.UDPAddr)(se)
if addr.IP.Equal(derpMagicIP) { if addr.IP.Equal(derpMagicIP) {

22
wgengine/magicsock/magicsock.go
View File

@ -1395,16 +1395,7 @@ func (c *Conn) findEndpoint(ipp netaddr.IPPort, addr *net.UDPAddr) conn.Endpoint
} }
} }
// Pre-disco: look up their addrSet. return c.findLegacyEndpointLocked(ipp, addr)
if as, ok := c.addrsByUDP[ipp]; ok {
return as
}
// Pre-disco: the peer that sent this packet has roamed beyond
// the knowledge provided by the control server. If the
// packet is valid wireguard will call UpdateDst on the
// original endpoint using this addr.
return (*singleEndpoint)(addr)
} }
type udpReadResult struct { type udpReadResult struct {
@ -2476,23 +2467,20 @@ func (c *Conn) Rebind() {
if haveKey { if haveKey {
c.goDerpConnect(c.myDerp) c.goDerpConnect(c.myDerp)
} }
c.resetAddrSetStates() c.resetEndpointStates()
} }
// resetAddrSetStates resets the preferred address for all peers and // resetEndpointStates resets the preferred address for all peers and
// re-enables spraying. // re-enables spraying.
// This is called when connectivity changes enough that we no longer // This is called when connectivity changes enough that we no longer
// trust the old routes. // trust the old routes.
func (c *Conn) resetAddrSetStates() { func (c *Conn) resetEndpointStates() {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
for _, as := range c.addrsByKey {
as.curAddr = -1
as.stopSpray = as.timeNow().Add(sprayPeriod)
}
for _, de := range c.endpointOfDisco { for _, de := range c.endpointOfDisco {
de.noteConnectivityChange() de.noteConnectivityChange()
} }
c.resetAddrSetStatesLocked()
} }
// packIPPort packs an IPPort into the form wanted by WireGuard. // packIPPort packs an IPPort into the form wanted by WireGuard.