wgcfg: fix bug preventing IPv6 addresses from working

bradfitz · crawshaw · commit 024d6ea4c2a5 · 2020-03-31T09:33:08.000+11:00
Signed-off-by: Brad Fitzpatrick &lt;bradfitz@tailscale.com&gt;
diff --git a/wgcfg/writer.go b/wgcfg/writer.go
@@ -6,7 +6,6 @@
 package wgcfg
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"strings"
@@ -46,17 +45,16 @@ func (conf *Config) ToUAPI() (string, error) {
 				}
 				var ip net.IP
 				for _, iterip := range ips {
-					iterip = iterip.To4()
-					if iterip != nil {
-						ip = iterip
+					if ip4 := iterip.To4(); ip4 != nil {
+						ip = ip4
 						break
 					}
 					if ip == nil {
 						ip = iterip
 					}
 				}
 				if ip == nil {
-					return "", errors.New("Unable to resolve IP address of endpoint")
+					return "", fmt.Errorf("unable to resolve IP address of endpoint %q (%v)", ep.Host, ips)
 				}
 				resolvedEndpoint := Endpoint{ip.String(), ep.Port}
 				reps = append(reps, resolvedEndpoint.String())

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`package wgcfg`
`7`	`7`
`8`	`8`	`import (`
`9`		`- "errors"`
`10`	`9`	`"fmt"`
`11`	`10`	`"net"`
`12`	`11`	`"strings"`
`@@ -46,17 +45,16 @@ func (conf *Config) ToUAPI() (string, error) {`
`46`	`45`	`}`
`47`	`46`	`var ip net.IP`
`48`	`47`	`for _, iterip := range ips {`
`49`		`- iterip = iterip.To4()`
`50`		`- if iterip != nil {`
`51`		`- ip = iterip`
	`48`	`+ if ip4 := iterip.To4(); ip4 != nil {`
	`49`	`+ ip = ip4`
`52`	`50`	`break`
`53`	`51`	`}`
`54`	`52`	`if ip == nil {`
`55`	`53`	`ip = iterip`
`56`	`54`	`}`
`57`	`55`	`}`
`58`	`56`	`if ip == nil {`
`59`		`- return "", errors.New("Unable to resolve IP address of endpoint")`
	`57`	`+ return "", fmt.Errorf("unable to resolve IP address of endpoint %q (%v)", ep.Host, ips)`
`60`	`58`	`}`
`61`	`59`	`resolvedEndpoint := Endpoint{ip.String(), ep.Port}`
`62`	`60`	`reps = append(reps, resolvedEndpoint.String())`