lib/connections: Fully dial resumed devices (syncthing#7798)

jasminesor · Jul 3, 2021 · 1921533 · 1921533
1 parent 89e762f
commit 1921533
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/lib/connections/service.go b/lib/connections/service.go
@@ -786,13 +786,23 @@ func (s *service) CommitConfiguration(from, to config.Configuration) bool {
 
 func (s *service) checkAndSignalConnectLoopOnUpdatedDevices(from, to config.Configuration) {
 	oldDevices := from.DeviceMap()
+	dial := false
+	s.dialNowDevicesMut.Lock()
 	for _, dev := range to.Devices {
-		oldDev, ok := oldDevices[dev.DeviceID]
-		if !ok || !util.EqualStrings(oldDev.Addresses, dev.Addresses) {
-			s.scheduleDialNow()
-			break
+		if dev.Paused {
+			continue
 		}
+		if oldDev, ok := oldDevices[dev.DeviceID]; !ok || oldDev.Paused {
+			s.dialNowDevices[dev.DeviceID] = struct{}{}
+			dial = true
+		} else if !util.EqualStrings(oldDev.Addresses, dev.Addresses) {
+			dial = true
+		}
+	}
+	if dial {
+		s.scheduleDialNow()
 	}
+	s.dialNowDevicesMut.Unlock()
 }
 
 func (s *service) scheduleDialNow() {