Merge branch 'main' into v2

* main:
  fix(gui): fix previous commit
  fix(gui): mark unseen disconnected devices as inactive (#10048)
  fix(strings): differentiate setup(n) and set(v) up (#10024)
  chore(fs): changes to allow Filesystem to be implemented externally (#10040)
  chore(config): resolve primary STUN servers via SRV record (fixes #10029) (#10031)
  build: push artifacts to Azure (#10044)
  chore(gui, man, authors): update docs, translations, and contributors
This commit is contained in:
Jakob Borg
2025-04-09 15:40:25 +02:00
83 changed files with 157 additions and 202 deletions
+17 -8
View File
@@ -8,8 +8,10 @@ package config
import (
"fmt"
"net"
"runtime"
"slices"
"strings"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/rand"
@@ -183,15 +185,22 @@ func (opts OptionsConfiguration) StunServers() []string {
for _, addr := range opts.RawStunServers {
switch addr {
case "default":
defaultPrimaryAddresses := make([]string, len(DefaultPrimaryStunServers))
copy(defaultPrimaryAddresses, DefaultPrimaryStunServers)
rand.Shuffle(defaultPrimaryAddresses)
addresses = append(addresses, defaultPrimaryAddresses...)
_, records, err := net.LookupSRV("stun", "udp", "syncthing.net")
if err != nil {
l.Warnln("Unable to resolve primary STUN servers via DNS:", err)
}
defaultSecondaryAddresses := make([]string, len(DefaultSecondaryStunServers))
copy(defaultSecondaryAddresses, DefaultSecondaryStunServers)
rand.Shuffle(defaultSecondaryAddresses)
addresses = append(addresses, defaultSecondaryAddresses...)
for _, record := range records {
priority := record.Priority
target := strings.TrimSuffix(record.Target, ".")
address := fmt.Sprintf("%s:%d", target, record.Port)
l.Debugf("Resolved primary STUN server %s with priority %d", address, priority)
addresses = append(addresses, address)
}
fallbackAddresses := slices.Clone(DefaultFallbackStunServers)
rand.Shuffle(fallbackAddresses)
addresses = append(addresses, fallbackAddresses...)
default:
addresses = append(addresses, addr)
}