From 94761d04724226dd743b445a2f2ddb2b8564668d Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 11 May 2014 14:54:26 -0300 Subject: [PATCH] Don't warn about legit requests for deleted files (fixes #173) --- cmd/syncthing/model.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/syncthing/model.go b/cmd/syncthing/model.go index bda17b36..852c4285 100644 --- a/cmd/syncthing/model.go +++ b/cmd/syncthing/model.go @@ -323,13 +323,15 @@ func (m *Model) Request(nodeID, repo, name string, offset int64, size int) ([]by } lf := r.Get(cid.LocalID, name) - if offset > lf.Size { - warnf("SECURITY (nonexistent file) REQ(in): %s: %q o=%d s=%d", nodeID, name, offset, size) - return nil, ErrNoSuchFile + if lf.Suppressed || lf.Flags&protocol.FlagDeleted != 0 { + return nil, ErrInvalid } - if lf.Suppressed { - return nil, ErrInvalid + if offset > lf.Size { + if debugNet { + dlog.Printf("REQ(in; nonexistent): %s: %q o=%d s=%d", nodeID, name, offset, size) + } + return nil, ErrNoSuchFile } if debugNet && nodeID != "" {