octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-17 10:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(connections): announce PtP links again (fixes #9730) (#9731)

Browse Source
This commit is contained in:
Jakob Borg 2024-09-23 14:32:19 +02:00 committed by GitHub
parent 3e501d9036
commit a8e2c8edb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connections/service.go
View File

@ -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()

2
lib/connections/util.go
View File

@ -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

6
lib/osutil/net.go
View File

@ -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