From 47b4a19786384688cc747205b069efe2b100aecb Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 1 Jul 2020 08:23:37 -0700 Subject: [PATCH] wgengine/magicsock: use netaddr.ParseIPPort instead of net.ResolveUDPAddr --- wgengine/magicsock/magicsock.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index f42e610f9..e25e878c5 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2245,17 +2245,12 @@ func (c *Conn) CreateEndpoint(pubKey [32]byte, addrs string) (conn.Endpoint, err if addrs != "" { for _, ep := range strings.Split(addrs, ",") { - ua, err := net.ResolveUDPAddr("udp", ep) + ipp, err := netaddr.ParseIPPort(ep) if err != nil { - return nil, err - } - ipp, ok := netaddr.FromStdAddr(ua.IP, ua.Port, ua.Zone) - if !ok { return nil, fmt.Errorf("bogus address %q", ep) } - ua.IP = ipp.IP.IPAddr().IP // makes IPv4 addresses 4 bytes long a.ipPorts = append(a.ipPorts, ipp) - a.addrs = append(a.addrs, *ua) + a.addrs = append(a.addrs, *ipp.UDPAddr()) } }