octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-04-11 03:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: s/Basic/Direct/ on connection type

Browse Source
This commit is contained in:
Jakob Borg 2015-08-23 08:43:33 +02:00
parent 42acf0ed60
commit f691040936
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/connections.go
View File

@ -290,7 +290,7 @@ func (s *connectionSvc) connect() {
}
s.conns <- model.IntermediateConnection{
conn, model.ConnectionTypeBasicDial,
conn, model.ConnectionTypeDirectDial,
}
continue nextDevice
}

2
cmd/syncthing/connections_tcp.go
View File

@ -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,
}
}
}

14
lib/model/connection.go
View File

@ -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
}

4
lib/model/model_test.go
View File

@ -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()