aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2020-03-19 22:37:57 -0700
committerDavid Crawshaw <david@zentus.com>2020-03-31 09:33:08 +1100
commit024d6ea4c2a5f4727e0d483db695ec91c5629af8 (patch)
treefd587714ac8c9ed296c4dfd1e09a0424230bd730
parentwgcfg: clean up IP type/method signatures (diff)
downloadwireguard-go-024d6ea4c2a5f4727e0d483db695ec91c5629af8.tar.xz
wireguard-go-024d6ea4c2a5f4727e0d483db695ec91c5629af8.zip
wgcfg: fix bug preventing IPv6 addresses from working
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
-rw-r--r--wgcfg/writer.go8
1 files changed, 3 insertions, 5 deletions
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())