From a17a8cd48bd6e6003bf1d61ca6a1e93540b29833 Mon Sep 17 00:00:00 2001
From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
Date: Wed, 21 Oct 2020 08:16:44 +0100
Subject: [PATCH] lib/connections: Fix LAN addresses begin advertised even when
 disabled (fixes #7035) (#7045)

---
 lib/connections/quic_listen.go | 2 +-
 lib/connections/tcp_listen.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/connections/quic_listen.go b/lib/connections/quic_listen.go
index d709c7cca..a5ff9298f 100644
--- a/lib/connections/quic_listen.go
+++ b/lib/connections/quic_listen.go
@@ -160,7 +160,7 @@ func (t *quicListener) URI() *url.URL {
 }
 
 func (t *quicListener) WANAddresses() []*url.URL {
-	uris := t.LANAddresses()
+	uris := []*url.URL{t.uri}
 	t.mut.Lock()
 	if t.address != nil {
 		uris = append(uris, t.address)
diff --git a/lib/connections/tcp_listen.go b/lib/connections/tcp_listen.go
index 74448c95c..fbe1e3cc8 100644
--- a/lib/connections/tcp_listen.go
+++ b/lib/connections/tcp_listen.go
@@ -146,7 +146,7 @@ func (t *tcpListener) URI() *url.URL {
 }
 
 func (t *tcpListener) WANAddresses() []*url.URL {
-	uris := t.LANAddresses()
+	uris := []*url.URL{t.uri}
 	t.mut.RLock()
 	if t.mapping != nil {
 		addrs := t.mapping.ExternalAddresses()