TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-25 02:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

magicsock: lookup AddrSet by key from DERP

Browse Source 
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw 2020-03-04 13:43:06 -05:00
parent bf704a5218
commit 07106e9898
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wgengine/magicsock/magicsock.go
View File

@ -67,6 +67,7 @@ type Conn struct {
// 10.0.0.3:3 -> [10.0.0.3:3] // 10.0.0.3:3 -> [10.0.0.3:3]
addrsMu sync.Mutex addrsMu sync.Mutex
addrsByUDP map[udpAddr]*AddrSet addrsByUDP map[udpAddr]*AddrSet
addrsByKey map[key.Public]*AddrSet
// stunReceiveFunc holds the current STUN packet processing func. // stunReceiveFunc holds the current STUN packet processing func.
// Its Loaded value is always non-nil. // Its Loaded value is always non-nil.
@ -160,6 +161,7 @@ func Listen(opts Options) (*Conn, error) {
epFunc: opts.endpointsFunc(), epFunc: opts.endpointsFunc(),
logf: log.Printf, logf: log.Printf,
addrsByUDP: make(map[udpAddr]*AddrSet), addrsByUDP: make(map[udpAddr]*AddrSet),
addrsByKey: make(map[key.Public]*AddrSet),
derpRecvCh: make(chan derpReadResult), derpRecvCh: make(chan derpReadResult),
udpRecvCh: make(chan udpReadResult), udpRecvCh: make(chan udpReadResult),
} }
@ -808,9 +810,14 @@ func (c *Conn) ReceiveIPv4(b []byte) (n int, ep conn.Endpoint, addr *net.UDPAddr
return 0, nil, nil, err return 0, nil, nil, err
} }
// TODO: look up addrSet from dm.Source public key, if c.addrsMu.Lock()
// found (Source might be zero for a short period of addrSet = c.addrsByKey[dm.src]
// time until DERP servers re-deployed) c.addrsMu.Unlock()
if addrSet == nil {
key := wgcfg.Key(dm.src)
log.Printf("magicsock: DERP packet from unknown key: %s", key.ShortString())
}
case um := <-c.udpRecvCh: case um := <-c.udpRecvCh:
if um.err != nil { if um.err != nil {
@ -1153,6 +1160,7 @@ func (c *Conn) CreateEndpoint(key [32]byte, addrs string) (conn.Endpoint, error)
copy(epAddr.ip.Addr[:], addr.IP.To16()) copy(epAddr.ip.Addr[:], addr.IP.To16())
epAddr.port = uint16(addr.Port) epAddr.port = uint16(addr.Port)
c.addrsByUDP[epAddr] = a c.addrsByUDP[epAddr] = a
c.addrsByKey[key] = a
} }
c.addrsMu.Unlock() c.addrsMu.Unlock()