diff --git a/cmd/syncthing/connections.go b/cmd/syncthing/connections.go index 2ad8e86c..c1021997 100644 --- a/cmd/syncthing/connections.go +++ b/cmd/syncthing/connections.go @@ -290,7 +290,7 @@ func (s *connectionSvc) connect() { } s.conns <- model.IntermediateConnection{ - conn, model.ConnectionTypeBasicDial, + conn, model.ConnectionTypeDirectDial, } continue nextDevice } diff --git a/cmd/syncthing/connections_tcp.go b/cmd/syncthing/connections_tcp.go index 1c051e29..515df609 100644 --- a/cmd/syncthing/connections_tcp.go +++ b/cmd/syncthing/connections_tcp.go @@ -99,7 +99,7 @@ func tcpListener(uri *url.URL, tlsCfg *tls.Config, conns chan<- model.Intermedia } conns <- model.IntermediateConnection{ - tc, model.ConnectionTypeBasicAccept, + tc, model.ConnectionTypeDirectAccept, } } } diff --git a/lib/model/connection.go b/lib/model/connection.go index 194a71a1..d7c2bda0 100644 --- a/lib/model/connection.go +++ b/lib/model/connection.go @@ -25,8 +25,8 @@ type Connection struct { } const ( - ConnectionTypeBasicAccept ConnectionType = iota - ConnectionTypeBasicDial + ConnectionTypeDirectAccept ConnectionType = iota + ConnectionTypeDirectDial ConnectionTypeRelayAccept ConnectionTypeRelayDial ) @@ -35,10 +35,10 @@ type ConnectionType int func (t ConnectionType) String() string { switch t { - case ConnectionTypeBasicAccept: - return "basic-accept" - case ConnectionTypeBasicDial: - return "basic-dial" + case ConnectionTypeDirectAccept: + return "direct-accept" + case ConnectionTypeDirectDial: + return "direct-dial" case ConnectionTypeRelayAccept: return "relay-accept" case ConnectionTypeRelayDial: @@ -48,5 +48,5 @@ func (t ConnectionType) String() string { } func (t ConnectionType) IsDirect() bool { - return t == ConnectionTypeBasicAccept || t == ConnectionTypeBasicDial + return t == ConnectionTypeDirectAccept || t == ConnectionTypeDirectDial } diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 08f3889a..31df11f4 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -285,7 +285,7 @@ func BenchmarkRequest(b *testing.B) { m.AddConnection(Connection{ &net.TCPConn{}, fc, - ConnectionTypeBasicAccept, + ConnectionTypeDirectAccept, }) m.Index(device1, "default", files, 0, nil) @@ -328,7 +328,7 @@ func TestDeviceRename(t *testing.T) { m.AddConnection(Connection{ &net.TCPConn{}, fc, - ConnectionTypeBasicAccept, + ConnectionTypeDirectAccept, }) m.ServeBackground()