TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: use netaddr.ParseIPPort instead of net.ResolveUDPAddr

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-07-01 08:23:37 -07:00
parent f7124c7f06
commit 47b4a19786
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wgengine/magicsock/magicsock.go
View File

@ -2245,17 +2245,12 @@ func (c *Conn) CreateEndpoint(pubKey [32]byte, addrs string) (conn.Endpoint, err
if addrs != "" { if addrs != "" {
for _, ep := range strings.Split(addrs, ",") { for _, ep := range strings.Split(addrs, ",") {
ua, err := net.ResolveUDPAddr("udp", ep) ipp, err := netaddr.ParseIPPort(ep)
if err != nil { 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) 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.ipPorts = append(a.ipPorts, ipp)
a.addrs = append(a.addrs, *ua) a.addrs = append(a.addrs, *ipp.UDPAddr())
} }
} }