fix(connections): announce PtP links again (fixes syncthing#9730) (sy…

…ncthing#9731)
cre4ture · Sep 23, 2024 · a8e2c8e · a8e2c8e
1 parent 3e501d9
commit a8e2c8e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/connections/service.go b/lib/connections/service.go
@@ -799,7 +799,7 @@ func (s *lanChecker) isLAN(addr net.Addr) bool {
 		}
 	}
 
-	lans, err := osutil.GetLans()
+	lans, err := osutil.GetInterfaceAddrs(false)
 	if err != nil {
 		l.Debugln("Failed to retrieve interface IPs:", err)
 		priv := ip.IsPrivate()

diff --git a/lib/connections/util.go b/lib/connections/util.go
@@ -60,7 +60,7 @@ func getURLsForAllAdaptersIfUnspecified(network string, uri *url.URL) []*url.URL
 }
 
 func getHostPortsForAllAdapters(port int) []string {
-	nets, err := osutil.GetLans()
+	nets, err := osutil.GetInterfaceAddrs(true)
 	if err != nil {
 		// Ignore failure.
 		return nil

diff --git a/lib/osutil/net.go b/lib/osutil/net.go
@@ -10,7 +10,9 @@ import (
 	"net"
 )
 
-func GetLans() ([]*net.IPNet, error) {
+// GetInterfaceAddrs returns the IP networks of all interfaces that are up.
+// Point-to-point interfaces are exluded unless includePtP is true.
+func GetInterfaceAddrs(includePtP bool) ([]*net.IPNet, error) {
 	intfs, err := net.Interfaces()
 	if err != nil {
 		return nil, err
@@ -21,7 +23,7 @@ func GetLans() ([]*net.IPNet, error) {
 		if intf.Flags&net.FlagRunning == 0 {
 			continue
 		}
-		if intf.Flags&net.FlagPointToPoint != 0 {
+		if !includePtP && intf.Flags&net.FlagPointToPoint != 0 {
 			// Point-to-point interfaces are typically VPNs and similar
 			// which, for our purposes, do not qualify as LANs.
 			continue