浏览代码

lib/connections: Return exported intf from exported function (#5947)

Simon Frei 6 年之前
父节点
当前提交
cf40ed6cec
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 4 0
      lib/api/mocked_connections_test.go
  2. 2 3
      lib/connections/service.go

+ 4 - 0
lib/api/mocked_connections_test.go

@@ -27,3 +27,7 @@ func (m *mockedConnections) NATType() string {
 func (m *mockedConnections) Serve() {}
 func (m *mockedConnections) Serve() {}
 
 
 func (m *mockedConnections) Stop() {}
 func (m *mockedConnections) Stop() {}
+
+func (m *mockedConnections) ExternalAddresses() []string { return nil }
+
+func (m *mockedConnections) AllAddresses() []string { return nil }

+ 2 - 3
lib/connections/service.go

@@ -90,6 +90,7 @@ var tlsVersionNames = map[uint16]string{
 // dialers. Successful connections are handed to the model.
 // dialers. Successful connections are handed to the model.
 type Service interface {
 type Service interface {
 	suture.Service
 	suture.Service
+	discover.AddressLister
 	ListenerStatus() map[string]ListenerStatusEntry
 	ListenerStatus() map[string]ListenerStatusEntry
 	ConnectionStatus() map[string]ConnectionStatusEntry
 	ConnectionStatus() map[string]ConnectionStatusEntry
 	NATType() string
 	NATType() string
@@ -129,9 +130,7 @@ type service struct {
 	connectionStatus    map[string]ConnectionStatusEntry // address -> latest error/status
 	connectionStatus    map[string]ConnectionStatusEntry // address -> latest error/status
 }
 }
 
 
-func NewService(cfg config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *tls.Config, discoverer discover.Finder,
-	bepProtocolName string, tlsDefaultCommonName string) *service {
-
+func NewService(cfg config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *tls.Config, discoverer discover.Finder, bepProtocolName string, tlsDefaultCommonName string) Service {
 	service := &service{
 	service := &service{
 		Supervisor: suture.New("connections.Service", suture.Spec{
 		Supervisor: suture.New("connections.Service", suture.Spec{
 			Log: func(line string) {
 			Log: func(line string) {