Skip to content
Draft
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
13 changes: 13 additions & 0 deletions core/ipc_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ func handleStatus(n *Nylon, req *protocol.StatusRequest) *protocol.IpcResponse {
Neighbours: buildNeighbours(n, wgStats),
Routes: buildRouteTables(n),
FeasibilityDistances: buildFeasibilityDistances(n),
Nodes: buildNodes(n),
}},
}
}
Expand Down Expand Up @@ -298,6 +299,18 @@ func buildFeasibilityDistances(n *Nylon) []*protocol.FeasibilityDistance {
return entries
}

func buildNodes(n *Nylon) []*protocol.NodeInfo {
nodes := make([]*protocol.NodeInfo, 0)
for _, node := range n.CentralCfg.GetNodes() {
addrs := make([]string, 0, len(node.Addresses))
for _, addr := range node.Addresses {
addrs = append(addrs, addr.String())
}
nodes = append(nodes, &protocol.NodeInfo{NodeId: string(node.Id), Addresses: addrs})
}
return nodes
}

func advertisementsForNode(n *Nylon, id state.NodeId) []*protocol.Advertisement {
ads := make([]*protocol.Advertisement, 0)
for prefix, adv := range n.RouterState.Advertised {
Expand Down
21 changes: 21 additions & 0 deletions core/ipc_handler_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
package core

import (
"net/netip"
"testing"
"time"

"github.com/encodeous/nylon/protocol"
"github.com/encodeous/nylon/state"
"github.com/stretchr/testify/require"
)

func TestBuildNodes(t *testing.T) {
n := &Nylon{}
n.CentralCfg = state.CentralCfg{
Routers: []state.RouterCfg{{NodeCfg: state.NodeCfg{
Id: "a",
Addresses: []netip.Addr{netip.MustParseAddr("10.0.0.1"), netip.MustParseAddr("fd00::1")},
}}},
Clients: []state.ClientCfg{{NodeCfg: state.NodeCfg{Id: "phone"}}},
}

nodes := buildNodes(n)
require.Len(t, nodes, 2)
require.Equal(t, "a", nodes[0].NodeId)
require.Equal(t, []string{"10.0.0.1", "fd00::1"}, nodes[0].Addresses)
require.Equal(t, "phone", nodes[1].NodeId)
require.Empty(t, nodes[1].Addresses)
}

func TestIPCProbeTimeout(t *testing.T) {
tests := []struct {
name string
Expand Down
5 changes: 5 additions & 0 deletions integration/ipc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ func TestIPCStatus(t *testing.T) {
assert.GreaterOrEqual(t, len(s.GetRoutes().GetSelected()), 1)
assert.GreaterOrEqual(t, len(s.GetRoutes().GetForward()), 1)
assert.GreaterOrEqual(t, len(s.GetFeasibilityDistances()), 1)

nodes := s.GetNodes()
require.Len(t, nodes, 2)
assert.Equal(t, "a", nodes[0].NodeId)
assert.Equal(t, "b", nodes[1].NodeId)
}

func TestIPCProbeReportsTimeout(t *testing.T) {
Expand Down
Loading