From 81839ad50d11ea0cf6d44f2eb5841022a38a1aa6 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:49:15 +0100
Subject: [PATCH] Fix `InterfacePeers`

---
 src/core/link_tcp.go | 13 +++++--------
 src/core/link_tls.go |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/core/link_tcp.go b/src/core/link_tcp.go
index c5a73c9e..30749983 100644
--- a/src/core/link_tcp.go
+++ b/src/core/link_tcp.go
@@ -39,8 +39,7 @@ func (l *linkTCP) dial(url *url.URL, options linkOptions, sintf string) error {
 	if err != nil {
 		return err
 	}
-	addr.Zone = sintf
-	dialer, err := l.dialerFor(addr.String(), sintf)
+	dialer, err := l.dialerFor(addr, sintf)
 	if err != nil {
 		return err
 	}
@@ -121,13 +120,11 @@ func (l *linkTCP) getAddr() *net.TCPAddr {
 	return addr
 }
 
-func (l *linkTCP) dialerFor(saddr, sintf string) (*net.Dialer, error) {
-	dst, err := net.ResolveTCPAddr("tcp", saddr)
-	if err != nil {
-		return nil, err
-	}
+func (l *linkTCP) dialerFor(dst *net.TCPAddr, sintf string) (*net.Dialer, error) {
 	if dst.IP.IsLinkLocalUnicast() {
-		dst.Zone = sintf
+		if sintf != "" {
+			dst.Zone = sintf
+		}
 		if dst.Zone == "" {
 			return nil, fmt.Errorf("link-local address requires a zone")
 		}
diff --git a/src/core/link_tls.go b/src/core/link_tls.go
index 1e932b66..2dc2daf1 100644
--- a/src/core/link_tls.go
+++ b/src/core/link_tls.go
@@ -55,8 +55,7 @@ func (l *linkTLS) dial(url *url.URL, options linkOptions, sintf, sni string) err
 	if err != nil {
 		return err
 	}
-	addr.Zone = sintf
-	dialer, err := l.tcp.dialerFor(addr.String(), sintf)
+	dialer, err := l.tcp.dialerFor(addr, sintf)
 	if err != nil {
 		return err
 	}