lib/connections: Try not to deadlock (fixes #2987)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2991

2 files changed, 15 insertions, 22 deletions

diff --git a/lib/connections/connections.go b/lib/connections/connections.go
index c88ad0f4a1..b20f60f97c 100644
--- a/lib/connections/connections.go
+++ b/lib/connections/connections.go
@@ -65,11 +65,8 @@ type Service struct {
 	writeRateLimit       *ratelimit.Bucket
 	readRateLimit        *ratelimit.Bucket
 
-	lastRelayCheck map[protocol.DeviceID]time.Time
-
-	mut           sync.RWMutex
-	connType      map[protocol.DeviceID]model.ConnectionType
-	relaysEnabled bool
+	mut      sync.RWMutex
+	connType map[protocol.DeviceID]model.ConnectionType
 }
 
 func NewConnectionService(cfg *config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *tls.Config, discoverer discover.Finder, mappings []*nat.Mapping,
@@ -88,9 +85,7 @@ func NewConnectionService(cfg *config.Wrapper, myID protocol.DeviceID, mdl Model
 		tlsDefaultCommonName: tlsDefaultCommonName,
 		lans:                 lans,
 
-		connType:       make(map[protocol.DeviceID]model.ConnectionType),
-		relaysEnabled:  cfg.Options().RelaysEnabled,
-		lastRelayCheck: make(map[protocol.DeviceID]time.Time),
+		connType: make(map[protocol.DeviceID]model.ConnectionType),
 	}
 	cfg.Subscribe(service)
 
@@ -284,9 +279,12 @@ next:
 }
 
 func (s *Service) connect() {
+	lastRelayCheck := make(map[protocol.DeviceID]time.Time)
+
 	delay := time.Second
 	for {
 		l.Debugln("Reconnect loop")
+		relaysEnabled := s.cfg.Options().RelaysEnabled
 	nextDevice:
 		for deviceID, deviceCfg := range s.cfg.Devices() {
 			if deviceID == s.myID {
@@ -299,7 +297,6 @@ func (s *Service) connect() {
 			paused := s.model.IsPaused(deviceID)
 			connected := s.model.ConnectedTo(deviceID)
 			ct, ok := s.connType[deviceID]
-			relaysEnabled := s.relaysEnabled
 			s.mut.RUnlock()
 
 			if paused {
@@ -338,14 +335,14 @@ func (s *Service) connect() {
 			}
 
 			reconIntv := time.Duration(s.cfg.Options().RelayReconnectIntervalM) * time.Minute
-			if last, ok := s.lastRelayCheck[deviceID]; ok && time.Since(last) < reconIntv {
+			if last, ok := lastRelayCheck[deviceID]; ok && time.Since(last) < reconIntv {
 				l.Debugln("Skipping connecting via relay to", deviceID, "last checked at", last)
 				continue nextDevice
 			}
 
 			l.Debugln("Trying relay connections to", deviceID, relays)
 
-			s.lastRelayCheck[deviceID] = time.Now()
+			lastRelayCheck[deviceID] = time.Now()
 
 			for _, addr := range relays {
 				if conn := s.connectViaRelay(deviceID, addr); conn != nil {
@@ -478,10 +475,6 @@ func (s *Service) VerifyConfiguration(from, to config.Configuration) error {
 }
 
 func (s *Service) CommitConfiguration(from, to config.Configuration) bool {
-	s.mut.Lock()
-	s.relaysEnabled = to.Options.RelaysEnabled
-	s.mut.Unlock()
-
 	// We require a restart if a device as been removed.
 
 	newDevices := make(map[protocol.DeviceID]bool, len(to.Devices))
diff --git a/lib/model/model.go b/lib/model/model.go
index bba92a6695..83d2ee3b50 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1042,13 +1042,6 @@ func (m *Model) AddConnection(conn Connection, hello protocol.HelloMessage) {
 
 	l.Infof(`Device %s client is "%s %s" named "%s"`, deviceID, hello.ClientName, hello.ClientVersion, hello.DeviceName)
 
-	device, ok := m.cfg.Devices()[deviceID]
-	if ok && (device.Name == "" || m.cfg.Options().OverwriteNames) {
-		device.Name = hello.DeviceName
-		m.cfg.SetDevice(device)
-		m.cfg.Save()
-	}
-
 	conn.Start()
 
 	cm := m.generateClusterConfig(deviceID)
@@ -1062,6 +1055,13 @@ func (m *Model) AddConnection(conn Connection, hello protocol.HelloMessage) {
 	m.fmut.RUnlock()
 	m.pmut.Unlock()
 
+	device, ok := m.cfg.Devices()[deviceID]
+	if ok && (device.Name == "" || m.cfg.Options().OverwriteNames) {
+		device.Name = hello.DeviceName
+		m.cfg.SetDevice(device)
+		m.cfg.Save()
+	}
+
 	m.deviceWasSeen(deviceID)
 }