octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/config, lib/model: Warn about two-way introducer (fixes #8393) (#8395)

Browse Source
This commit is contained in:
Simon Frei 2022-06-20 19:36:45 +02:00 committed by GitHub
parent e071f16531
commit 3a6ebb8482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/config/deviceconfiguration.go
View File

@ -7,6 +7,7 @@
package config package config
import ( import (
"fmt"
"sort" "sort"
) )
@ -65,3 +66,10 @@ func deduplicateObservedFoldersToMap(input []ObservedFolder) map[string]Observed
return output return output
} }
func (cfg *DeviceConfiguration) Description() string {
if cfg.Name == "" {
return fmt.Sprintf("%s", cfg.DeviceID.Short())
}
return fmt.Sprintf("%s (%s)", cfg.Name, cfg.DeviceID.Short())
}

7
lib/model/model.go
View File

@ -1198,6 +1198,13 @@ func (m *model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
ccDeviceInfos[folder.ID] = info ccDeviceInfos[folder.ID] = info
} }
for _, info := range ccDeviceInfos {
if deviceCfg.Introducer && info.local.Introducer {
l.Warnf("Remote %v is an introducer to us, and we are to them - only one should be introducer to the other, see https://docs.syncthing.net/users/introducer.html", deviceCfg.Description())
}
break
}
// Needs to happen outside of the fmut, as can cause CommitConfiguration // Needs to happen outside of the fmut, as can cause CommitConfiguration
if deviceCfg.AutoAcceptFolders { if deviceCfg.AutoAcceptFolders {
w, _ := m.cfg.Modify(func(cfg *config.Configuration) { w, _ := m.cfg.Modify(func(cfg *config.Configuration) {