arednlink: maybe ***

Author: USA-RedDragon

cmd/arednlink.go

@@ -28,7 +28,8 @@ var (
 
 func runArednlink(cmd *cobra.Command, _ []string) error {
 	config := config.GetConfig(cmd)
-	routes := xsync.NewMapOf[string, string]()
+	rts := xsync.NewMapOf[string, string]()
+	routes := &rts
 	services := xsync.NewMapOf[string, string]()
 	hosts := xsync.NewMapOf[string, string]()
 	broadcastChan := make(chan arednlink.Message, 1024)

internal/arednlink/connection.go

@@ -20,7 +20,7 @@ type Connection struct {
 	broadcastChan chan Message
 	hosts         *xsync.MapOf[string, string]
 	services      *xsync.MapOf[string, string]
-	routes        **xsync.MapOf[string, string]
+	routes        ***xsync.MapOf[string, string]
 	iface         string
 }
 
@@ -30,7 +30,7 @@ func HandleConnection(
 	broadcastChan chan Message,
 	hosts *xsync.MapOf[string, string],
 	services *xsync.MapOf[string, string],
-	routes **xsync.MapOf[string, string],
+	routes ***xsync.MapOf[string, string],
 ) {
 	// conn.RemoteAddr().String() should be in the format [fe80::ac1e:2c4%wgc32]:38428
 	// where wgc32 is the interface name
@@ -205,8 +205,8 @@ func (c *Connection) start() {
 }
 
 func (c *Connection) validNextHop(cmd Command, srcIP net.IP) bool {
-	route, hasRoute := (*c.routes).Load(srcIP.String())
-	slog.Info("routes", "routes", c.routes)
+	route, hasRoute := (**c.routes).Load(srcIP.String())
+	slog.Info("routes", "routes", *c.routes)
 	slog.Info("arednlink: valid next hop", "command", cmd, "source", srcIP, "route", route, "hasRoute", hasRoute, "myiface", c.iface, "myip", net.ParseIP(c.config.NodeIP))
 	if srcIP != nil && !srcIP.Equal(net.ParseIP(c.config.NodeIP)) && (cmd == CommandSync || (hasRoute && route == c.iface)) {
 		return true

internal/arednlink/pollers/poller.go

@@ -21,7 +21,7 @@ type Manager struct {
 	ctx           context.Context
 	cancel        context.CancelFunc
 	wg            sync.WaitGroup
-	routes        **xsync.MapOf[string, string]
+	routes        ***xsync.MapOf[string, string]
 	hosts         *xsync.MapOf[string, string]
 	services      *xsync.MapOf[string, string]
 	config        *config.Config
@@ -31,7 +31,7 @@ type Manager struct {
 func NewManager(
 	ctx context.Context,
 	config *config.Config,
-	routes **xsync.MapOf[string, string],
+	routes ***xsync.MapOf[string, string],
 	hosts *xsync.MapOf[string, string],
 	services *xsync.MapOf[string, string],
 	broadcastChan chan arednlink.Message,

internal/arednlink/pollers/route.go

@@ -17,7 +17,7 @@ const (
 )
 
 type RoutePoller struct {
-	routes        **xsync.MapOf[string, string]
+	routes        ***xsync.MapOf[string, string]
 	hosts         *xsync.MapOf[string, string]
 	services      *xsync.MapOf[string, string]
 	config        *config.Config
@@ -32,7 +32,7 @@ type Route struct {
 
 func NewRoutePoller(
 	config *config.Config,
-	routes **xsync.MapOf[string, string],
+	routes ***xsync.MapOf[string, string],
 	hosts *xsync.MapOf[string, string],
 	services *xsync.MapOf[string, string],
 	broadcastChan chan arednlink.Message,
@@ -78,7 +78,7 @@ func (p *RoutePoller) Poll() error {
 		}
 	}
 
-	oldRoutes := *p.routes
+	oldRoutes := **p.routes
 	newRoutes := xsync.NewMapOf[string, []net.IP]()
 	hostRoutes := xsync.NewMapOf[string, string]()
 	for _, route := range routes {
@@ -142,8 +142,9 @@ func (p *RoutePoller) Poll() error {
 			newRoutes.Store(route.OutboundIface, existingIPs)
 		}
 	}
-	slog.Info("RoutePoller: re-pointing routes", "oldRoutes", p.routes, "newRoutes", &hostRoutes)
-	p.routes = &hostRoutes
+	rts := &hostRoutes
+	slog.Info("RoutePoller: re-pointing routes", "oldRoutes", *p.routes, "newRoutes", rts)
+	p.routes = &rts
 
 	oldRoutes.Range(func(ip string, _ string) bool {
 		p.hosts.Delete(ip)

internal/arednlink/server.go

@@ -24,12 +24,12 @@ type Server struct {
 	hosts         *xsync.MapOf[string, string]
 	services      *xsync.MapOf[string, string]
 	broadcastChan chan Message
-	routes        **xsync.MapOf[string, string]
+	routes        ***xsync.MapOf[string, string]
 }
 
 func NewServer(
 	config *config.Config,
-	routes **xsync.MapOf[string, string],
+	routes ***xsync.MapOf[string, string],
 	hosts *xsync.MapOf[string, string],
 	services *xsync.MapOf[string, string],
 	broadcastChan chan Message,