From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Fri, 20 Mar 2020 05:37:57 +0000 (-0700)
Subject: wgcfg: fix bug preventing IPv6 addresses from working
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024d6ea4c2a5f4727e0d483db695ec91c5629af8;p=thirdparty%2Fwireguard-go.git

wgcfg: fix bug preventing IPv6 addresses from working

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---

diff --git a/wgcfg/writer.go b/wgcfg/writer.go
index aafb2a7..246a57d 100644
--- a/wgcfg/writer.go
+++ b/wgcfg/writer.go
@@ -6,7 +6,6 @@
 package wgcfg
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"strings"
@@ -46,9 +45,8 @@ 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 {
@@ -56,7 +54,7 @@ func (conf *Config) ToUAPI() (string, error) {
 					}
 				}
 				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())