mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-23 03:18:59 +00:00
* Trigger connection loop on config device addition (fixes #7600) * Also check for device address equality * Move EqualStrings from api_test to utils, and use in connections/service.go * Make sure CommitConfiguration cannot block due on the deviceAddressesChanged channel * Update lib/connections/service.go Co-authored-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
parent
8734fa65fc
commit
66662cd678
@ -42,6 +42,7 @@ import (
|
|||||||
"github.com/syncthing/syncthing/lib/sync"
|
"github.com/syncthing/syncthing/lib/sync"
|
||||||
"github.com/syncthing/syncthing/lib/tlsutil"
|
"github.com/syncthing/syncthing/lib/tlsutil"
|
||||||
"github.com/syncthing/syncthing/lib/ur"
|
"github.com/syncthing/syncthing/lib/ur"
|
||||||
|
"github.com/syncthing/syncthing/lib/util"
|
||||||
"github.com/thejerf/suture/v4"
|
"github.com/thejerf/suture/v4"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -126,6 +127,7 @@ func TestStopAfterBrokenConfig(t *testing.T) {
|
|||||||
|
|
||||||
srv := New(protocol.LocalDeviceID, w, "", "syncthing", nil, nil, nil, events.NoopLogger, nil, nil, nil, nil, nil, nil, false).(*service)
|
srv := New(protocol.LocalDeviceID, w, "", "syncthing", nil, nil, nil, events.NoopLogger, nil, nil, nil, nil, nil, nil, false).(*service)
|
||||||
defer os.Remove(token)
|
defer os.Remove(token)
|
||||||
|
|
||||||
srv.started = make(chan string)
|
srv.started = make(chan string)
|
||||||
|
|
||||||
sup := suture.New("test", svcutil.SpecWithDebugLogger(l))
|
sup := suture.New("test", svcutil.SpecWithDebugLogger(l))
|
||||||
@ -1178,7 +1180,7 @@ func TestBrowse(t *testing.T) {
|
|||||||
|
|
||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
ret := browseFiles(tc.current, fs.FilesystemTypeBasic)
|
ret := browseFiles(tc.current, fs.FilesystemTypeBasic)
|
||||||
if !equalStrings(ret, tc.returns) {
|
if !util.EqualStrings(ret, tc.returns) {
|
||||||
t.Errorf("browseFiles(%q) => %q, expected %q", tc.current, ret, tc.returns)
|
t.Errorf("browseFiles(%q) => %q, expected %q", tc.current, ret, tc.returns)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1389,18 +1391,6 @@ func TestSanitizedHostname(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func equalStrings(a, b []string) bool {
|
|
||||||
if len(a) != len(b) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for i := range a {
|
|
||||||
if a[i] != b[i] {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// runningInContainer returns true if we are inside Docker or LXC. It might
|
// runningInContainer returns true if we are inside Docker or LXC. It might
|
||||||
// be prone to false negatives if things change in the future, but likely
|
// be prone to false negatives if things change in the future, but likely
|
||||||
// not false positives.
|
// not false positives.
|
||||||
|
@ -141,6 +141,7 @@ type service struct {
|
|||||||
natService *nat.Service
|
natService *nat.Service
|
||||||
evLogger events.Logger
|
evLogger events.Logger
|
||||||
|
|
||||||
|
deviceAddressesChanged chan struct{}
|
||||||
listenersMut sync.RWMutex
|
listenersMut sync.RWMutex
|
||||||
listeners map[string]genericListener
|
listeners map[string]genericListener
|
||||||
listenerTokens map[string]suture.ServiceToken
|
listenerTokens map[string]suture.ServiceToken
|
||||||
@ -165,6 +166,7 @@ func NewService(cfg config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *t
|
|||||||
natService: nat.NewService(myID, cfg),
|
natService: nat.NewService(myID, cfg),
|
||||||
evLogger: evLogger,
|
evLogger: evLogger,
|
||||||
|
|
||||||
|
deviceAddressesChanged: make(chan struct{}, 1),
|
||||||
listenersMut: sync.NewRWMutex(),
|
listenersMut: sync.NewRWMutex(),
|
||||||
listeners: make(map[string]genericListener),
|
listeners: make(map[string]genericListener),
|
||||||
listenerTokens: make(map[string]suture.ServiceToken),
|
listenerTokens: make(map[string]suture.ServiceToken),
|
||||||
@ -392,6 +394,7 @@ func (s *service) connect(ctx context.Context) error {
|
|||||||
l.Debugln("Next connection loop in", sleep)
|
l.Debugln("Next connection loop in", sleep)
|
||||||
|
|
||||||
select {
|
select {
|
||||||
|
case <-s.deviceAddressesChanged:
|
||||||
case <-time.After(sleep):
|
case <-time.After(sleep):
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
@ -675,6 +678,8 @@ func (s *service) CommitConfiguration(from, to config.Configuration) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s.checkAndSignalConnectLoopOnUpdatedDevices(from, to)
|
||||||
|
|
||||||
s.listenersMut.Lock()
|
s.listenersMut.Lock()
|
||||||
seen := make(map[string]struct{})
|
seen := make(map[string]struct{})
|
||||||
for _, addr := range to.Options.ListenAddresses() {
|
for _, addr := range to.Options.ListenAddresses() {
|
||||||
@ -733,6 +738,25 @@ func (s *service) CommitConfiguration(from, to config.Configuration) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *service) checkAndSignalConnectLoopOnUpdatedDevices(from, to config.Configuration) {
|
||||||
|
oldDevices := make(map[protocol.DeviceID]config.DeviceConfiguration, len(from.Devices))
|
||||||
|
for _, dev := range from.Devices {
|
||||||
|
oldDevices[dev.DeviceID] = dev
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, dev := range to.Devices {
|
||||||
|
oldDev, ok := oldDevices[dev.DeviceID]
|
||||||
|
if !ok || !util.EqualStrings(oldDev.Addresses, dev.Addresses) {
|
||||||
|
select {
|
||||||
|
case s.deviceAddressesChanged <- struct{}{}:
|
||||||
|
default:
|
||||||
|
// channel is blocked - a config update is already pending for the connection loop.
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *service) AllAddresses() []string {
|
func (s *service) AllAddresses() []string {
|
||||||
s.listenersMut.RLock()
|
s.listenersMut.RLock()
|
||||||
var addrs []string
|
var addrs []string
|
||||||
|
@ -280,3 +280,15 @@ func NiceDurationString(d time.Duration) string {
|
|||||||
}
|
}
|
||||||
return d.String()
|
return d.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func EqualStrings(a, b []string) bool {
|
||||||
|
if len(a) != len(b) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for i := range a {
|
||||||
|
if a[i] != b[i] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user