Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/internal/protocol/clock.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func StartTicker() {
// Cleanup: remove peers that have been disconnected for a long time
// Define staleness threshold
staleAfter := 10 * time.Minute
table := *GetNodeTable()
table := *GetAllPeers()
now := time.Now().Unix()
for id, p := range table {
if !p.Connected && p.LastSeen > 0 {
Expand Down
2 changes: 1 addition & 1 deletion src/internal/protocol/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func AllPeers() []*PeerWithStatus {

func ConnectedBootstraps() []string {
var bootstraps = []string{}
dnt := GetNodeTable()
dnt := GetAllPeers()
host, _ := GetP2PNode(nil)
for _, p := range *dnt {
if p.PublicAddress != "" {
Expand Down
22 changes: 16 additions & 6 deletions src/internal/protocol/node_table.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type NodeTable map[string]Peer
var dnt *NodeTable
var tableUpdateSem = make(chan struct{}, 1) // capacity 1 → max 1 goroutine at a time

func GetNodeTable() *NodeTable {
func getNodeTable() *NodeTable {
dntOnce.Do(func() {
dnt = &NodeTable{}
})
Expand Down Expand Up @@ -125,7 +125,7 @@ func DeleteNodeTable() {
}

func UpdateNodeTableHook(key ds.Key, value []byte) {
table := *GetNodeTable()
table := *getNodeTable()
var peer Peer
err := json.Unmarshal(value, &peer)
common.ReportError(err, "Error while unmarshalling peer")
Expand All @@ -145,14 +145,14 @@ func UpdateNodeTableHook(key ds.Key, value []byte) {
}

func DeleteNodeTableHook(key ds.Key) {
table := *GetNodeTable()
table := *getNodeTable()
tableUpdateSem <- struct{}{}
defer func() { <-tableUpdateSem }() // Release on exit
delete(table, key.String())
}

func GetPeerFromTable(peerId string) (Peer, error) {
table := *GetNodeTable()
table := *getNodeTable()
tableUpdateSem <- struct{}{}
defer func() { <-tableUpdateSem }() // Release on exit
peer, ok := table["/"+peerId]
Expand All @@ -166,14 +166,24 @@ func GetConnectedPeers() *NodeTable {
var connected = NodeTable{}
tableUpdateSem <- struct{}{}
defer func() { <-tableUpdateSem }() // Release on exit
for id, p := range *GetNodeTable() {
for id, p := range *getNodeTable() {
if p.Connected {
connected[id] = p
}
}
return &connected
}

func GetAllPeers() *NodeTable {
var peers = NodeTable{}
tableUpdateSem <- struct{}{}
defer func() { <-tableUpdateSem }() // Release on exit
for id, p := range *getNodeTable() {
peers[id] = p
}
return &peers
}

func GetService(name string) (Service, error) {
host, _ := GetP2PNode(nil)
store, _ := GetCRDTStore()
Expand All @@ -193,7 +203,7 @@ func GetService(name string) (Service, error) {

func GetAllProviders(serviceName string) ([]Peer, error) {
var providers []Peer
table := *GetNodeTable()
table := *getNodeTable()
tableUpdateSem <- struct{}{}
defer func() { <-tableUpdateSem }() // Release on exit
for _, peer := range table {
Expand Down
4 changes: 2 additions & 2 deletions src/internal/protocol/node_table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

func TestUpdateNodeTableHookAndGetPeer(t *testing.T) {
_ = GetNodeTable()
_ = GetAllPeers()
p := Peer{ID: "peer1", PublicAddress: "1.2.3.4"}
b, _ := json.Marshal(p)
UpdateNodeTableHook(ds.NewKey("peer1"), b)
Expand All @@ -23,7 +23,7 @@ func TestUpdateNodeTableHookAndGetPeer(t *testing.T) {
}

func TestDeleteNodeTableHook(t *testing.T) {
table := GetNodeTable()
table := GetAllPeers()
p := Peer{ID: "peer2", PublicAddress: "5.6.7.8"}
b, _ := json.Marshal(p)
UpdateNodeTableHook(ds.NewKey("peer2"), b)
Expand Down
Loading