diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 80d6aad1d..4ef750b20 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2408,7 +2408,6 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) { ep.discoKey = n.DiscoKey ep.discoShort = n.DiscoKey.ShortString() } - ep.wgEndpoint = n.Key.UntypedHexString() ep.initFakeUDPAddr() if debugDisco() { // rather than making a new knob c.logf("magicsock: created endpoint key=%s: disco=%s; %v", n.Key.ShortString(), n.DiscoKey.ShortString(), logger.ArgWriter(func(w *bufio.Writer) { @@ -3316,7 +3315,6 @@ type endpoint struct { c *Conn publicKey key.NodePublic // peer public key (for WireGuard + DERP) fakeWGAddr netip.AddrPort // the UDP address we tell wireguard-go we're using - wgEndpoint string // string from ParseEndpoint, holds a JSON-serialized wgcfg.Endpoints // mu protects all following fields. mu sync.Mutex // Lock ordering: Conn.mu, then endpoint.mu @@ -3498,7 +3496,7 @@ func (de *endpoint) String() string { func (de *endpoint) ClearSrc() {} func (de *endpoint) SrcToString() string { panic("unused") } // unused by wireguard-go func (de *endpoint) SrcIP() netip.Addr { panic("unused") } // unused by wireguard-go -func (de *endpoint) DstToString() string { return de.wgEndpoint } +func (de *endpoint) DstToString() string { return de.publicKey.UntypedHexString() } func (de *endpoint) DstIP() netip.Addr { panic("unused") } func (de *endpoint) DstToBytes() []byte { return packIPPort(de.fakeWGAddr) } diff --git a/wgengine/magicsock/magicsock_test.go b/wgengine/magicsock/magicsock_test.go index a59077a37..8e802af5c 100644 --- a/wgengine/magicsock/magicsock_test.go +++ b/wgengine/magicsock/magicsock_test.go @@ -1731,9 +1731,6 @@ func (m *peerMap) validate() error { if got := pi.ep.publicKey; got != pub { return fmt.Errorf("byNodeKey[%v].publicKey = %v", pub, got) } - if got, want := pi.ep.wgEndpoint, pub.UntypedHexString(); got != want { - return fmt.Errorf("byNodeKey[%v].wgEndpoint = %q, want %q", pub, got, want) - } if _, ok := seenEps[pi.ep]; ok { return fmt.Errorf("duplicate endpoint present: %v", pi.ep.publicKey) }