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

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

Browse Source
This commit is contained in:
Audrius Butkevicius
2014-12-27 23:12:12 +00:00
parent 9a946eed80
commit 56ccb5b2ab
8 changed files with 194 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/syncthing/main.go
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()
}
}