mleku/indra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved service into relay

Browse Source
This commit is contained in:
херетик
2023-03-01 06:58:19 +00:00
parent 919d4187e6
commit cde6d19b50
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/relay/engine_test.go
View File

@@ -14,7 +14,6 @@ import (
"git-indra.lan/indra-labs/indra/pkg/crypto/sha256" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
"git-indra.lan/indra-labs/indra/pkg/messages/intro" "git-indra.lan/indra-labs/indra/pkg/messages/intro"
log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" 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/transport"
"git-indra.lan/indra-labs/indra/pkg/util/slice" "git-indra.lan/indra-labs/indra/pkg/util/slice"
"git-indra.lan/indra-labs/indra/pkg/util/tests" "git-indra.lan/indra-labs/indra/pkg/util/tests"
@@ -88,7 +87,7 @@ func TestClient_SendExit(t *testing.T) {
if i == 0 { if i == 0 {
continue continue
} }
e = clients[i].AddServiceToLocalNode(&service.Service{ e = clients[i].AddServiceToLocalNode(&Service{
Port: port, Port: port,
Transport: sim, Transport: sim,
RelayRate: 18000 * 4, RelayRate: 18000 * 4,

7
pkg/relay/node.go
View File

@@ -9,7 +9,6 @@ import (
"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "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/crypto/nonce"
"git-indra.lan/indra-labs/indra/pkg/ring" "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/types"
"git-indra.lan/indra-labs/indra/pkg/util/slice" "git-indra.lan/indra-labs/indra/pkg/util/slice"
) )
@@ -23,7 +22,7 @@ type Node struct {
IdentityBytes pub.Bytes IdentityBytes pub.Bytes
IdentityPrv *prv.Key IdentityPrv *prv.Key
RelayRate int // Base relay price/Mb. 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. HiddenServices Referrers // Hidden services known by peer.
Load *ring.BufferLoad // Relay load. Load *ring.BufferLoad // Relay load.
Latency *ring.BufferLatency // Latency to peer. Latency *ring.BufferLatency // Latency to peer.
@@ -68,7 +67,7 @@ func NewNode(addr *netip.AddrPort, idPub *pub.Key, idPrv *prv.Key,
return return
} }
func (n *Node) AddService(s *service.Service) (e error) { func (n *Node) AddService(s *Service) (e error) {
n.Lock() n.Lock()
defer n.Unlock() defer n.Unlock()
for i := range n.Services { 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() n.Lock()
defer n.Unlock() defer n.Unlock()
for i := range n.Services { for i := range n.Services {

3
pkg/relay/nodes.go
View File

@@ -7,7 +7,6 @@ import (
"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "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/key/pub"
"git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "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" "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) return sm.GetLocalNode().ReceiveFrom(port)
} }
func (sm *SessionManager) AddServiceToLocalNode(s *service.Service) (e error) { func (sm *SessionManager) AddServiceToLocalNode(s *Service) (e error) {
sm.Lock() sm.Lock()
defer sm.Unlock() defer sm.Unlock()
return sm.GetLocalNode().AddService(s) return sm.GetLocalNode().AddService(s)

6
pkg/service/service.go → pkg/relay/services.go
View File

@@ -1,8 +1,6 @@
package service package relay
import ( import "git-indra.lan/indra-labs/indra/pkg/types"
"git-indra.lan/indra-labs/indra/pkg/types"
)
type Service struct { type Service struct {
Port uint16 Port uint16