perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Undo the hash algorithm additions; retain flag checks

Browse Source
This commit is contained in:
Jakob Borg
2016-01-12 12:12:33 +01:00
parent 357089a438
commit 8b3d75b339
4 changed files with 5 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/model.go
View File

@@ -637,11 +637,10 @@ nextFolder:
for _, folder := range cm.Folders {
cfg := m.folderCfgs[folder.ID]
if _, err := protocol.HashAlgorithmFromFlagBits(folder.Flags); err != nil {
// The hash algorithm failed to deserialize, so it's not SHA256
// (the only acceptable algorithm).
l.Warnf("Device %v: %v", deviceID, err)
cfg.Invalid = err.Error() + " from " + deviceID.String()
if folder.Flags&^protocol.FlagFolderAll != 0 {
// There are flags set that we don't know what they mean. Scary!
l.Warnf("Device %v: unknown flags for folder %s", deviceID, folder.ID)
cfg.Invalid = fmt.Sprintf("Unknown flags from device %v", deviceID)
m.cfg.SetFolder(cfg)
if srv := m.folderRunners[folder.ID]; srv != nil {
srv.setError(fmt.Errorf(cfg.Invalid))