cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 02:18:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

lib/connections: Allow IPv6 ULA in discovery announcements (fixes #7456) (#9048)

Browse Source 
The allowed IPv4 ranges are the same as before. But we now also accept IPv6 addresses in the ULA range FC00::/7. These addresses don't require an interface identifier and are roughly equivalent to the IPv4 private ranges.

Typical usecases:

VPN interface IPs: Wireguard, OpenVPN, Tailscale, ...
fixed IPv6 LAN addressing while the provider assigns a dynamic prefix. e.g used by pihole
https://cs.opensource.google/go/go/+/refs/tags/go1.21.0:src/net/ip.go;l=146
This commit is contained in:
bt90 2023-08-23 12:28:48 +02:00 committed by GitHub
parent 3147285c60
commit 467522d04d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/connections/util.go
View File

@ -71,12 +71,9 @@ func getHostPortsForAllAdapters(port int) []string {
portStr := strconv.Itoa(port) portStr := strconv.Itoa(port)
for _, network := range nets { for _, network := range nets {
// Only IPv4 addresses, as v6 link local require an interface identifiers to work correctly // Only accept IPv4 link-local unicast and the private ranges defined in RFC 1918 and RFC 4193
// And non link local in theory are globally routable anyway. // IPv6 link-local addresses require an interface identifier to work correctly
if network.IP.To4() == nil { if (network.IP.To4() != nil && network.IP.IsLinkLocalUnicast()) || network.IP.IsPrivate() {
continue
}
if network.IP.IsLinkLocalUnicast() || (isV4Local(network.IP) && network.IP.IsGlobalUnicast()) {
hostPorts = append(hostPorts, net.JoinHostPort(network.IP.String(), portStr)) hostPorts = append(hostPorts, net.JoinHostPort(network.IP.String(), portStr))
} }
} }
@ -107,17 +104,6 @@ func resolve(network, hostPort string) (net.IP, int, error) {
return net.IPv4zero, 0, net.UnknownNetworkError(network) return net.IPv4zero, 0, net.UnknownNetworkError(network)
} }
func isV4Local(ip net.IP) bool {
// See https://go-review.googlesource.com/c/go/+/162998/
// We only take the V4 part of that.
if ip4 := ip.To4(); ip4 != nil {
return ip4[0] == 10 ||
(ip4[0] == 172 && ip4[1]&0xf0 == 16) ||
(ip4[0] == 192 && ip4[1] == 168)
}
return false
}
func maybeReplacePort(uri *url.URL, laddr net.Addr) *url.URL { func maybeReplacePort(uri *url.URL, laddr net.Addr) *url.URL {
if laddr == nil { if laddr == nil {
return uri return uri