diff options
| -rw-r--r-- | wgengine/magicsock/magicsock.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index ca001b2d6..ee7c0bb9b 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -66,7 +66,8 @@ type Conn struct { // 10.0.0.2:2 -> [10.0.0.1:1, 10.0.0.2:2] // 10.0.0.3:3 -> [10.0.0.3:3] addrsMu sync.Mutex - addrsByUDP map[udpAddr]*AddrSet + addrsByUDP map[udpAddr]*AddrSet // TODO: clean up this map sometime? + addrsByKey map[key.Public]*AddrSet // TODO: clean up this map sometime? // stunReceiveFunc holds the current STUN packet processing func. // Its Loaded value is always non-nil. @@ -161,6 +162,7 @@ func Listen(opts Options) (*Conn, error) { epFunc: opts.endpointsFunc(), logf: log.Printf, addrsByUDP: make(map[udpAddr]*AddrSet), + addrsByKey: make(map[key.Public]*AddrSet), wantDerp: true, derpRecvCh: make(chan derpReadResult), udpRecvCh: make(chan udpReadResult), @@ -823,9 +825,14 @@ func (c *Conn) ReceiveIPv4(b []byte) (n int, ep conn.Endpoint, addr *net.UDPAddr return 0, nil, nil, err } - // TODO: look up addrSet from dm.Source public key, if - // found (Source might be zero for a short period of - // time until DERP servers re-deployed) + c.addrsMu.Lock() + addrSet = c.addrsByKey[dm.src] + 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: if um.err != nil { @@ -1180,6 +1187,7 @@ func (c *Conn) CreateEndpoint(key [32]byte, addrs string) (conn.Endpoint, error) copy(epAddr.ip.Addr[:], addr.IP.To16()) epAddr.port = uint16(addr.Port) c.addrsByUDP[epAddr] = a + c.addrsByKey[key] = a } c.addrsMu.Unlock() |