octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-24 15:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model, lib/protocol: Sequence ClusterConfig properly (fixes #3448)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3452
This commit is contained in:
Jakob Borg 2016-07-27 21:36:25 +00:00 committed by Audrius Butkevicius
parent 7c7e8648ff
commit aafc96f58f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/model.go
View File

@ -649,8 +649,11 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
tempIndexFolders := make([]string, 0, len(cm.Folders)) tempIndexFolders := make([]string, 0, len(cm.Folders))
m.pmut.RLock() m.pmut.RLock()
conn := m.conn[deviceID] conn, ok := m.conn[deviceID]
m.pmut.RUnlock() m.pmut.RUnlock()
if !ok {
panic("bug: ClusterConfig called on closed or nonexistent connection")
}
m.fmut.Lock() m.fmut.Lock()
for _, folder := range cm.Folders { for _, folder := range cm.Folders {

2
lib/protocol/protocol.go
View File

@ -302,7 +302,7 @@ func (c *rawConnection) readerLoop() (err error) {
if state != stateInitial { if state != stateInitial {
return fmt.Errorf("protocol error: cluster config message in state %d", state) return fmt.Errorf("protocol error: cluster config message in state %d", state)
} }
go c.receiver.ClusterConfig(c.id, *msg) c.receiver.ClusterConfig(c.id, *msg)
state = stateReady state = stateReady
case *Index: case *Index: