36-add-route-path-into-route-object

Added the route path into the route object so that we can
see what meshes packets are routed across.

pkg/mesh/config.go

@@ -108,14 +108,35 @@ func (m *WgMeshConfigApplyer) convertMeshNode(node MeshNode, device *wgtypes.Dev
 
 // getRoutes: finds the routes with the least hop distance. If more than one route exists
 // consistently hash to evenly spread the distribution of traffic
-func (m *WgMeshConfigApplyer) getRoutes(mesh MeshSnapshot) map[string][]routeNode {
+func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]routeNode {
+	mesh, _ := meshProvider.GetMesh()
+
 	routes := make(map[string][]routeNode)
 
+	meshPrefixes := lib.Map(lib.MapValues(m.meshManager.GetMeshes()), func(mesh MeshProvider) *net.IPNet {
+		ula := &ip.ULABuilder{}
+		ipNet, _ := ula.GetIPNet(mesh.GetMeshId())
+
+		return ipNet
+	})
+
 	for _, node := range mesh.GetNodes() {
-		for _, route := range node.GetRoutes() {
+		pubKey, _ := node.GetPublicKey()
+		meshRoutes, _ := meshProvider.GetRoutes(pubKey.String())
+
+		for _, route := range meshRoutes {
+			if lib.Contains(meshPrefixes, func(prefix *net.IPNet) bool {
+				if prefix == nil || route == nil || route.GetDestination() == nil {
+					return false
+				}
+
+				return prefix.Contains(route.GetDestination().IP)
+			}) {
+				continue
+			}
+
 			destination := route.GetDestination().String()
 			otherRoute, ok := routes[destination]
-			pubKey, _ := node.GetPublicKey()
 
 			rn := routeNode{
 				gateway: pubKey.String(),
@@ -126,7 +147,7 @@ func (m *WgMeshConfigApplyer) getRoutes(mesh MeshSnapshot) map[string][]routeNod
 				otherRoute = make([]routeNode, 1)
 				otherRoute[0] = rn
 				routes[destination] = otherRoute
-			} else if otherRoute[0].route.GetHopCount() > route.GetHopCount() {
+			} else if route.GetHopCount() < otherRoute[0].route.GetHopCount() {
 				otherRoute[0] = rn
 			} else if otherRoute[0].route.GetHopCount() == route.GetHopCount() {
 				routes[destination] = append(otherRoute, rn)
@@ -160,7 +181,7 @@ func (m *WgMeshConfigApplyer) updateWgConf(mesh MeshProvider) error {
 	}
 
 	peerToClients := make(map[string][]net.IPNet)
-	routes := m.getRoutes(snap)
+	routes := m.getRoutes(mesh)
 	installedRoutes := make([]lib.Route, 0)
 
 	for _, n := range nodes {

pkg/mesh/route.go

@@ -1,13 +1,9 @@
 package mesh
 
 import (
-	"fmt"
-	"net"
-
 	"github.com/tim-beatham/wgmesh/pkg/ip"
 	"github.com/tim-beatham/wgmesh/pkg/lib"
 	logging "github.com/tim-beatham/wgmesh/pkg/log"
-	"golang.org/x/sys/unix"
 )
 
 type RouteManager interface {
@@ -57,6 +53,7 @@ func (r *RouteManagerImpl) UpdateRoutes() error {
 			err = mesh2.AddRoutes(NodeID(self), append(lib.MapValues(routes), &RouteStub{
 				Destination: ipNet,
 				HopCount:    0,
+				Path:        make([]string, 0),
 			})...)
 
 			if err != nil {
@@ -91,110 +88,6 @@ func (r *RouteManagerImpl) RemoveRoutes(meshId string) error {
 	return nil
 }
 
-// AddRoute adds a route to the given interface
-func (m *RouteManagerImpl) addRoute(ifName string, meshPrefix string, routes ...lib.Route) error {
-	rtnl, err := lib.NewRtNetlinkConfig()
-
-	if err != nil {
-		return fmt.Errorf("failed to create config: %w", err)
-	}
-	defer rtnl.Close()
-
-	// Delete any routes that may be vacant
-	err = rtnl.DeleteRoutes(ifName, unix.AF_INET6, routes...)
-
-	if err != nil {
-		return err
-	}
-
-	for _, route := range routes {
-		if route.Destination.String() == meshPrefix {
-			continue
-		}
-
-		err = rtnl.AddRoute(ifName, route)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *RouteManagerImpl) installRoute(ifName string, meshid string, node MeshNode) error {
-	routeMapFunc := func(route string) lib.Route {
-		_, cidr, _ := net.ParseCIDR(route)
-
-		r := lib.Route{
-			Destination: *cidr,
-			Gateway:     node.GetWgHost().IP,
-		}
-		return r
-	}
-
-	ipBuilder := &ip.ULABuilder{}
-	ipNet, err := ipBuilder.GetIPNet(meshid)
-
-	if err != nil {
-		return err
-	}
-
-	theRoutes := lib.Map(node.GetRoutes(), func(r Route) string {
-		return r.GetDestination().String()
-	})
-
-	routes := lib.Map(append(theRoutes, ipNet.String()), routeMapFunc)
-	return m.addRoute(ifName, ipNet.String(), routes...)
-}
-
-func (m *RouteManagerImpl) installRoutes(meshProvider MeshProvider) error {
-	mesh, err := meshProvider.GetMesh()
-
-	if err != nil {
-		return err
-	}
-
-	dev, err := meshProvider.GetDevice()
-
-	if err != nil {
-		return err
-	}
-
-	self, err := m.meshManager.GetSelf(meshProvider.GetMeshId())
-
-	if err != nil {
-		return err
-	}
-
-	for _, node := range mesh.GetNodes() {
-		if NodeEquals(self, node) {
-			continue
-		}
-
-		err = m.installRoute(dev.Name, meshProvider.GetMeshId(), node)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// InstallRoutes installs all routes to the RIB
-func (r *RouteManagerImpl) InstallRoutes() error {
-	for _, mesh := range r.meshManager.GetMeshes() {
-		err := r.installRoutes(mesh)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func NewRouteManager(m MeshManager) RouteManager {
 	return &RouteManagerImpl{meshManager: m}
 }

pkg/mesh/types.go

@@ -15,11 +15,14 @@ type Route interface {
 	GetDestination() *net.IPNet
 	// GetHopCount: get the total hopcount of the prefix
 	GetHopCount() int
+	// GetPath: get a list of AS paths to get to the destination
+	GetPath() []string
 }
 
 type RouteStub struct {
 	Destination *net.IPNet
 	HopCount    int
+	Path        []string
 }
 
 func (r *RouteStub) GetDestination() *net.IPNet {
@@ -30,6 +33,10 @@ func (r *RouteStub) GetHopCount() int {
 	return r.HopCount
 }
 
+func (r *RouteStub) GetPath() []string {
+	return r.Path
+}
+
 // MeshNode represents an implementation of a node in a mesh
 type MeshNode interface {
 	// GetHostEndpoint: gets the gRPC endpoint of the node