From d3dd7c6270bc77179123dcc852ec691d27668b50 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Wed, 20 Jan 2021 09:35:15 -0800 Subject: [PATCH] wgengine/magicsock: make legacy DstToString match Addrs DstToString is used in two places in wireguard-go: Logging and uapi. We are switching to use uapi for wireguard-go config. To preserve existing behavior, we need the full set of addrs. And for logging, having the full set of addrs seems useful. (The Addrs method itself is slated for removal. When that happens, the implementation will move to DstToString.) Signed-off-by: Josh Bleecher Snyder --- wgengine/magicsock/legacy.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wgengine/magicsock/legacy.go b/wgengine/magicsock/legacy.go index ab98a837a..8fe34e5d8 100644 --- a/wgengine/magicsock/legacy.go +++ b/wgengine/magicsock/legacy.go @@ -438,8 +438,7 @@ func (a *addrSet) DstToBytes() []byte { return packIPPort(a.dst()) } func (a *addrSet) DstToString() string { - dst := a.dst() - return dst.String() + return a.Addrs() } func (a *addrSet) DstIP() net.IP { return a.dst().IP.IPAddr().IP // TODO: add netaddr accessor to cut an alloc here?