diff --git a/pkg/relay/engine_test.go b/pkg/relay/engine_test.go index 7b7b8104..2d950fe3 100644 --- a/pkg/relay/engine_test.go +++ b/pkg/relay/engine_test.go @@ -14,7 +14,6 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" "git-indra.lan/indra-labs/indra/pkg/messages/intro" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/service" "git-indra.lan/indra-labs/indra/pkg/transport" "git-indra.lan/indra-labs/indra/pkg/util/slice" "git-indra.lan/indra-labs/indra/pkg/util/tests" @@ -88,7 +87,7 @@ func TestClient_SendExit(t *testing.T) { if i == 0 { continue } - e = clients[i].AddServiceToLocalNode(&service.Service{ + e = clients[i].AddServiceToLocalNode(&Service{ Port: port, Transport: sim, RelayRate: 18000 * 4, diff --git a/pkg/relay/node.go b/pkg/relay/node.go index 173cb08a..a8c24e2e 100644 --- a/pkg/relay/node.go +++ b/pkg/relay/node.go @@ -9,7 +9,6 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/ring" - "git-indra.lan/indra-labs/indra/pkg/service" "git-indra.lan/indra-labs/indra/pkg/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) @@ -23,7 +22,7 @@ type Node struct { IdentityBytes pub.Bytes IdentityPrv *prv.Key RelayRate int // Base relay price/Mb. - Services service.Services // Services offered by this peer. + Services Services // Services offered by this peer. HiddenServices Referrers // Hidden services known by peer. Load *ring.BufferLoad // Relay load. Latency *ring.BufferLatency // Latency to peer. @@ -68,7 +67,7 @@ func NewNode(addr *netip.AddrPort, idPub *pub.Key, idPrv *prv.Key, return } -func (n *Node) AddService(s *service.Service) (e error) { +func (n *Node) AddService(s *Service) (e error) { n.Lock() defer n.Unlock() for i := range n.Services { @@ -96,7 +95,7 @@ func (n *Node) DeleteService(port uint16) { } } -func (n *Node) FindService(port uint16) (service *service.Service) { +func (n *Node) FindService(port uint16) (service *Service) { n.Lock() defer n.Unlock() for i := range n.Services { diff --git a/pkg/relay/nodes.go b/pkg/relay/nodes.go index facefe9f..c0b4382f 100644 --- a/pkg/relay/nodes.go +++ b/pkg/relay/nodes.go @@ -7,7 +7,6 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/service" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) @@ -57,7 +56,7 @@ func (sm *SessionManager) ReceiveToLocalNode(port uint16) <-chan slice.Bytes { return sm.GetLocalNode().ReceiveFrom(port) } -func (sm *SessionManager) AddServiceToLocalNode(s *service.Service) (e error) { +func (sm *SessionManager) AddServiceToLocalNode(s *Service) (e error) { sm.Lock() defer sm.Unlock() return sm.GetLocalNode().AddService(s) diff --git a/pkg/service/service.go b/pkg/relay/services.go similarity index 58% rename from pkg/service/service.go rename to pkg/relay/services.go index 79760925..98152e3e 100644 --- a/pkg/service/service.go +++ b/pkg/relay/services.go @@ -1,8 +1,6 @@ -package service +package relay -import ( - "git-indra.lan/indra-labs/indra/pkg/types" -) +import "git-indra.lan/indra-labs/indra/pkg/types" type Service struct { Port uint16