perso/syncthing-arm
Archived
4
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

New device, folder prompts (fixes #120, fixes #330)

Browse Source
This commit is contained in:
Audrius Butkevicius committed 2015-01-03 23:06:41 +00:00
1 parent 9a946eed80
commit 56ccb5b2ab
8 files changed
+194 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmd/syncthing/main.go
+10 -5
View File
@@ -975,11 +975,16 @@ next:
}
}
events.Default.Log(events.DeviceRejected, map[string]string{
"device": remoteID.String(),
"address": conn.RemoteAddr().String(),
})
l.Infof("Connection from %s with unknown device ID %s; ignoring", conn.RemoteAddr(), remoteID)
if !cfg.IgnoredDevice(remoteID) {
events.Default.Log(events.DeviceRejected, map[string]string{
"device": remoteID.String(),
"address": conn.RemoteAddr().String(),
})
l.Infof("Connection from %s with unknown device ID %s", conn.RemoteAddr(), remoteID)
} else {
l.Infof("Connection from %s with ignored device ID %s", conn.RemoteAddr(), remoteID)
}
conn.Close()
}
}