lib/connections: Silence vet and lint warnings

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2971
This commit is contained in:
Jakob Borg
2016-04-13 11:50:51 +00:00
parent 19b4f3bfb4
commit 52c7804f32
4 changed files with 13 additions and 8 deletions

View File

@@ -268,9 +268,9 @@ next:
s.mut.Lock()
s.model.AddConnection(model.Connection{
c,
protoConn,
c.Type,
Conn: c,
Connection: protoConn,
Type: c.Type,
}, hello)
s.connType[remoteID] = c.Type
s.mut.Unlock()
@@ -319,7 +319,8 @@ func (s *Service) connect() {
s.model.Close(deviceID, fmt.Errorf("switching connections"))
}
s.conns <- model.IntermediateConnection{
conn, model.ConnectionTypeDirectDial,
Conn: conn,
Type: model.ConnectionTypeDirectDial,
}
continue nextDevice
}
@@ -350,7 +351,8 @@ func (s *Service) connect() {
if conn := s.connectViaRelay(deviceID, addr); conn != nil {
l.Debugln("Connecting to", deviceID, "via", addr, "succeeded")
s.conns <- model.IntermediateConnection{
conn, model.ConnectionTypeRelayDial,
Conn: conn,
Type: model.ConnectionTypeRelayDial,
}
continue nextDevice
}