59-error-when-peer-not-selected

In the CLI when the peer is not selected
as the type throwing an error stating
either client or peer must be selected

cmd/wg-mesh/main.go

@@ -4,32 +4,29 @@ import (
 	"fmt"
 	ipcRpc "net/rpc"
 	"os"
-	"strings"
-	"time"
 
 	"github.com/akamensky/argparse"
-	"github.com/tim-beatham/wgmesh/pkg/ctrlserver"
 	"github.com/tim-beatham/wgmesh/pkg/ipc"
-	"github.com/tim-beatham/wgmesh/pkg/lib"
 	logging "github.com/tim-beatham/wgmesh/pkg/log"
 )
 
 const SockAddr = "/tmp/wgmesh_ipc.sock"
 
 type CreateMeshParams struct {
-	Client   *ipcRpc.Client
-	WgPort   int
-	Endpoint string
+	Client           *ipcRpc.Client
+	Endpoint         string
+	WgArgs           ipc.WireGuardArgs
+	AdvertiseRoutes  bool
+	AdvertiseDefault bool
 }
 
-func createMesh(args *CreateMeshParams) string {
+func createMesh(params *CreateMeshParams) string {
 	var reply string
 	newMeshParams := ipc.NewMeshArgs{
-		WgPort:   args.WgPort,
-		Endpoint: args.Endpoint,
+		WgArgs: params.WgArgs,
 	}
 
-	err := args.Client.Call("IpcHandler.CreateMesh", &newMeshParams, &reply)
+	err := params.Client.Call("IpcHandler.CreateMesh", &newMeshParams, &reply)
 
 	if err != nil {
 		return err.Error()
@@ -54,12 +51,13 @@ func listMeshes(client *ipcRpc.Client) {
 }
 
 type JoinMeshParams struct {
-	Client    *ipcRpc.Client
-	MeshId    string
-	IpAddress string
-	IfName    string
-	WgPort    int
-	Endpoint  string
+	Client           *ipcRpc.Client
+	MeshId           string
+	IpAddress        string
+	Endpoint         string
+	WgArgs           ipc.WireGuardArgs
+	AdvertiseRoutes  bool
+	AdvertiseDefault bool
 }
 
 func joinMesh(params *JoinMeshParams) string {
@@ -68,7 +66,7 @@ func joinMesh(params *JoinMeshParams) string {
 	args := ipc.JoinMeshArgs{
 		MeshId:   params.MeshId,
 		IpAdress: params.IpAddress,
-		Port:     params.WgPort,
+		WgArgs:   params.WgArgs,
 	}
 
 	err := params.Client.Call("IpcHandler.JoinMesh", &args, &reply)
@@ -80,34 +78,6 @@ func joinMesh(params *JoinMeshParams) string {
 	return reply
 }
 
-func getMesh(client *ipcRpc.Client, meshId string) {
-	reply := new(ipc.GetMeshReply)
-
-	err := client.Call("IpcHandler.GetMesh", &meshId, &reply)
-
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	for _, node := range reply.Nodes {
-		fmt.Println("Public Key: " + node.PublicKey)
-		fmt.Println("Control Endpoint: " + node.HostEndpoint)
-		fmt.Println("WireGuard Endpoint: " + node.WgEndpoint)
-		fmt.Println("Wg IP: " + node.WgHost)
-		fmt.Printf("Timestamp: %s", time.Unix(node.Timestamp, 0).String())
-
-		mapFunc := func(r ctrlserver.MeshRoute) string {
-			return r.Destination
-		}
-
-		advertiseRoutes := strings.Join(lib.Map(node.Routes, mapFunc), ",")
-		fmt.Printf("Routes: %s\n", advertiseRoutes)
-
-		fmt.Println("---")
-	}
-}
-
 func leaveMesh(client *ipcRpc.Client, meshId string) {
 	var reply string
 
@@ -121,19 +91,6 @@ func leaveMesh(client *ipcRpc.Client, meshId string) {
 	fmt.Println(reply)
 }
 
-func enableInterface(client *ipcRpc.Client, meshId string) {
-	var reply string
-
-	err := client.Call("IpcHandler.EnableInterface", &meshId, &reply)
-
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	fmt.Println(reply)
-}
-
 func getGraph(client *ipcRpc.Client, meshId string) {
 	var reply string
 
@@ -219,31 +176,13 @@ func deleteService(client *ipcRpc.Client, service string) {
 	fmt.Println(reply)
 }
 
-func getNode(client *ipcRpc.Client, nodeId, meshId string) {
-	var reply string
-	args := &ipc.GetNodeArgs{
-		NodeId: nodeId,
-		MeshId: meshId,
-	}
-
-	err := client.Call("IpcHandler.GetNode", &args, &reply)
-
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	fmt.Println(reply)
-}
-
 func main() {
 	parser := argparse.NewParser("wg-mesh",
-		"wg-mesh Manipulate WireGuard meshes")
+		"wg-mesh Manipulate WireGuard mesh networks")
 
 	newMeshCmd := parser.NewCommand("new-mesh", "Create a new mesh")
 	listMeshCmd := parser.NewCommand("list-meshes", "List meshes the node is connected to")
 	joinMeshCmd := parser.NewCommand("join-mesh", "Join a mesh network")
-	enableInterfaceCmd := parser.NewCommand("enable-interface", "Enable A Specific Mesh Interface")
 	getGraphCmd := parser.NewCommand("get-graph", "Convert a mesh into DOT format")
 	leaveMeshCmd := parser.NewCommand("leave-mesh", "Leave a mesh network")
 	queryMeshCmd := parser.NewCommand("query-mesh", "Query a mesh network using JMESPath")
@@ -251,36 +190,116 @@ func main() {
 	putAliasCmd := parser.NewCommand("put-alias", "Place an alias for the node")
 	setServiceCmd := parser.NewCommand("set-service", "Place a service into your advertisements")
 	deleteServiceCmd := parser.NewCommand("delete-service", "Remove a service from your advertisements")
-	getNodeCmd := parser.NewCommand("get-node", "Get a specific node from the mesh")
 
-	var newMeshPort *int = newMeshCmd.Int("p", "wgport", &argparse.Options{})
-	var newMeshEndpoint *string = newMeshCmd.String("e", "endpoint", &argparse.Options{})
+	var newMeshPort *int = newMeshCmd.Int("p", "wgport", &argparse.Options{
+		Default: 0,
+		Help:    "WireGuard port to use to the interface. A default of 0 uses an unused ephmeral port.",
+	})
 
-	var joinMeshId *string = joinMeshCmd.String("m", "mesh", &argparse.Options{Required: true})
-	var joinMeshIpAddress *string = joinMeshCmd.String("i", "ip", &argparse.Options{Required: true})
-	var joinMeshPort *int = joinMeshCmd.Int("p", "wgport", &argparse.Options{})
-	var joinMeshEndpoint *string = joinMeshCmd.String("e", "endpoint", &argparse.Options{})
+	var newMeshEndpoint *string = newMeshCmd.String("e", "endpoint", &argparse.Options{
+		Help: "Publicly routeable endpoint to advertise within the mesh",
+	})
 
-	var enableInterfaceMeshId *string = enableInterfaceCmd.String("m", "mesh", &argparse.Options{Required: true})
+	var newMeshRole *string = newMeshCmd.Selector("r", "role", []string{"peer", "client"}, &argparse.Options{
+		Default: "peer",
+		Help: "Role in the mesh network. A value of peer means that the node is publicly routeable and thus considered" +
+			" in the gossip protocol. Client means that the node is not publicly routeable and is not a candidate in the gossip" +
+			" protocol",
+	})
+	var newMeshKeepAliveWg *int = newMeshCmd.Int("k", "KeepAliveWg", &argparse.Options{
+		Default: 0,
+		Help:    "WireGuard KeepAlive value for NAT traversal and firewall holepunching",
+	})
 
-	var getGraphMeshId *string = getGraphCmd.String("m", "mesh", &argparse.Options{Required: true})
+	var newMeshAdvertiseRoutes *bool = newMeshCmd.Flag("a", "advertise", &argparse.Options{
+		Help: "Advertise routes to other mesh network into the mesh",
+	})
 
-	var leaveMeshMeshId *string = leaveMeshCmd.String("m", "mesh", &argparse.Options{Required: true})
+	var newMeshAdvertiseDefaults *bool = newMeshCmd.Flag("d", "defaults", &argparse.Options{
+		Help: "Advertise ::/0 into the mesh network",
+	})
 
-	var queryMeshMeshId *string = queryMeshCmd.String("m", "mesh", &argparse.Options{Required: true})
-	var queryMeshQuery *string = queryMeshCmd.String("q", "query", &argparse.Options{Required: true})
+	var joinMeshId *string = joinMeshCmd.String("m", "meshid", &argparse.Options{
+		Required: true,
+		Help:     "MeshID of the mesh network to join",
+	})
 
-	var description *string = putDescriptionCmd.String("d", "description", &argparse.Options{Required: true})
+	var joinMeshIpAddress *string = joinMeshCmd.String("i", "ip", &argparse.Options{
+		Required: true,
+		Help:     "IP address of the bootstrapping node to join through",
+	})
 
-	var alias *string = putAliasCmd.String("a", "alias", &argparse.Options{Required: true})
+	var joinMeshEndpoint *string = joinMeshCmd.String("e", "endpoint", &argparse.Options{
+		Help: "Publicly routeable endpoint to advertise within the mesh",
+	})
 
-	var serviceKey *string = setServiceCmd.String("s", "service", &argparse.Options{Required: true})
-	var serviceValue *string = setServiceCmd.String("v", "value", &argparse.Options{Required: true})
+	var joinMeshRole *string = joinMeshCmd.Selector("r", "role", []string{"peer", "client"}, &argparse.Options{
+		Default: "peer",
+		Help: "Role in the mesh network. A value of peer means that the node is publicly routeable and thus considered" +
+			" in the gossip protocol. Client means that the node is not publicly routeable and is not a candidate in the gossip" +
+			" protocol",
+	})
 
-	var deleteServiceKey *string = deleteServiceCmd.String("s", "service", &argparse.Options{Required: true})
+	var joinMeshPort *int = joinMeshCmd.Int("p", "wgport", &argparse.Options{
+		Default: 0,
+		Help:    "WireGuard port to use to the interface. A default of 0 uses an unused ephmeral port.",
+	})
 
-	var getNodeNodeId *string = getNodeCmd.String("n", "nodeid", &argparse.Options{Required: true})
-	var getNodeMeshId *string = getNodeCmd.String("m", "meshid", &argparse.Options{Required: true})
+	var joinMeshKeepAliveWg *int = joinMeshCmd.Int("k", "KeepAliveWg", &argparse.Options{
+		Default: 0,
+		Help:    "WireGuard KeepAlive value for NAT traversal and firewall ho;lepunching",
+	})
+
+	var joinMeshAdvertiseRoutes *bool = joinMeshCmd.Flag("a", "advertise", &argparse.Options{
+		Help: "Advertise routes to other mesh network into the mesh",
+	})
+
+	var joinMeshAdvertiseDefaults *bool = joinMeshCmd.Flag("d", "defaults", &argparse.Options{
+		Help: "Advertise ::/0 into the mesh network",
+	})
+
+	var getGraphMeshId *string = getGraphCmd.String("m", "mesh", &argparse.Options{
+		Required: true,
+		Help:     "MeshID of the graph to get",
+	})
+
+	var leaveMeshMeshId *string = leaveMeshCmd.String("m", "mesh", &argparse.Options{
+		Required: true,
+		Help:     "MeshID of the mesh to leave",
+	})
+
+	var queryMeshMeshId *string = queryMeshCmd.String("m", "mesh", &argparse.Options{
+		Required: true,
+		Help:     "MeshID of the mesh to query",
+	})
+	var queryMeshQuery *string = queryMeshCmd.String("q", "query", &argparse.Options{
+		Required: true,
+		Help:     "JMESPath Query Of The Mesh Network To Query",
+	})
+
+	var description *string = putDescriptionCmd.String("d", "description", &argparse.Options{
+		Required: true,
+		Help:     "Description of the node in the mesh",
+	})
+
+	var alias *string = putAliasCmd.String("a", "alias", &argparse.Options{
+		Required: true,
+		Help:     "Alias of the node to set can be used in DNS to lookup an IP address",
+	})
+
+	var serviceKey *string = setServiceCmd.String("s", "service", &argparse.Options{
+		Required: true,
+		Help:     "Key of the service to advertise in the mesh network",
+	})
+	var serviceValue *string = setServiceCmd.String("v", "value", &argparse.Options{
+		Required: true,
+		Help:     "Value of the service to advertise in the mesh network",
+	})
+
+	var deleteServiceKey *string = deleteServiceCmd.String("s", "service", &argparse.Options{
+		Required: true,
+		Help:     "Key of the service to remove",
+	})
 
 	err := parser.Parse(os.Args)
 
@@ -298,8 +317,15 @@ func main() {
 	if newMeshCmd.Happened() {
 		fmt.Println(createMesh(&CreateMeshParams{
 			Client:   client,
-			WgPort:   *newMeshPort,
 			Endpoint: *newMeshEndpoint,
+			WgArgs: ipc.WireGuardArgs{
+				Endpoint:              *newMeshEndpoint,
+				Role:                  *newMeshRole,
+				WgPort:                *newMeshPort,
+				KeepAliveWg:           *newMeshKeepAliveWg,
+				AdvertiseDefaultRoute: *newMeshAdvertiseDefaults,
+				AdvertiseRoutes:       *newMeshAdvertiseRoutes,
+			},
 		}))
 	}
 
@@ -310,10 +336,17 @@ func main() {
 	if joinMeshCmd.Happened() {
 		fmt.Println(joinMesh(&JoinMeshParams{
 			Client:    client,
-			WgPort:    *joinMeshPort,
 			IpAddress: *joinMeshIpAddress,
 			MeshId:    *joinMeshId,
 			Endpoint:  *joinMeshEndpoint,
+			WgArgs: ipc.WireGuardArgs{
+				Endpoint:              *joinMeshEndpoint,
+				Role:                  *joinMeshRole,
+				WgPort:                *joinMeshPort,
+				KeepAliveWg:           *joinMeshKeepAliveWg,
+				AdvertiseDefaultRoute: *joinMeshAdvertiseDefaults,
+				AdvertiseRoutes:       *joinMeshAdvertiseRoutes,
+			},
 		}))
 	}
 
@@ -321,10 +354,6 @@ func main() {
 		getGraph(client, *getGraphMeshId)
 	}
 
-	if enableInterfaceCmd.Happened() {
-		enableInterface(client, *enableInterfaceMeshId)
-	}
-
 	if leaveMeshCmd.Happened() {
 		leaveMesh(client, *leaveMeshMeshId)
 	}
@@ -348,8 +377,4 @@ func main() {
 	if deleteServiceCmd.Happened() {
 		deleteService(client, *deleteServiceKey)
 	}
-
-	if getNodeCmd.Happened() {
-		getNode(client, *getNodeNodeId, *getNodeMeshId)
-	}
 }

cmd/wgmeshd/main.go

@@ -19,13 +19,13 @@ import (
 
 func main() {
 	if len(os.Args) != 2 {
-		logging.Log.WriteErrorf("Need to provide configuration.yaml")
+		logging.Log.WriteErrorf("Did not provide configuration")
 		return
 	}
 
-	conf, err := conf.ParseConfiguration(os.Args[1])
+	conf, err := conf.ParseDaemonConfiguration(os.Args[1])
 	if err != nil {
-		logging.Log.WriteInfof("Could not parse configuration")
+		logging.Log.WriteErrorf("Could not parse configuration: %s", err.Error())
 		return
 	}
 

go.mod

@@ -4,14 +4,18 @@ go 1.21.3
 
 require (
 	github.com/akamensky/argparse v1.4.0
+	github.com/anandvarma/namegen v0.0.0-20230727084436-5197c6ea3255
 	github.com/automerge/automerge-go v0.0.0-20230903201930-b80ce8aadbb9
 	github.com/gin-gonic/gin v1.9.1
+	github.com/go-playground/validator/v10 v10.16.0
 	github.com/google/uuid v1.3.0
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/jsimonetti/rtnetlink v1.3.5
+	github.com/miekg/dns v1.1.57
 	github.com/sirupsen/logrus v1.9.3
 	golang.org/x/sys v0.14.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
+	gonum.org/v1/gonum v0.14.0
 	google.golang.org/grpc v1.58.1
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -24,7 +28,6 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
@@ -42,10 +45,13 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sync v0.4.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
 )

go.sum

@@ -0,0 +1,143 @@
+github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
+github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
+github.com/anandvarma/namegen v0.0.0-20230727084436-5197c6ea3255 h1:aIAyyj4XPrke9Tc/umbBCzP5SKX/CHf3dKrL/PhH2lo=
+github.com/anandvarma/namegen v0.0.0-20230727084436-5197c6ea3255/go.mod h1:MFyILur9tG8PxaCXGZVr/2BOnHtRIgxYejYFZdWLxr0=
+github.com/automerge/automerge-go v0.0.0-20230903201930-b80ce8aadbb9 h1:+6JSfuxZgmURoIlGdnYnY/FLRGWGagLyiBjt/VLtwi4=
+github.com/automerge/automerge-go v0.0.0-20230903201930-b80ce8aadbb9/go.mod h1:6UxoDE+thWsISXK93pxaOuOfkcAfCvDbg0eAnFmxL5E=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/cilium/ebpf v0.11.0 h1:V8gS/bTCCjX9uUnkUFUpPsksM8n1lXBAvHcpiFk1X2Y=
+github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUgWsVs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
+github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
+github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
+github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/jsimonetti/rtnetlink v1.3.5 h1:hVlNQNRlLDGZz31gBPicsG7Q53rnlsz1l1Ix/9XlpVA=
+github.com/jsimonetti/rtnetlink v1.3.5/go.mod h1:0LFedyiTkebnd43tE4YAkWGIq9jQphow4CcwxaT2Y00=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw=
+github.com/mdlayher/genetlink v1.3.2/go.mod h1:tcC3pkCrPUGIKKsCsp0B3AdaaKuHtaxoJRz3cc+528o=
+github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
+github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
+github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI=
+github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI=
+github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
+github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
+github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
+github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1 h1:EY138uSo1JYlDq+97u1FtcOUwPpIU6WL1Lkt7WpYjPA=
+golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvYQH2OU3/TnxLx97WDSUDRABfT18pCOYwc2GE=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80=
+gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
+gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58=
+google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

pkg/api/apiserver.go

@@ -65,6 +65,12 @@ func (s *SmegServer) meshNodeToAPIMeshNode(meshNode ctrlserver.MeshNode) *SmegNo
 		PublicKey:   meshNode.PublicKey,
 		Alias:       alias,
 		Services:    meshNode.Services,
+		Stats: SmegStats{
+			TotalTransmit:     meshNode.Stats.TransmitBytes,
+			TotalReceived:     meshNode.Stats.ReceivedBytes,
+			KeepAliveInterval: meshNode.Stats.PersistentKeepAliveInterval,
+			AllowedIps:        meshNode.Stats.AllowedIPs,
+		},
 	}
 }
 
@@ -93,7 +99,9 @@ func (s *SmegServer) CreateMesh(c *gin.Context) {
 	}
 
 	ipcRequest := ipc.NewMeshArgs{
-		WgPort: createMesh.WgPort,
+		WgArgs: ipc.WireGuardArgs{
+			WgPort: createMesh.WgPort,
+		},
 	}
 
 	var reply string
@@ -126,7 +134,9 @@ func (s *SmegServer) JoinMesh(c *gin.Context) {
 	ipcRequest := ipc.JoinMeshArgs{
 		MeshId:   joinMesh.MeshId,
 		IpAdress: joinMesh.Bootstrap,
-		Port:     joinMesh.WgPort,
+		WgArgs: ipc.WireGuardArgs{
+			WgPort: joinMesh.WgPort,
+		},
 	}
 
 	var reply string

pkg/api/types.go

@@ -1,10 +1,19 @@
 package api
 
+import "time"
+
 type Route struct {
 	Prefix string   `json:"prefix"`
 	Path   []string `json:"path"`
 }
 
+type SmegStats struct {
+	TotalTransmit     int64         `json:"totalTransmit"`
+	TotalReceived     int64         `json:"totalReceived"`
+	KeepAliveInterval time.Duration `json:"keepaliveInterval"`
+	AllowedIps        []string      `json:"allowedIps"`
+}
+
 type SmegNode struct {
 	Alias       string            `json:"alias"`
 	WgHost      string            `json:"wgHost"`
@@ -15,6 +24,7 @@ type SmegNode struct {
 	PublicKey   string            `json:"publicKey"`
 	Routes      []Route           `json:"routes"`
 	Services    map[string]string `json:"services"`
+	Stats       SmegStats         `json:"stats"`
 }
 
 type SmegMesh struct {

pkg/automerge/automerge.go

@@ -24,7 +24,7 @@ type CrdtMeshManager struct {
 	Client        *wgctrl.Client
 	doc           *automerge.Doc
 	LastHash      automerge.ChangeHash
-	conf          *conf.WgMeshConfiguration
+	conf          *conf.WgConfiguration
 	cache         *MeshCrdt
 	lastCacheHash automerge.ChangeHash
 }
@@ -74,8 +74,8 @@ func (c *CrdtMeshManager) isAlive(nodeId string) bool {
 		return false
 	}
 
-	keepAliveTime := timestamp.Int64()
-	return (time.Now().Unix() - keepAliveTime) < int64(c.conf.DeadTime)
+	return true
+	// return (time.Now().Unix() - keepAliveTime) < int64(c.conf.DeadTime)
 }
 
 func (c *CrdtMeshManager) GetPeers() []string {
@@ -135,7 +135,7 @@ type NewCrdtNodeMangerParams struct {
 	MeshId  string
 	DevName string
 	Port    int
-	Conf    conf.WgMeshConfiguration
+	Conf    *conf.WgConfiguration
 	Client  *wgctrl.Client
 }
 
@@ -146,7 +146,7 @@ func NewCrdtNodeManager(params *NewCrdtNodeMangerParams) (*CrdtMeshManager, erro
 	manager.doc = automerge.New()
 	manager.IfName = params.DevName
 	manager.Client = params.Client
-	manager.conf = &params.Conf
+	manager.conf = params.Conf
 	manager.cache = nil
 	return &manager, nil
 }
@@ -449,7 +449,7 @@ func (m *CrdtMeshManager) RemoveNode(nodeId string) error {
 }
 
 // DeleteRoutes deletes the specified routes
-func (m *CrdtMeshManager) RemoveRoutes(nodeId string, routes ...string) error {
+func (m *CrdtMeshManager) RemoveRoutes(nodeId string, routes ...mesh.Route) error {
 	nodeVal, err := m.doc.Path("nodes").Map().Get(nodeId)
 
 	if err != nil {
@@ -467,65 +467,26 @@ func (m *CrdtMeshManager) RemoveRoutes(nodeId string, routes ...string) error {
 	}
 
 	for _, route := range routes {
-		err = routeMap.Map().Delete(route)
+		err = routeMap.Map().Delete(route.GetDestination().String())
 	}
 
 	return err
 }
 
+// GetConfiguration: gets the configuration for this mesh network
+func (m *CrdtMeshManager) GetConfiguration() *conf.WgConfiguration {
+	return m.conf
+}
+
+// Mark: mark the node as locally dead
+func (m *CrdtMeshManager) Mark(nodeId string) {
+}
+
 func (m *CrdtMeshManager) GetSyncer() mesh.MeshSyncer {
 	return NewAutomergeSync(m)
 }
 
 func (m *CrdtMeshManager) Prune() error {
-	// nodes, err := m.doc.Path("nodes").Get()
-
-	// if err != nil {
-	// 	return err
-	// }
-
-	// if nodes.Kind() != automerge.KindMap {
-	// 	return errors.New("node must be a map")
-	// }
-
-	// values, err := nodes.Map().Values()
-
-	// if err != nil {
-	// 	return err
-	// }
-
-	// deletionNodes := make([]string, 0)
-
-	// for nodeId, node := range values {
-	// 	if node.Kind() != automerge.KindMap {
-	// 		return errors.New("node must be a map")
-	// 	}
-
-	// 	nodeMap := node.Map()
-
-	// 	timeStamp, err := nodeMap.Get("timestamp")
-
-	// 	if err != nil {
-	// 		return err
-	// 	}
-
-	// 	if timeStamp.Kind() != automerge.KindInt64 {
-	// 		return errors.New("timestamp is not int64")
-	// 	}
-
-	// 	timeValue := timeStamp.Int64()
-	// 	nowValue := time.Now().Unix()
-
-	// 	if nowValue-timeValue >= int64(pruneTime) {
-	// 		deletionNodes = append(deletionNodes, nodeId)
-	// 	}
-	// }
-
-	// for _, node := range deletionNodes {
-	// 	logging.Log.WriteInfof("Pruning %s", node)
-	// 	nodes.Map().Delete(node)
-	// }
-
 	return nil
 }
 

pkg/automerge/automerge_test.go

@@ -22,7 +22,7 @@ func setUpTests() *TestParams {
 		DevName: "wg0",
 		Port:    5000,
 		Client:  nil,
-		Conf:    conf.WgMeshConfiguration{},
+		Conf:    conf.DaemonConfiguration{},
 	})
 
 	return &TestParams{

pkg/automerge/factory.go

@@ -14,13 +14,13 @@ func (f *CrdtProviderFactory) CreateMesh(params *mesh.MeshProviderFactoryParams)
 	return NewCrdtNodeManager(&NewCrdtNodeMangerParams{
 		MeshId:  params.MeshId,
 		DevName: params.DevName,
-		Conf:    *params.Conf,
+		Conf:    params.Conf,
 		Client:  params.Client,
 	})
 }
 
 type MeshNodeFactory struct {
-	Config conf.WgMeshConfiguration
+	Config conf.DaemonConfiguration
 }
 
 // Build builds the mesh node that represents the host machine to add
@@ -30,7 +30,7 @@ func (f *MeshNodeFactory) Build(params *mesh.MeshNodeFactoryParams) mesh.MeshNod
 
 	grpcEndpoint := fmt.Sprintf("%s:%s", hostName, f.Config.GrpcPort)
 
-	if f.Config.Role == conf.CLIENT_ROLE {
+	if *params.MeshConfig.Role == conf.CLIENT_ROLE {
 		grpcEndpoint = "-"
 	}
 
@@ -44,7 +44,7 @@ func (f *MeshNodeFactory) Build(params *mesh.MeshNodeFactoryParams) mesh.MeshNod
 		Routes:      make(map[string]Route),
 		Description: "",
 		Alias:       "",
-		Type:        string(f.Config.Role),
+		Type:        string(*params.MeshConfig.Role),
 	}
 }
 
@@ -54,12 +54,12 @@ func (f *MeshNodeFactory) getAddress(params *mesh.MeshNodeFactoryParams) string
 
 	if params.Endpoint != "" {
 		hostName = params.Endpoint
-	} else if len(f.Config.Endpoint) != 0 {
-		hostName = f.Config.Endpoint
+	} else if len(*params.MeshConfig.Endpoint) != 0 {
+		hostName = *params.MeshConfig.Endpoint
 	} else {
 		ipFunc := lib.GetPublicIP
 
-		if f.Config.IPDiscovery == conf.DNS_IP_DISCOVERY {
+		if *params.MeshConfig.IPDiscovery == conf.DNS_IP_DISCOVERY {
 			ipFunc = lib.GetOutboundIP
 		}
 

pkg/cmd/cmd.go

@@ -0,0 +1,33 @@
+// cmd is a package for running commands in the different operating systems implementations
+package cmd
+
+import (
+	"os/exec"
+	"strings"
+)
+
+type CmdRunner interface {
+	RunCommands(commands ...string) error
+}
+
+type UnixCmdRunner struct{}
+
+// RunCommand: runs the unix command. It splits the command into fields
+// and then runs the command accordingly
+func RunCommand(cmd string) error {
+	args := strings.Fields(cmd)
+	c := exec.Command(args[0], args[1:]...)
+	return c.Run()
+}
+
+func (l *UnixCmdRunner) RunCommands(commands ...string) error {
+	for _, cmd := range commands {
+		err := RunCommand(cmd)
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

pkg/conf/conf.go

@@ -4,7 +4,7 @@ package conf
 import (
 	"os"
 
-	logging "github.com/tim-beatham/wgmesh/pkg/log"
+	"github.com/go-playground/validator/v10"
 	"gopkg.in/yaml.v3"
 )
 
@@ -30,170 +30,187 @@ const (
 	DNS_IP_DISCOVERY    = "dns"
 )
 
-type WgMeshConfiguration struct {
+// WgConfiguration contains per-mesh WireGuard configuration. Contains poitner types only so we can
+// tell if the attribute is set
+type WgConfiguration struct {
+	// IPDIscovery: how to discover your IP if not specified. Use your outgoing IP or use a public
+	// service for IPDiscoverability
+	IPDiscovery *IPDiscovery `yaml:"ipDiscovery" validate:"required,eq=public|eq=dns"`
+	// AdvertiseRoutes: specifies whether the node can act as a router routing packets between meshes
+	AdvertiseRoutes *bool `yaml:"advertiseRoute" validate:"required"`
+	// AdvertiseDefaultRoute: specifies whether or not this route should advertise a default route
+	// for all nodes to route their packets to
+	AdvertiseDefaultRoute *bool `yaml:"advertiseDefaults" validate:"required"`
+	// Endpoint contains what value should be set as the public endpoint of this node
+	Endpoint *string `yaml:"publicEndpoint"`
+	// Role specifies whether or not the user is globally accessible.
+	// If the user is globaly accessible they specify themselves as a client.
+	Role *NodeType `yaml:"role" validate:"required,eq=client|eq=peer"`
+	// KeepAliveWg configures the implementation so that we send keep alive packets to peers.
+	// KeepAlive can only be set if role is type client
+	KeepAliveWg *int `yaml:"keepAliveWg" validate:"omitempty,gte=0"`
+	// PreUp are WireGuard commands to run before adding the WG interface
+	PreUp []string `yaml:"preUp"`
+	// PostUp are WireGuard commands to run after adding the WG interface
+	PostUp []string `yaml:"postUp"`
+	// PreDown are WireGuard commands to run prior to removing the WG interface
+	PreDown []string `yaml:"preDown"`
+	// PostDown are WireGuard command to run after removing the WG interface
+	PostDown []string `yaml:"postDown"`
+}
+
+type DaemonConfiguration struct {
 	// CertificatePath is the path to the certificate to use in mTLS
-	CertificatePath string `yaml:"certificatePath"`
+	CertificatePath string `yaml:"certificatePath" validate:"required,file"`
 	// PrivateKeypath is the path to the clients private key in mTLS
-	PrivateKeyPath string `yaml:"privateKeyPath"`
+	PrivateKeyPath string `yaml:"privateKeyPath" validate:"required,file"`
 	// CaCeritifcatePath path to the certificate of the trust certificate authority
-	CaCertificatePath string `yaml:"caCertificatePath"`
+	CaCertificatePath string `yaml:"caCertificatePath" validate:"required,file"`
 	// SkipCertVerification specify to skip certificate verification. Should only be used
 	// in test environments
 	SkipCertVerification bool `yaml:"skipCertVerification"`
 	// Port to run the GrpcServer on
-	GrpcPort string `yaml:"gRPCPort"`
-	// IPDIscovery: how to discover your IP if not specified. Use DNS server 8.8.8.8 or
-	// use public IP discovery library
-	IPDiscovery IPDiscovery `yaml:"ipDiscovery"`
-	// AdvertiseRoutes advertises other meshes if the node is in multiple meshes
-	AdvertiseRoutes bool `yaml:"advertiseRoutes"`
-	// Endpoint is the IP in which this computer is publicly reachable.
-	// usecase is when the node has multiple IP addresses
-	Endpoint string `yaml:"publicEndpoint"`
-	// ClusterSize size of the cluster to split on
-	ClusterSize int `yaml:"clusterSize"`
-	// SyncRate number of times per second to perform a sync
-	SyncRate float64 `yaml:"syncRate"`
-	// InterClusterChance proability of inter-cluster communication in a sync round
-	InterClusterChance float64 `yaml:"interClusterChance"`
-	// BranchRate number of nodes to randomly communicate with
-	BranchRate int `yaml:"branchRate"`
-	// InfectionCount number of times we sync before we can no longer catch the udpate
-	InfectionCount int `yaml:"infectionCount"`
-	// KeepAliveTime number of seconds before we update node indicating that we are still alive
-	KeepAliveTime int `yaml:"keepAliveTime"`
-	// Timeout number of seconds before we consider the node as dead
-	Timeout int `yaml:"timeout"`
-	// PruneTime number of seconds before we remove nodes that are likely to be dead
-	PruneTime int `yaml:"pruneTime"`
-	// DeadTime: number of seconds before we consider the node as dead and stop considering it
-	// when picking a random peer
-	DeadTime int `yaml:"deadTime"`
+	GrpcPort int `yaml:"gRPCPort" validate:"required"`
+	// Timeout number of seconds without response that a node is considered unreachable by gRPC
+	Timeout int `yaml:"timeout" validate:"required,gte=1"`
 	// Profile whether or not to include a http server that profiles the code
 	Profile bool `yaml:"profile"`
 	// StubWg whether or not to stub the WireGuard types
 	StubWg bool `yaml:"stubWg"`
-	// Role specifies whether or not the user is globally accessible.
-	// If the user is globaly accessible they specify themselves as a client.
-	Role NodeType `yaml:"role"`
-	// KeepAliveWg configures the implementation so that we send keep alive packets to peers.
-	// KeepAlive can only be set if role is type client
-	KeepAliveWg int `yaml:"keepAliveWg"`
+	// SyncRate specifies how long the minimum time should be between synchronisation
+	SyncRate int `yaml:"syncRate" validate:"required,gte=1"`
+	// KeepAliveTime: number of seconds before the leader of the mesh sends an update to
+	// send to every member in the mesh
+	KeepAliveTime int `yaml:"keepAliveTime" validate:"required,gte=1"`
+	// ClusterSize specifies how many neighbours you should synchronise with per round
+	ClusterSize int `yaml:"clusterSize" valdiate:"required,gt=0"`
+	// InterClusterChance specifies the probabilityof inter-cluster communication in a sync round
+	InterClusterChance float64 `yaml:"interClusterChance" valdiate:"required,gt=0"`
+	// BranchRate specifies the number of nodes to synchronise with when a node has
+	// new changes to send to the mesh
+	BranchRate int `yaml:"branchRate" validate:"required,gte=1"`
+	// InfectionCount: number of time to sync before an update can no longer be 'caught'
+	InfectionCount int `yaml:"infectionCount" validate:"required,gte=1"`
+	// BaseConfiguration base WireGuard configuration to use, this is used when none is provided
+	BaseConfiguration WgConfiguration `yaml:"baseConfiguration" validate:"required"`
 }
 
-func ValidateConfiguration(c *WgMeshConfiguration) error {
-	if len(c.CertificatePath) == 0 {
-		return &WgMeshConfigurationError{
-			msg: "A public certificate must be specified for mTLS",
-		}
+// ValdiateMeshConfiguration: validates the mesh configuration
+func ValidateMeshConfiguration(conf *WgConfiguration) error {
+	validate := validator.New(validator.WithRequiredStructEnabled())
+	err := validate.Struct(conf)
+
+	if conf.PostDown == nil {
+		conf.PostDown = make([]string, 0)
 	}
 
-	if len(c.PrivateKeyPath) == 0 {
-		return &WgMeshConfigurationError{
-			msg: "A private key must be specified for mTLS",
-		}
+	if conf.PostUp == nil {
+		conf.PostUp = make([]string, 0)
 	}
 
-	if len(c.CaCertificatePath) == 0 {
-		return &WgMeshConfigurationError{
-			msg: "A ca certificate must be specified for mTLS",
-		}
+	if conf.PreDown == nil {
+		conf.PreDown = make([]string, 0)
 	}
 
-	if len(c.GrpcPort) == 0 {
-		return &WgMeshConfigurationError{
-			msg: "A grpc port must be specified",
-		}
+	if conf.PreUp == nil {
+		conf.PreUp = make([]string, 0)
 	}
 
-	if c.ClusterSize <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "A cluster size must not be 0",
-		}
-	}
-
-	if c.SyncRate <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "SyncRate cannot be negative",
-		}
-	}
-
-	if c.BranchRate <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "Branch rate cannot be negative",
-		}
-	}
-
-	if c.InfectionCount <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "Infection count cannot be less than 1",
-		}
-	}
-
-	if c.KeepAliveTime <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "KeepAliveRate cannot be less than negative",
-		}
-	}
-
-	if c.InterClusterChance <= 0 {
-		return &WgMeshConfigurationError{
-			msg: "Intercluster chance cannot be less than 0",
-		}
-	}
-
-	if c.Timeout < 1 {
-		return &WgMeshConfigurationError{
-			msg: "Timeout should be greater than or equal to 1",
-		}
-	}
-
-	if c.PruneTime < 1 {
-		return &WgMeshConfigurationError{
-			msg: "Prune time cannot be < 1",
-		}
-	}
-
-	if c.DeadTime < 1 {
-		return &WgMeshConfigurationError{
-			msg: "Dead time cannot be < 1",
-		}
-	}
-
-	if c.KeepAliveTime <= 1 {
-		return &WgMeshConfigurationError{
-			msg: "Prune time cannot be less than keep alive time",
-		}
-	}
-
-	if c.Role == "" {
-		c.Role = PEER_ROLE
-	}
-
-	if c.IPDiscovery == "" {
-		c.IPDiscovery = PUBLIC_IP_DISCOVERY
-	}
-
-	return nil
+	return err
 }
 
-// ParseConfiguration parses the mesh configuration
-func ParseConfiguration(filePath string) (*WgMeshConfiguration, error) {
-	var conf WgMeshConfiguration
+// ValidateDaemonConfiguration: validates the dameon configuration that is used.
+func ValidateDaemonConfiguration(c *DaemonConfiguration) error {
+	validate := validator.New(validator.WithRequiredStructEnabled())
+	err := validate.Struct(c)
+	return err
+}
+
+// ParseMeshConfiguration: parses the mesh network configuration. Parses parameters such as
+// keepalive time, role and so forth.
+func ParseMeshConfiguration(filePath string) (*WgConfiguration, error) {
+	var conf WgConfiguration
 
 	yamlBytes, err := os.ReadFile(filePath)
 
 	if err != nil {
-		logging.Log.WriteErrorf("Read file error: %s\n", err.Error())
 		return nil, err
 	}
 
 	err = yaml.Unmarshal(yamlBytes, &conf)
 
 	if err != nil {
-		logging.Log.WriteErrorf("Unmarshal error: %s\n", err.Error())
 		return nil, err
 	}
 
-	return &conf, ValidateConfiguration(&conf)
+	return &conf, ValidateMeshConfiguration(&conf)
+}
+
+// ParseDaemonConfiguration parses the mesh configuration and validates the configuration
+func ParseDaemonConfiguration(filePath string) (*DaemonConfiguration, error) {
+	var conf DaemonConfiguration
+
+	yamlBytes, err := os.ReadFile(filePath)
+
+	if err != nil {
+		return nil, err
+	}
+
+	err = yaml.Unmarshal(yamlBytes, &conf)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &conf, ValidateDaemonConfiguration(&conf)
+}
+
+// MergemeshConfiguration: merges the configuration in precedence where the last
+// element in the list takes the most and the first takes the least
+func MergeMeshConfiguration(cfgs ...WgConfiguration) (WgConfiguration, error) {
+	var result WgConfiguration
+
+	for _, cfg := range cfgs {
+		if cfg.AdvertiseDefaultRoute != nil {
+			result.AdvertiseDefaultRoute = cfg.AdvertiseDefaultRoute
+		}
+
+		if cfg.AdvertiseRoutes != nil {
+			result.AdvertiseRoutes = cfg.AdvertiseRoutes
+		}
+
+		if cfg.Endpoint != nil {
+			result.Endpoint = cfg.Endpoint
+		}
+
+		if cfg.IPDiscovery != nil {
+			result.IPDiscovery = cfg.IPDiscovery
+		}
+
+		if cfg.KeepAliveWg != nil {
+			result.KeepAliveWg = cfg.KeepAliveWg
+		}
+
+		if cfg.PostDown != nil {
+			result.PostDown = cfg.PostDown
+		}
+
+		if cfg.PostUp != nil {
+			result.PostUp = cfg.PostUp
+		}
+
+		if cfg.PreDown != nil {
+			result.PreDown = cfg.PreDown
+		}
+
+		if cfg.PreUp != nil {
+			result.PreUp = cfg.PreUp
+		}
+
+		if cfg.Role != nil {
+			result.Role = cfg.Role
+		}
+	}
+
+	return result, ValidateMeshConfiguration(&result)
 }

pkg/conf/conf_test.go

@@ -2,23 +2,12 @@ package conf
 
 import "testing"
 
-func getExampleConfiguration() *WgMeshConfiguration {
-	return &WgMeshConfiguration{
+func getExampleConfiguration() *DaemonConfiguration {
+	return &DaemonConfiguration{
 		CertificatePath:      "./cert/cert.pem",
 		PrivateKeyPath:       "./cert/key.pem",
 		CaCertificatePath:    "./cert/ca.pems",
 		SkipCertVerification: true,
-		GrpcPort:             "8080",
-		AdvertiseRoutes:      true,
-		Endpoint:             "localhost",
-		ClusterSize:          1,
-		SyncRate:             1,
-		InterClusterChance:   0.1,
-		BranchRate:           2,
-		KeepAliveTime:        4,
-		InfectionCount:       1,
-		Timeout:              2,
-		PruneTime:            20,
 	}
 }
 
@@ -26,7 +15,7 @@ func TestConfigurationCertificatePathEmpty(t *testing.T) {
 	conf := getExampleConfiguration()
 	conf.CertificatePath = ""
 
-	err := ValidateConfiguration(conf)
+	err := ValidateDaemonConfiguration(conf)
 
 	if err == nil {
 		t.Fatal(`error should be thrown`)
@@ -37,7 +26,7 @@ func TestConfigurationPrivateKeyPathEmpty(t *testing.T) {
 	conf := getExampleConfiguration()
 	conf.PrivateKeyPath = ""
 
-	err := ValidateConfiguration(conf)
+	err := ValidateDaemonConfiguration(conf)
 
 	if err == nil {
 		t.Fatal(`error should be thrown`)
@@ -48,7 +37,7 @@ func TestConfigurationCaCertificatePathEmpty(t *testing.T) {
 	conf := getExampleConfiguration()
 	conf.CaCertificatePath = ""
 
-	err := ValidateConfiguration(conf)
+	err := ValidateDaemonConfiguration(conf)
 
 	if err == nil {
 		t.Fatal(`error should be thrown`)
@@ -57,109 +46,21 @@ func TestConfigurationCaCertificatePathEmpty(t *testing.T) {
 
 func TestConfigurationGrpcPortEmpty(t *testing.T) {
 	conf := getExampleConfiguration()
-	conf.GrpcPort = ""
+	conf.GrpcPort = 0
 
-	err := ValidateConfiguration(conf)
+	err := ValidateDaemonConfiguration(conf)
 
 	if err == nil {
 		t.Fatal(`error should be thrown`)
 	}
 }
 
-func TestClusterSizeZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.ClusterSize = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func SyncRateZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.SyncRate = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func BranchRateZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.BranchRate = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func InfectionCountZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.InfectionCount = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func KeepAliveRateZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.KeepAliveTime = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func TestValidCOnfiguration(t *testing.T) {
+func TestValidConfiguration(t *testing.T) {
 	conf := getExampleConfiguration()
 
-	err := ValidateConfiguration(conf)
+	err := ValidateDaemonConfiguration(conf)
 
 	if err != nil {
 		t.Error(err)
 	}
 }
-
-func TestTimeout(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.Timeout = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatal(`error should be thrown`)
-	}
-}
-
-func TestPruneTimeZero(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.PruneTime = 0
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatalf(`Error should be thrown`)
-	}
-}
-
-func TestPruneTimeLessThanKeepAliveTime(t *testing.T) {
-	conf := getExampleConfiguration()
-	conf.PruneTime = 1
-
-	err := ValidateConfiguration(conf)
-
-	if err == nil {
-		t.Fatalf(`Error should be thrown`)
-	}
-}

pkg/conn/cluster.go

@@ -55,12 +55,14 @@ func (i *ConnClusterImpl) GetNeighbours(global []string, selfId string) []string
 // you will communicate with a random node that is not in your cluster.
 func (i *ConnClusterImpl) GetInterCluster(global []string, selfId string) string {
 	// Doesn't matter if not in it. Get index of where the node 'should' be
+	slices.Sort(global)
+
 	index, _ := binarySearch(global, selfId, 1)
-	numClusters := math.Ceil(float64(len(global)) / float64(i.clusterSize))
 
-	randomCluster := rand.Intn(int(numClusters)-1) + 1
+	randomCluster := rand.Intn(2) + 1
 
-	neighbourIndex := (index + randomCluster) % len(global)
+	// cluster is considered a heap
+	neighbourIndex := (2*index + (randomCluster * i.clusterSize)) % len(global)
 	return global[neighbourIndex]
 }
 

pkg/conn/connectionserver.go

@@ -2,6 +2,7 @@ package conn
 
 import (
 	"crypto/tls"
+	"fmt"
 	"net"
 
 	"github.com/tim-beatham/wgmesh/pkg/conf"
@@ -21,13 +22,13 @@ type ConnectionServer struct {
 	ctrlProvider rpc.MeshCtrlServerServer
 	// the sync service to synchronise nodes
 	syncProvider rpc.SyncServiceServer
-	Conf         *conf.WgMeshConfiguration
+	Conf         *conf.DaemonConfiguration
 	listener     net.Listener
 }
 
 // NewConnectionServerParams contains params for creating a new connection server
 type NewConnectionServerParams struct {
-	Conf         *conf.WgMeshConfiguration
+	Conf         *conf.DaemonConfiguration
 	CtrlProvider rpc.MeshCtrlServerServer
 	SyncProvider rpc.SyncServiceServer
 }
@@ -76,10 +77,10 @@ func (s *ConnectionServer) Listen() error {
 
 	rpc.RegisterSyncServiceServer(s.server, s.syncProvider)
 
-	lis, err := net.Listen("tcp", ":"+s.Conf.GrpcPort)
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", s.Conf.GrpcPort))
 	s.listener = lis
 
-	logging.Log.WriteInfof("GRPC listening on %s\n", s.Conf.GrpcPort)
+	logging.Log.WriteInfof("GRPC listening on %d\n", s.Conf.GrpcPort)
 
 	if err != nil {
 		logging.Log.WriteErrorf(err.Error())

pkg/crdt/datastore.go

@@ -154,12 +154,13 @@ func (m *MeshSnapshot) GetNodes() map[string]mesh.MeshNode {
 }
 
 type TwoPhaseStoreMeshManager struct {
-	MeshId    string
-	IfName    string
-	Client    *wgctrl.Client
-	LastClock uint64
-	conf      *conf.WgMeshConfiguration
-	store     *TwoPhaseMap[string, MeshNode]
+	MeshId     string
+	IfName     string
+	Client     *wgctrl.Client
+	LastClock  uint64
+	conf       *conf.WgConfiguration
+	daemonConf *conf.DaemonConfiguration
+	store      *TwoPhaseMap[string, MeshNode]
 }
 
 // AddNode() adds a node to the mesh
@@ -179,8 +180,16 @@ func (m *TwoPhaseStoreMeshManager) AddNode(node mesh.MeshNode) {
 
 // GetMesh() returns a snapshot of the mesh provided by the mesh provider.
 func (m *TwoPhaseStoreMeshManager) GetMesh() (mesh.MeshSnapshot, error) {
+	nodes := m.store.AsList()
+
+	snapshot := make(map[string]MeshNode)
+
+	for _, node := range nodes {
+		snapshot[node.PublicKey] = node
+	}
+
 	return &MeshSnapshot{
-		Nodes: m.store.AsMap(),
+		Nodes: snapshot,
 	}, nil
 }
 
@@ -256,7 +265,7 @@ func (m *TwoPhaseStoreMeshManager) UpdateTimeStamp(nodeId string) error {
 
 	peerToUpdate := peers[0]
 
-	if uint64(time.Now().Unix())-m.store.Clock.GetTimestamp(peerToUpdate) > 3*uint64(m.conf.KeepAliveTime) {
+	if uint64(time.Now().Unix())-m.store.Clock.GetTimestamp(peerToUpdate) > 3*uint64(m.daemonConf.KeepAliveTime) {
 		m.store.Mark(peerToUpdate)
 
 		if len(peers) < 2 {
@@ -312,7 +321,7 @@ func (m *TwoPhaseStoreMeshManager) AddRoutes(nodeId string, routes ...mesh.Route
 }
 
 // DeleteRoutes: deletes the routes from the node
-func (m *TwoPhaseStoreMeshManager) RemoveRoutes(nodeId string, routes ...string) error {
+func (m *TwoPhaseStoreMeshManager) RemoveRoutes(nodeId string, routes ...mesh.Route) error {
 	if !m.store.Contains(nodeId) {
 		return fmt.Errorf("datastore: %s does not exist in the mesh", nodeId)
 	}
@@ -323,8 +332,15 @@ func (m *TwoPhaseStoreMeshManager) RemoveRoutes(nodeId string, routes ...string)
 
 	node := m.store.Get(nodeId)
 
+	changes := false
+
 	for _, route := range routes {
-		delete(node.Routes, route)
+		changes = true
+		delete(node.Routes, route.GetDestination().String())
+	}
+
+	if changes {
+		m.store.Put(nodeId, node)
 	}
 
 	return nil
@@ -370,7 +386,7 @@ func (m *TwoPhaseStoreMeshManager) SetAlias(nodeId string, alias string) error {
 	}
 
 	node := m.store.Get(nodeId)
-	node.Description = alias
+	node.Alias = alias
 
 	m.store.Put(nodeId, node)
 	return nil
@@ -408,7 +424,7 @@ func (m *TwoPhaseStoreMeshManager) Prune() error {
 
 // GetPeers: get a list of contactable peers
 func (m *TwoPhaseStoreMeshManager) GetPeers() []string {
-	nodes := lib.MapValues(m.store.AsMap())
+	nodes := m.store.AsList()
 	nodes = lib.Filter(nodes, func(mn MeshNode) bool {
 		if mn.Type != string(conf.PEER_ROLE) {
 			return false
@@ -491,3 +507,8 @@ func (m *TwoPhaseStoreMeshManager) RemoveNode(nodeId string) error {
 	m.store.Remove(nodeId)
 	return nil
 }
+
+// GetConfiguration implements mesh.MeshProvider.
+func (m *TwoPhaseStoreMeshManager) GetConfiguration() *conf.WgConfiguration {
+	return m.conf
+}

pkg/crdt/factory.go

@@ -9,44 +9,49 @@ import (
 	"github.com/tim-beatham/wgmesh/pkg/mesh"
 )
 
-type TwoPhaseMapFactory struct{}
+type TwoPhaseMapFactory struct {
+	Config *conf.DaemonConfiguration
+}
 
 func (f *TwoPhaseMapFactory) CreateMesh(params *mesh.MeshProviderFactoryParams) (mesh.MeshProvider, error) {
 	return &TwoPhaseStoreMeshManager{
-		MeshId: params.MeshId,
-		IfName: params.DevName,
-		Client: params.Client,
-		conf:   params.Conf,
+		MeshId:     params.MeshId,
+		IfName:     params.DevName,
+		Client:     params.Client,
+		conf:       params.Conf,
+		daemonConf: params.DaemonConf,
 		store: NewTwoPhaseMap[string, MeshNode](params.NodeID, func(s string) uint64 {
-			h := fnv.New32a()
+			h := fnv.New64a()
 			h.Write([]byte(s))
-			return uint64(h.Sum32())
-		}, uint64(3*params.Conf.KeepAliveTime)),
+			return h.Sum64()
+		}, uint64(3*f.Config.KeepAliveTime)),
 	}, nil
 }
 
 type MeshNodeFactory struct {
-	Config conf.WgMeshConfiguration
+	Config conf.DaemonConfiguration
 }
 
 func (f *MeshNodeFactory) Build(params *mesh.MeshNodeFactoryParams) mesh.MeshNode {
 	hostName := f.getAddress(params)
 
-	grpcEndpoint := fmt.Sprintf("%s:%s", hostName, f.Config.GrpcPort)
+	grpcEndpoint := fmt.Sprintf("%s:%d", hostName, f.Config.GrpcPort)
+	wgEndpoint := fmt.Sprintf("%s:%d", hostName, params.WgPort)
 
-	if f.Config.Role == conf.CLIENT_ROLE {
+	if *params.MeshConfig.Role == conf.CLIENT_ROLE {
 		grpcEndpoint = "-"
+		wgEndpoint = "-"
 	}
 
 	return &MeshNode{
 		HostEndpoint: grpcEndpoint,
 		PublicKey:    params.PublicKey.String(),
-		WgEndpoint:   fmt.Sprintf("%s:%d", hostName, params.WgPort),
+		WgEndpoint:   wgEndpoint,
 		WgHost:       fmt.Sprintf("%s/128", params.NodeIP.String()),
 		Routes:       make(map[string]Route),
 		Description:  "",
 		Alias:        "",
-		Type:         string(f.Config.Role),
+		Type:         string(*params.MeshConfig.Role),
 	}
 }
 
@@ -56,12 +61,12 @@ func (f *MeshNodeFactory) getAddress(params *mesh.MeshNodeFactoryParams) string
 
 	if params.Endpoint != "" {
 		hostName = params.Endpoint
-	} else if len(f.Config.Endpoint) != 0 {
-		hostName = f.Config.Endpoint
+	} else if params.MeshConfig.Endpoint != nil && len(*params.MeshConfig.Endpoint) != 0 {
+		hostName = *params.MeshConfig.Endpoint
 	} else {
 		ipFunc := lib.GetPublicIP
 
-		if f.Config.IPDiscovery == conf.DNS_IP_DISCOVERY {
+		if *params.MeshConfig.IPDiscovery == conf.DNS_IP_DISCOVERY {
 			ipFunc = lib.GetOutboundIP
 		}
 

pkg/crdt/g_map.go

@@ -15,7 +15,7 @@ type Bucket[D any] struct {
 // GMap is a set that can only grow in size
 type GMap[K cmp.Ordered, D any] struct {
 	lock     sync.RWMutex
-	contents map[K]Bucket[D]
+	contents map[uint64]Bucket[D]
 	clock    *VectorClock[K]
 }
 
@@ -24,7 +24,7 @@ func (g *GMap[K, D]) Put(key K, value D) {
 
 	clock := g.clock.IncrementClock()
 
-	g.contents[key] = Bucket[D]{
+	g.contents[g.clock.hashFunc(key)] = Bucket[D]{
 		Vector:   clock,
 		Contents: value,
 	}
@@ -33,6 +33,10 @@ func (g *GMap[K, D]) Put(key K, value D) {
 }
 
 func (g *GMap[K, D]) Contains(key K) bool {
+	return g.contains(g.clock.hashFunc(key))
+}
+
+func (g *GMap[K, D]) contains(key uint64) bool {
 	g.lock.RLock()
 
 	_, ok := g.contents[key]
@@ -42,7 +46,7 @@ func (g *GMap[K, D]) Contains(key K) bool {
 	return ok
 }
 
-func (g *GMap[K, D]) put(key K, b Bucket[D]) {
+func (g *GMap[K, D]) put(key uint64, b Bucket[D]) {
 	g.lock.Lock()
 
 	if g.contents[key].Vector < b.Vector {
@@ -52,7 +56,7 @@ func (g *GMap[K, D]) put(key K, b Bucket[D]) {
 	g.lock.Unlock()
 }
 
-func (g *GMap[K, D]) get(key K) Bucket[D] {
+func (g *GMap[K, D]) get(key uint64) Bucket[D] {
 	g.lock.RLock()
 	bucket := g.contents[key]
 	g.lock.RUnlock()
@@ -61,14 +65,14 @@ func (g *GMap[K, D]) get(key K) Bucket[D] {
 }
 
 func (g *GMap[K, D]) Get(key K) D {
-	return g.get(key).Contents
+	return g.get(g.clock.hashFunc(key)).Contents
 }
 
 func (g *GMap[K, D]) Mark(key K) {
 	g.lock.Lock()
-	bucket := g.contents[key]
+	bucket := g.contents[g.clock.hashFunc(key)]
 	bucket.Gravestone = true
-	g.contents[key] = bucket
+	g.contents[g.clock.hashFunc(key)] = bucket
 	g.lock.Unlock()
 }
 
@@ -78,7 +82,7 @@ func (g *GMap[K, D]) IsMarked(key K) bool {
 
 	g.lock.RLock()
 
-	bucket, ok := g.contents[key]
+	bucket, ok := g.contents[g.clock.hashFunc(key)]
 
 	if ok {
 		marked = bucket.Gravestone
@@ -89,10 +93,10 @@ func (g *GMap[K, D]) IsMarked(key K) bool {
 	return marked
 }
 
-func (g *GMap[K, D]) Keys() []K {
+func (g *GMap[K, D]) Keys() []uint64 {
 	g.lock.RLock()
 
-	contents := make([]K, len(g.contents))
+	contents := make([]uint64, len(g.contents))
 	index := 0
 
 	for key := range g.contents {
@@ -104,8 +108,8 @@ func (g *GMap[K, D]) Keys() []K {
 	return contents
 }
 
-func (g *GMap[K, D]) Save() map[K]Bucket[D] {
-	buckets := make(map[K]Bucket[D])
+func (g *GMap[K, D]) Save() map[uint64]Bucket[D] {
+	buckets := make(map[uint64]Bucket[D])
 	g.lock.RLock()
 
 	for key, value := range g.contents {
@@ -116,8 +120,8 @@ func (g *GMap[K, D]) Save() map[K]Bucket[D] {
 	return buckets
 }
 
-func (g *GMap[K, D]) SaveWithKeys(keys []K) map[K]Bucket[D] {
-	buckets := make(map[K]Bucket[D])
+func (g *GMap[K, D]) SaveWithKeys(keys []uint64) map[uint64]Bucket[D] {
+	buckets := make(map[uint64]Bucket[D])
 	g.lock.RLock()
 
 	for _, key := range keys {
@@ -128,8 +132,8 @@ func (g *GMap[K, D]) SaveWithKeys(keys []K) map[K]Bucket[D] {
 	return buckets
 }
 
-func (g *GMap[K, D]) GetClock() map[K]uint64 {
-	clock := make(map[K]uint64)
+func (g *GMap[K, D]) GetClock() map[uint64]uint64 {
+	clock := make(map[uint64]uint64)
 	g.lock.RLock()
 
 	for key, bucket := range g.contents {
@@ -166,7 +170,7 @@ func (g *GMap[K, D]) Prune() {
 
 func NewGMap[K cmp.Ordered, D any](clock *VectorClock[K]) *GMap[K, D] {
 	return &GMap[K, D]{
-		contents: make(map[K]Bucket[D]),
+		contents: make(map[uint64]Bucket[D]),
 		clock:    clock,
 	}
 }

pkg/crdt/two_phase_map.go

@@ -14,19 +14,24 @@ type TwoPhaseMap[K cmp.Ordered, D any] struct {
 }
 
 type TwoPhaseMapSnapshot[K cmp.Ordered, D any] struct {
-	Add    map[K]Bucket[D]
-	Remove map[K]Bucket[bool]
+	Add    map[uint64]Bucket[D]
+	Remove map[uint64]Bucket[bool]
 }
 
 // Contains checks whether the value exists in the map
 func (m *TwoPhaseMap[K, D]) Contains(key K) bool {
-	if !m.addMap.Contains(key) {
+	return m.contains(m.Clock.hashFunc(key))
+}
+
+// Contains checks whether the value exists in the map
+func (m *TwoPhaseMap[K, D]) contains(key uint64) bool {
+	if !m.addMap.contains(key) {
 		return false
 	}
 
 	addValue := m.addMap.get(key)
 
-	if !m.removeMap.Contains(key) {
+	if !m.removeMap.contains(key) {
 		return true
 	}
 
@@ -45,6 +50,16 @@ func (m *TwoPhaseMap[K, D]) Get(key K) D {
 	return m.addMap.Get(key)
 }
 
+func (m *TwoPhaseMap[K, D]) get(key uint64) D {
+	var result D
+
+	if !m.contains(key) {
+		return result
+	}
+
+	return m.addMap.get(key).Contents
+}
+
 // Put places the key K in the map
 func (m *TwoPhaseMap[K, D]) Put(key K, data D) {
 	msgSequence := m.Clock.IncrementClock()
@@ -61,13 +76,13 @@ func (m *TwoPhaseMap[K, D]) Remove(key K) {
 	m.removeMap.Put(key, true)
 }
 
-func (m *TwoPhaseMap[K, D]) Keys() []K {
-	keys := make([]K, 0)
+func (m *TwoPhaseMap[K, D]) keys() []uint64 {
+	keys := make([]uint64, 0)
 
 	addKeys := m.addMap.Keys()
 
 	for _, key := range addKeys {
-		if !m.Contains(key) {
+		if !m.contains(key) {
 			continue
 		}
 
@@ -77,16 +92,16 @@ func (m *TwoPhaseMap[K, D]) Keys() []K {
 	return keys
 }
 
-func (m *TwoPhaseMap[K, D]) AsMap() map[K]D {
-	theMap := make(map[K]D)
+func (m *TwoPhaseMap[K, D]) AsList() []D {
+	theList := make([]D, 0)
 
-	keys := m.Keys()
+	keys := m.keys()
 
 	for _, key := range keys {
-		theMap[key] = m.Get(key)
+		theList = append(theList, m.get(key))
 	}
 
-	return theMap
+	return theList
 }
 
 func (m *TwoPhaseMap[K, D]) Snapshot() *TwoPhaseMapSnapshot[K, D] {
@@ -107,9 +122,9 @@ func (m *TwoPhaseMap[K, D]) SnapShotFromState(state *TwoPhaseMapState[K]) *TwoPh
 }
 
 type TwoPhaseMapState[K cmp.Ordered] struct {
-	Vectors        map[K]uint64
-	AddContents    map[K]uint64
-	RemoveContents map[K]uint64
+	Vectors        map[uint64]uint64
+	AddContents    map[uint64]uint64
+	RemoveContents map[uint64]uint64
 }
 
 func (m *TwoPhaseMap[K, D]) IsMarked(key K) bool {
@@ -120,7 +135,7 @@ func (m *TwoPhaseMap[K, D]) IsMarked(key K) bool {
 // Sums the current values of the vectors. Provides good approximation
 // of increasing numbers
 func (m *TwoPhaseMap[K, D]) GetHash() uint64 {
-	return m.addMap.GetHash() + m.removeMap.GetHash()
+	return (m.addMap.GetHash() + 1) * (m.removeMap.GetHash() + 1)
 }
 
 // GetState: get the current vector clock of the add and remove
@@ -136,22 +151,16 @@ func (m *TwoPhaseMap[K, D]) GenerateMessage() *TwoPhaseMapState[K] {
 	}
 }
 
-func (m *TwoPhaseMap[K, D]) UpdateVector(state *TwoPhaseMapState[K]) {
-	for key, value := range state.Vectors {
-		m.Clock.Put(key, value)
-	}
-}
-
-func (m *TwoPhaseMapState[K]) Difference(state *TwoPhaseMapState[K]) *TwoPhaseMapState[K] {
+func (m *TwoPhaseMapState[K]) Difference(highestStale uint64, state *TwoPhaseMapState[K]) *TwoPhaseMapState[K] {
 	mapState := &TwoPhaseMapState[K]{
-		AddContents:    make(map[K]uint64),
-		RemoveContents: make(map[K]uint64),
+		AddContents:    make(map[uint64]uint64),
+		RemoveContents: make(map[uint64]uint64),
 	}
 
 	for key, value := range state.AddContents {
 		otherValue, ok := m.AddContents[key]
 
-		if !ok || otherValue < value {
+		if value > highestStale && (!ok || otherValue < value) {
 			mapState.AddContents[key] = value
 		}
 	}
@@ -159,7 +168,7 @@ func (m *TwoPhaseMapState[K]) Difference(state *TwoPhaseMapState[K]) *TwoPhaseMa
 	for key, value := range state.RemoveContents {
 		otherValue, ok := m.RemoveContents[key]
 
-		if !ok || otherValue < value {
+		if value > highestStale && (!ok || otherValue < value) {
 			mapState.RemoveContents[key] = value
 		}
 	}
@@ -172,12 +181,12 @@ func (m *TwoPhaseMap[K, D]) Merge(snapshot TwoPhaseMapSnapshot[K, D]) {
 		// Gravestone is local only to that node.
 		// Discover ourselves if the node is alive
 		m.addMap.put(key, value)
-		m.Clock.Put(key, value.Vector)
+		m.Clock.put(key, value.Vector)
 	}
 
 	for key, value := range snapshot.Remove {
 		m.removeMap.put(key, value)
-		m.Clock.Put(key, value.Vector)
+		m.Clock.put(key, value.Vector)
 	}
 }
 

pkg/crdt/two_phase_map_syncer.go

@@ -44,7 +44,7 @@ func hash(syncer *TwoPhaseSyncer) ([]byte, bool) {
 	err := enc.Encode(hash)
 
 	if err != nil {
-		logging.Log.WriteInfof(err.Error())
+		logging.Log.WriteErrorf(err.Error())
 	}
 
 	syncer.IncrementState()
@@ -59,7 +59,7 @@ func prepare(syncer *TwoPhaseSyncer) ([]byte, bool) {
 	err := dec.Decode(&hash)
 
 	if err != nil {
-		logging.Log.WriteInfof(err.Error())
+		logging.Log.WriteErrorf(err.Error())
 	}
 
 	// If vector clocks are equal then no need to merge state
@@ -68,13 +68,20 @@ func prepare(syncer *TwoPhaseSyncer) ([]byte, bool) {
 		return nil, false
 	}
 
+	// Increment the clock here so the clock gets
+	// distributed to everyone else in the mesh
+	syncer.manager.store.Clock.IncrementClock()
+
 	var buffer bytes.Buffer
 	enc := gob.NewEncoder(&buffer)
 
+	mapState := syncer.manager.store.GenerateMessage()
+
+	syncer.mapState = mapState
 	err = enc.Encode(*syncer.mapState)
 
 	if err != nil {
-		logging.Log.WriteInfof(err.Error())
+		logging.Log.WriteErrorf(err.Error())
 	}
 
 	syncer.IncrementState()
@@ -93,10 +100,11 @@ func present(syncer *TwoPhaseSyncer) ([]byte, bool) {
 	err := dec.Decode(&mapState)
 
 	if err != nil {
-		logging.Log.WriteInfof(err.Error())
+		logging.Log.WriteErrorf(err.Error())
 	}
 
-	difference := syncer.mapState.Difference(&mapState)
+	difference := syncer.mapState.Difference(syncer.manager.store.Clock.GetStaleCount(), &mapState)
+	syncer.manager.store.Clock.Merge(mapState.Vectors)
 
 	var sendBuffer bytes.Buffer
 	enc := gob.NewEncoder(&sendBuffer)
@@ -163,9 +171,6 @@ func (t *TwoPhaseSyncer) RecvMessage(msg []byte) error {
 
 func (t *TwoPhaseSyncer) Complete() {
 	logging.Log.WriteInfof("SYNC COMPLETED")
-	if t.state == FINISHED || t.state == MERGE {
-		t.manager.store.Clock.IncrementClock()
-	}
 }
 
 func NewTwoPhaseSyncer(manager *TwoPhaseStoreMeshManager) *TwoPhaseSyncer {
@@ -180,7 +185,6 @@ func NewTwoPhaseSyncer(manager *TwoPhaseStoreMeshManager) *TwoPhaseSyncer {
 	return &TwoPhaseSyncer{
 		manager:            manager,
 		state:              HASH,
-		mapState:           manager.store.GenerateMessage(),
 		generateMessageFSM: generateMessageFsm,
 	}
 }

pkg/crdt/vector_clock.go

@@ -2,7 +2,6 @@ package crdt
 
 import (
 	"cmp"
-	"slices"
 	"sync"
 	"time"
 
@@ -19,11 +18,13 @@ type VectorBucket struct {
 // Vector clock defines an abstract data type
 // for a vector clock implementation
 type VectorClock[K cmp.Ordered] struct {
-	vectors   map[K]*VectorBucket
+	vectors   map[uint64]*VectorBucket
 	lock      sync.RWMutex
 	processID K
 	staleTime uint64
 	hashFunc  func(K) uint64
+	// highest update that's been garbage collected
+	highestStale uint64
 }
 
 // IncrementClock: increments the node's value in the vector clock
@@ -40,7 +41,7 @@ func (m *VectorClock[K]) IncrementClock() uint64 {
 		lastUpdate: uint64(time.Now().Unix()),
 	}
 
-	m.vectors[m.processID] = &newBucket
+	m.vectors[m.hashFunc(m.processID)] = &newBucket
 
 	m.lock.Unlock()
 	return maxClock
@@ -53,30 +54,33 @@ func (m *VectorClock[K]) GetHash() uint64 {
 
 	hash := uint64(0)
 
-	sortedKeys := lib.MapKeys(m.vectors)
-	slices.Sort(sortedKeys)
-
 	for key, bucket := range m.vectors {
-		hash += m.hashFunc(key)
-		hash += bucket.clock
+		hash += key * (bucket.clock + 1)
 	}
 
 	m.lock.RUnlock()
 	return hash
 }
 
+func (m *VectorClock[K]) Merge(vectors map[uint64]uint64) {
+	for key, value := range vectors {
+		m.put(key, value)
+	}
+}
+
 // getStale: get all entries that are stale within the mesh
-func (m *VectorClock[K]) getStale() []K {
+func (m *VectorClock[K]) getStale() []uint64 {
 	m.lock.RLock()
 	maxTimeStamp := lib.Reduce(0, lib.MapValues(m.vectors), func(i uint64, vb *VectorBucket) uint64 {
 		return max(i, vb.lastUpdate)
 	})
 
-	toRemove := make([]K, 0)
+	toRemove := make([]uint64, 0)
 
 	for key, bucket := range m.vectors {
 		if maxTimeStamp-bucket.lastUpdate > m.staleTime {
 			toRemove = append(toRemove, key)
+			m.highestStale = max(bucket.clock, m.highestStale)
 		}
 	}
 
@@ -84,6 +88,15 @@ func (m *VectorClock[K]) getStale() []K {
 	return toRemove
 }
 
+// GetStaleCount: returns a vector clock which is considered to be stale.
+// all updates must be greater than this
+func (m *VectorClock[K]) GetStaleCount() uint64 {
+	m.lock.RLock()
+	staleCount := m.highestStale
+	m.lock.RUnlock()
+	return staleCount
+}
+
 func (m *VectorClock[K]) Prune() {
 	stale := m.getStale()
 
@@ -97,10 +110,19 @@ func (m *VectorClock[K]) Prune() {
 }
 
 func (m *VectorClock[K]) GetTimestamp(processId K) uint64 {
-	return m.vectors[processId].lastUpdate
+	m.lock.RLock()
+
+	lastUpdate := m.vectors[m.hashFunc(m.processID)].lastUpdate
+
+	m.lock.RUnlock()
+	return lastUpdate
 }
 
 func (m *VectorClock[K]) Put(key K, value uint64) {
+	m.put(m.hashFunc(key), value)
+}
+
+func (m *VectorClock[K]) put(key uint64, value uint64) {
 	clockValue := uint64(0)
 
 	m.lock.Lock()
@@ -110,7 +132,9 @@ func (m *VectorClock[K]) Put(key K, value uint64) {
 		clockValue = bucket.clock
 	}
 
-	if value > clockValue {
+	// Make sure that entries that were garbage collected don't get
+	// addded back
+	if value > clockValue && value > m.highestStale {
 		newBucket := VectorBucket{
 			clock:      value,
 			lastUpdate: uint64(time.Now().Unix()),
@@ -121,16 +145,13 @@ func (m *VectorClock[K]) Put(key K, value uint64) {
 	m.lock.Unlock()
 }
 
-func (m *VectorClock[K]) GetClock() map[K]uint64 {
-	clock := make(map[K]uint64)
+func (m *VectorClock[K]) GetClock() map[uint64]uint64 {
+	clock := make(map[uint64]uint64)
 
 	m.lock.RLock()
 
-	keys := lib.MapKeys(m.vectors)
-	slices.Sort(keys)
-
-	for key, value := range clock {
-		clock[key] = value
+	for key, value := range m.vectors {
+		clock[key] = value.clock
 	}
 
 	m.lock.RUnlock()
@@ -139,7 +160,7 @@ func (m *VectorClock[K]) GetClock() map[K]uint64 {
 
 func NewVectorClock[K cmp.Ordered](processID K, hashFunc func(K) uint64, staleTime uint64) *VectorClock[K] {
 	return &VectorClock[K]{
-		vectors:   make(map[K]*VectorBucket),
+		vectors:   make(map[uint64]*VectorBucket),
 		processID: processID,
 		staleTime: staleTime,
 		hashFunc:  hashFunc,

pkg/ctrlserver/ctrlserver.go

@@ -16,7 +16,7 @@ import (
 
 // NewCtrlServerParams are the params requried to create a new ctrl server
 type NewCtrlServerParams struct {
-	Conf         *conf.WgMeshConfiguration
+	Conf         *conf.DaemonConfiguration
 	Client       *wgctrl.Client
 	CtrlProvider rpc.MeshCtrlServerServer
 	SyncProvider rpc.SyncServiceServer
@@ -28,7 +28,9 @@ type NewCtrlServerParams struct {
 // operation failed
 func NewCtrlServer(params *NewCtrlServerParams) (*MeshCtrlServer, error) {
 	ctrlServer := new(MeshCtrlServer)
-	meshFactory := &crdt.TwoPhaseMapFactory{}
+	meshFactory := &crdt.TwoPhaseMapFactory{
+		Config: params.Conf,
+	}
 	nodeFactory := &crdt.MeshNodeFactory{
 		Config: *params.Conf,
 	}
@@ -36,7 +38,7 @@ func NewCtrlServer(params *NewCtrlServerParams) (*MeshCtrlServer, error) {
 	ipAllocator := &ip.ULABuilder{}
 	interfaceManipulator := wg.NewWgInterfaceManipulator(params.Client)
 
-	configApplyer := mesh.NewWgMeshConfigApplyer(params.Conf)
+	configApplyer := mesh.NewWgMeshConfigApplyer()
 
 	meshManagerParams := &mesh.NewMeshManagerParams{
 		Conf:                 *params.Conf,
@@ -87,7 +89,8 @@ func NewCtrlServer(params *NewCtrlServerParams) (*MeshCtrlServer, error) {
 	return ctrlServer, nil
 }
 
-func (s *MeshCtrlServer) GetConfiguration() *conf.WgMeshConfiguration {
+
+func (s *MeshCtrlServer) GetConfiguration() *conf.DaemonConfiguration {
 	return s.Conf
 }
 

pkg/ctrlserver/ctrltypes.go

@@ -1,8 +1,12 @@
 package ctrlserver
 
 import (
+	"net"
+	"time"
+
 	"github.com/tim-beatham/wgmesh/pkg/conf"
 	"github.com/tim-beatham/wgmesh/pkg/conn"
+	"github.com/tim-beatham/wgmesh/pkg/lib"
 	"github.com/tim-beatham/wgmesh/pkg/mesh"
 	"github.com/tim-beatham/wgmesh/pkg/query"
 	"golang.zx2c4.com/wireguard/wgctrl"
@@ -14,6 +18,14 @@ type MeshRoute struct {
 	Path        []string
 }
 
+// Represents the WireGuard configuration attached to the node
+type WireGuardStats struct {
+	AllowedIPs                  []string
+	TransmitBytes               int64
+	ReceivedBytes               int64
+	PersistentKeepAliveInterval time.Duration
+}
+
 // Represents a WireGuard MeshNode
 type MeshNode struct {
 	HostEndpoint string
@@ -25,6 +37,7 @@ type MeshNode struct {
 	Description  string
 	Alias        string
 	Services     map[string]string
+	Stats        WireGuardStats
 }
 
 // Represents a WireGuard Mesh
@@ -34,7 +47,7 @@ type Mesh struct {
 }
 
 type CtrlServer interface {
-	GetConfiguration() *conf.WgMeshConfiguration
+	GetConfiguration() *conf.DaemonConfiguration
 	GetClient() *wgctrl.Client
 	GetQuerier() query.Querier
 	GetMeshManager() mesh.MeshManager
@@ -48,6 +61,56 @@ type MeshCtrlServer struct {
 	MeshManager       mesh.MeshManager
 	ConnectionManager conn.ConnectionManager
 	ConnectionServer  *conn.ConnectionServer
-	Conf              *conf.WgMeshConfiguration
+	Conf              *conf.DaemonConfiguration
 	Querier           query.Querier
 }
+
+// NewCtrlNode create an instance of a ctrl node to send over an
+// IPC call
+func NewCtrlNode(provider mesh.MeshProvider, node mesh.MeshNode) *MeshNode {
+	pubKey, _ := node.GetPublicKey()
+
+	ctrlNode := MeshNode{
+		HostEndpoint: node.GetHostEndpoint(),
+		WgEndpoint:   node.GetWgEndpoint(),
+		PublicKey:    pubKey.String(),
+		WgHost:       node.GetWgHost().String(),
+		Timestamp:    node.GetTimeStamp(),
+		Routes: lib.Map(node.GetRoutes(), func(r mesh.Route) MeshRoute {
+			return MeshRoute{
+				Destination: r.GetDestination().String(),
+				Path:        r.GetPath(),
+			}
+		}),
+		Description: node.GetDescription(),
+		Alias:       node.GetAlias(),
+		Services:    node.GetServices(),
+	}
+
+	device, err := provider.GetDevice()
+
+	if err != nil {
+		return &ctrlNode
+	}
+
+	peers := lib.Filter(device.Peers, func(p wgtypes.Peer) bool {
+		return p.PublicKey.String() == pubKey.String()
+	})
+
+	if len(peers) > 0 {
+		peer := peers[0]
+
+		stats := WireGuardStats{
+			AllowedIPs: lib.Map(peer.AllowedIPs, func(i net.IPNet) string {
+				return i.String()
+			}),
+			TransmitBytes:               peer.TransmitBytes,
+			ReceivedBytes:               peer.ReceiveBytes,
+			PersistentKeepAliveInterval: peer.PersistentKeepaliveInterval,
+		}
+
+		ctrlNode.Stats = stats
+	}
+
+	return &ctrlNode
+}

pkg/ctrlserver/stub.go

@@ -23,10 +23,10 @@ func NewCtrlServerStub() *CtrlServerStub {
 	}
 }
 
-func (c *CtrlServerStub) GetConfiguration() *conf.WgMeshConfiguration {
-	return &conf.WgMeshConfiguration{
-		GrpcPort: "8080",
-		Endpoint: "abc.com",
+func (c *CtrlServerStub) GetConfiguration() *conf.DaemonConfiguration {
+	return &conf.DaemonConfiguration{
+		GrpcPort:          8080,
+		BaseConfiguration: conf.WgConfiguration{},
 	}
 }
 

pkg/ipc/ipc.go

@@ -10,12 +10,29 @@ import (
 	"github.com/tim-beatham/wgmesh/pkg/ctrlserver"
 )
 
-type NewMeshArgs struct {
+// WireGuardArgs are provided args specific to WireGuard
+type WireGuardArgs struct {
 	// WgPort is the WireGuard port to expose
 	WgPort int
+	// KeepAliveWg is the number of seconds to keep alive
+	// for WireGuard NAT/firewall traversal
+	KeepAliveWg int
+	// AdvertiseRoutes whether or not to advertise routes to and from the
+	// mesh network
+	AdvertiseRoutes bool
+	// AdvertiseDefaultRoute whether or not to advertise the default route
+	// into the mesh network
+	AdvertiseDefaultRoute bool
 	// Endpoint is the routable alias of the machine. Can be an IP
 	// or DNS entry
 	Endpoint string
+	// Role is the role of the individual in the mesh
+	Role string
+}
+
+type NewMeshArgs struct {
+	// WgArgs are specific WireGuard args to use
+	WgArgs WireGuardArgs
 }
 
 type JoinMeshArgs struct {
@@ -23,14 +40,8 @@ type JoinMeshArgs struct {
 	MeshId string
 	// IpAddress is a routable IP in another mesh
 	IpAdress string
-	// Port is the WireGuard port to expose
-	Port int
-	// Endpoint is the routable address of this machine. If not provided
-	// defaults to the default address
-	Endpoint string
-	// Client specifies whether we should join as a client of the peer
-	// we are connecting to
-	Client bool
+	// WgArgs is the WireGuard parameters to use.
+	WgArgs WireGuardArgs
 }
 
 type PutServiceArgs struct {
@@ -51,11 +62,6 @@ type QueryMesh struct {
 	Query  string
 }
 
-type GetNodeArgs struct {
-	NodeId string
-	MeshId string
-}
-
 type MeshIpc interface {
 	CreateMesh(args *NewMeshArgs, reply *string) error
 	ListMeshes(name string, reply *ListMeshReply) error
@@ -67,7 +73,6 @@ type MeshIpc interface {
 	PutDescription(description string, reply *string) error
 	PutAlias(alias string, reply *string) error
 	PutService(args PutServiceArgs, reply *string) error
-	GetNode(args GetNodeArgs, reply *string) error
 	DeleteService(service string, reply *string) error
 }
 

pkg/lib/conv.go

@@ -7,6 +7,27 @@ func MapValues[K cmp.Ordered, V any](m map[K]V) []V {
 	return MapValuesWithExclude(m, map[K]struct{}{})
 }
 
+type MapItemsEntry[K cmp.Ordered, V any] struct {
+	Key   K
+	Value V
+}
+
+func MapItems[K cmp.Ordered, V any](m map[K]V) []MapItemsEntry[K, V] {
+	keys := MapKeys(m)
+	values := MapValues(m)
+
+	vs := make([]MapItemsEntry[K, V], len(keys))
+
+	for index, _ := range keys {
+		vs[index] = MapItemsEntry[K, V]{
+			Key:   keys[index],
+			Value: values[index],
+		}
+	}
+
+	return vs
+}
+
 func MapValuesWithExclude[K cmp.Ordered, V any](m map[K]V, exclude map[K]struct{}) []V {
 	values := make([]V, len(m)-len(exclude))
 

pkg/lib/rtnetlink.go

@@ -140,26 +140,38 @@ func (c *RtNetlinkConfig) AddRoute(ifName string, route Route) error {
 		family = unix.AF_INET
 	}
 
-	attr := rtnetlink.RouteAttributes{
-		Dst:      dst.IP,
-		OutIface: uint32(iface.Index),
-		Gateway:  gw,
-	}
-
-	ones, _ := dst.Mask.Size()
-
-	err = c.conn.Route.Replace(&rtnetlink.RouteMessage{
-		Family:     family,
-		Table:      unix.RT_TABLE_MAIN,
-		Protocol:   unix.RTPROT_BOOT,
-		Scope:      unix.RT_SCOPE_LINK,
-		Type:       unix.RTN_UNICAST,
-		DstLength:  uint8(ones),
-		Attributes: attr,
-	})
+	routes, err := c.listRoutes(ifName, family)
 
 	if err != nil {
-		return fmt.Errorf("failed to add route %w", err)
+		return err
+	}
+
+	// If it already exists no need to add the route
+	if !Contains(routes, func(prevRoute rtnetlink.RouteMessage) bool {
+		return prevRoute.Attributes.Dst.Equal(route.Destination.IP) &&
+			prevRoute.Attributes.Gateway.Equal(route.Gateway)
+	}) {
+		attr := rtnetlink.RouteAttributes{
+			Dst:      dst.IP,
+			OutIface: uint32(iface.Index),
+			Gateway:  gw,
+		}
+
+		ones, _ := dst.Mask.Size()
+
+		err = c.conn.Route.Replace(&rtnetlink.RouteMessage{
+			Family:     family,
+			Table:      unix.RT_TABLE_MAIN,
+			Protocol:   unix.RTPROT_BOOT,
+			Scope:      unix.RT_SCOPE_LINK,
+			Type:       unix.RTN_UNICAST,
+			DstLength:  uint8(ones),
+			Attributes: attr,
+		})
+
+		if err != nil {
+			return fmt.Errorf("failed to add route %w", err)
+		}
 	}
 
 	return nil
@@ -213,8 +225,11 @@ type Route struct {
 }
 
 func (r1 Route) equal(r2 Route) bool {
+	mask1Ones, _ := r1.Destination.Mask.Size()
+	mask2Ones, _ := r2.Destination.Mask.Size()
+
 	return r1.Gateway.String() == r2.Gateway.String() &&
-		r1.Destination.String() == r2.Destination.String()
+		(mask1Ones == 0 && mask2Ones == 0 || r1.Destination.IP.Equal(r2.Destination.IP))
 }
 
 // DeleteRoutes deletes all routes not in exclude
@@ -245,17 +260,18 @@ func (c *RtNetlinkConfig) DeleteRoutes(ifName string, family uint8, exclude ...R
 
 	shouldExclude := func(r Route) bool {
 		for _, route := range exclude {
-			if route.equal(r) {
+			if r.equal(route) {
 				return false
 			}
 		}
+
 		return true
 	}
 
 	toDelete := Filter(ifRoutes, shouldExclude)
 
 	for _, route := range toDelete {
-		logging.Log.WriteInfof("Deleting route: %s", route.Gateway.String())
+		logging.Log.WriteInfof("Deleting route: %s", route.Destination.String())
 		err := c.DeleteRoute(ifName, route)
 
 		if err != nil {

pkg/mesh/config.go

@@ -10,7 +10,6 @@ import (
 	"github.com/tim-beatham/wgmesh/pkg/conf"
 	"github.com/tim-beatham/wgmesh/pkg/ip"
 	"github.com/tim-beatham/wgmesh/pkg/lib"
-	logging "github.com/tim-beatham/wgmesh/pkg/log"
 	"github.com/tim-beatham/wgmesh/pkg/route"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
@@ -25,8 +24,8 @@ type MeshConfigApplyer interface {
 // WgMeshConfigApplyer applies WireGuard configuration
 type WgMeshConfigApplyer struct {
 	meshManager    MeshManager
-	config         *conf.WgMeshConfiguration
 	routeInstaller route.RouteInstaller
+	hashFunc       func(MeshNode) int
 }
 
 type routeNode struct {
@@ -34,49 +33,44 @@ type routeNode struct {
 	route   Route
 }
 
-func (m *WgMeshConfigApplyer) convertMeshNode(node MeshNode, device *wgtypes.Device,
-	peerToClients map[string][]net.IPNet,
-	routes map[string][]routeNode) (*wgtypes.PeerConfig, error) {
+type convertMeshNodeParams struct {
+	node          MeshNode
+	self          MeshNode
+	mesh          MeshProvider
+	device        *wgtypes.Device
+	peerToClients map[string][]net.IPNet
+	routes        map[string][]routeNode
+}
 
-	endpoint, err := net.ResolveUDPAddr("udp", node.GetWgEndpoint())
-
-	if err != nil {
-		return nil, err
-	}
-
-	pubKey, err := node.GetPublicKey()
+func (m *WgMeshConfigApplyer) convertMeshNode(params convertMeshNodeParams) (*wgtypes.PeerConfig, error) {
+	pubKey, err := params.node.GetPublicKey()
 
 	if err != nil {
 		return nil, err
 	}
 
 	allowedips := make([]net.IPNet, 1)
-	allowedips[0] = *node.GetWgHost()
+	allowedips[0] = *params.node.GetWgHost()
 
-	clients, ok := peerToClients[pubKey.String()]
+	clients, ok := params.peerToClients[pubKey.String()]
 
 	if ok {
 		allowedips = append(allowedips, clients...)
 	}
 
-	for _, route := range node.GetRoutes() {
-		bestRoutes := routes[route.GetDestination().String()]
+	for _, route := range params.node.GetRoutes() {
+		bestRoutes := params.routes[route.GetDestination().String()]
 		var pickedRoute routeNode
 
 		if len(bestRoutes) == 1 {
 			pickedRoute = bestRoutes[0]
 		} else if len(bestRoutes) > 1 {
-			keyFunc := func(mn MeshNode) int {
-				pubKey, _ := mn.GetPublicKey()
-				return lib.HashString(pubKey.String())
-			}
-
 			bucketFunc := func(rn routeNode) int {
 				return lib.HashString(rn.gateway)
 			}
 
 			// Else there is more than one candidate so consistently hash
-			pickedRoute = lib.ConsistentHash(bestRoutes, node, bucketFunc, keyFunc)
+			pickedRoute = lib.ConsistentHash(bestRoutes, params.self, bucketFunc, m.hashFunc)
 		}
 
 		if pickedRoute.gateway == pubKey.String() {
@@ -84,15 +78,28 @@ func (m *WgMeshConfigApplyer) convertMeshNode(node MeshNode, device *wgtypes.Dev
 		}
 	}
 
-	keepAlive := time.Duration(m.config.KeepAliveWg) * time.Second
+	config := params.mesh.GetConfiguration()
 
-	existing := slices.IndexFunc(device.Peers, func(p wgtypes.Peer) bool {
-		pubKey, _ := node.GetPublicKey()
+	var keepAlive time.Duration = time.Duration(0)
+
+	if config.KeepAliveWg != nil {
+		keepAlive = time.Duration(*config.KeepAliveWg) * time.Second
+	}
+
+	existing := slices.IndexFunc(params.device.Peers, func(p wgtypes.Peer) bool {
+		pubKey, _ := params.node.GetPublicKey()
 		return p.PublicKey.String() == pubKey.String()
 	})
 
+	endpoint, err := net.ResolveUDPAddr("udp", params.node.GetWgEndpoint())
+
+	if err != nil {
+		return nil, err
+	}
+
+	// Don't override the existing IP in case it already exists
 	if existing != -1 {
-		endpoint = device.Peers[existing].Endpoint
+		endpoint = params.device.Peers[existing].Endpoint
 	}
 
 	peerConfig := wgtypes.PeerConfig{
@@ -110,13 +117,15 @@ func (m *WgMeshConfigApplyer) convertMeshNode(node MeshNode, device *wgtypes.Dev
 // consistently hash to evenly spread the distribution of traffic
 func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]routeNode {
 	mesh, _ := meshProvider.GetMesh()
-
 	routes := make(map[string][]routeNode)
 
+	peers := lib.Filter(lib.MapValues(mesh.GetNodes()), func(p MeshNode) bool {
+		return p.GetType() == conf.PEER_ROLE
+	})
+
 	meshPrefixes := lib.Map(lib.MapValues(m.meshManager.GetMeshes()), func(mesh MeshProvider) *net.IPNet {
 		ula := &ip.ULABuilder{}
 		ipNet, _ := ula.GetIPNet(mesh.GetMeshId())
-
 		return ipNet
 	})
 
@@ -125,6 +134,10 @@ func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]
 
 		for _, route := range node.GetRoutes() {
 			if lib.Contains(meshPrefixes, func(prefix *net.IPNet) bool {
+				if prefix.IP.Equal(net.IPv6zero) && *meshProvider.GetConfiguration().AdvertiseDefaultRoute {
+					return true
+				}
+
 				return prefix.Contains(route.GetDestination().IP)
 			}) {
 				continue
@@ -138,6 +151,24 @@ func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]
 				route:   route,
 			}
 
+			// Client's only acessible by another peer
+			if node.GetType() == conf.CLIENT_ROLE {
+				peer := m.getCorrespondingPeer(peers, node)
+				self, _ := m.meshManager.GetSelf(meshProvider.GetMeshId())
+
+				// If the node isn't the self use that peer as the gateway
+				if !NodeEquals(peer, self) {
+					peerPub, _ := peer.GetPublicKey()
+					rn.gateway = peerPub.String()
+					rn.route = &RouteStub{
+						Destination: rn.route.GetDestination(),
+						HopCount:    rn.route.GetHopCount() + 1,
+						// Append the path to this peer
+						Path: append(rn.route.GetPath(), peer.GetWgHost().IP.String()),
+					}
+				}
+			}
+
 			if !ok {
 				otherRoute = make([]routeNode, 1)
 				otherRoute[0] = rn
@@ -145,8 +176,6 @@ func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]
 			} else if route.GetHopCount() < otherRoute[0].route.GetHopCount() {
 				otherRoute[0] = rn
 			} else if otherRoute[0].route.GetHopCount() == route.GetHopCount() {
-				logging.Log.WriteInfof("Other Route Hop: %d", otherRoute[0].route.GetHopCount())
-				logging.Log.WriteInfof("Route gateway %s, route hop %d", rn.gateway, route.GetHopCount())
 				routes[destination] = append(otherRoute, rn)
 			}
 		}
@@ -157,67 +186,127 @@ func (m *WgMeshConfigApplyer) getRoutes(meshProvider MeshProvider) map[string][]
 
 // getCorrespondignPeer: gets the peer corresponding to the client
 func (m *WgMeshConfigApplyer) getCorrespondingPeer(peers []MeshNode, client MeshNode) MeshNode {
-	hashFunc := func(mn MeshNode) int {
-		pubKey, _ := mn.GetPublicKey()
-		return lib.HashString(pubKey.String())
-	}
-
-	peer := lib.ConsistentHash(peers, client, hashFunc, hashFunc)
+	peer := lib.ConsistentHash(peers, client, m.hashFunc, m.hashFunc)
 	return peer
 }
 
-func (m *WgMeshConfigApplyer) getClientConfig(mesh MeshProvider, peers []MeshNode, clients []MeshNode) (*wgtypes.Config, error) {
-	self, err := m.meshManager.GetSelf(mesh.GetMeshId())
+func (m *WgMeshConfigApplyer) getPeerCfgsToRemove(dev *wgtypes.Device, newPeers []wgtypes.PeerConfig) []wgtypes.PeerConfig {
+	peers := dev.Peers
+	peers = lib.Filter(peers, func(p1 wgtypes.Peer) bool {
+		return !lib.Contains(newPeers, func(p2 wgtypes.PeerConfig) bool {
+			return p1.PublicKey.String() == p2.PublicKey.String()
+		})
+	})
+
+	return lib.Map(peers, func(p wgtypes.Peer) wgtypes.PeerConfig {
+		return wgtypes.PeerConfig{
+			PublicKey: p.PublicKey,
+			Remove:    true,
+		}
+	})
+}
+
+type GetConfigParams struct {
+	mesh    MeshProvider
+	peers   []MeshNode
+	clients []MeshNode
+	dev     *wgtypes.Device
+	routes  map[string][]routeNode
+}
+
+func (m *WgMeshConfigApplyer) getClientConfig(params *GetConfigParams) (*wgtypes.Config, error) {
+	self, err := m.meshManager.GetSelf(params.mesh.GetMeshId())
+	ula := &ip.ULABuilder{}
+	meshNet, _ := ula.GetIPNet(params.mesh.GetMeshId())
+
+	routesForMesh := lib.Map(lib.MapValues(params.routes), func(rns []routeNode) []routeNode {
+		return lib.Filter(rns, func(rn routeNode) bool {
+			ip, _, _ := net.ParseCIDR(rn.gateway)
+			return meshNet.Contains(ip)
+		})
+	})
+
+	routes := lib.Map(routesForMesh, func(rs []routeNode) net.IPNet {
+		return *rs[0].route.GetDestination()
+	})
+	routes = append(routes, *meshNet)
 
 	if err != nil {
 		return nil, err
 	}
 
-	peer := m.getCorrespondingPeer(peers, self)
-
+	peer := m.getCorrespondingPeer(params.peers, self)
 	pubKey, _ := peer.GetPublicKey()
 
-	keepAlive := time.Duration(m.config.KeepAliveWg) * time.Second
+	config := params.mesh.GetConfiguration()
+
+	keepAlive := time.Duration(*config.KeepAliveWg) * time.Second
 	endpoint, err := net.ResolveUDPAddr("udp", peer.GetWgEndpoint())
 
 	if err != nil {
 		return nil, err
 	}
 
-	allowedips := make([]net.IPNet, 1)
-	_, ipnet, _ := net.ParseCIDR("::/0")
-	allowedips[0] = *ipnet
-
 	peerCfgs := make([]wgtypes.PeerConfig, 1)
 
 	peerCfgs[0] = wgtypes.PeerConfig{
 		PublicKey:                   pubKey,
 		Endpoint:                    endpoint,
 		PersistentKeepaliveInterval: &keepAlive,
-		AllowedIPs:                  allowedips,
+		AllowedIPs:                  routes,
+		ReplaceAllowedIPs:           true,
+	}
+
+	installedRoutes := make([]lib.Route, 0)
+
+	for _, route := range peerCfgs[0].AllowedIPs {
+		installedRoutes = append(installedRoutes, lib.Route{
+			Gateway:     peer.GetWgHost().IP,
+			Destination: route,
+		})
 	}
 
 	cfg := wgtypes.Config{
 		Peers: peerCfgs,
 	}
 
+	m.routeInstaller.InstallRoutes(params.dev.Name, installedRoutes...)
 	return &cfg, err
 }
 
-func (m *WgMeshConfigApplyer) getPeerConfig(mesh MeshProvider, peers []MeshNode, clients []MeshNode, dev *wgtypes.Device) (*wgtypes.Config, error) {
+func (m *WgMeshConfigApplyer) getRoutesToInstall(wgNode *wgtypes.PeerConfig, mesh MeshProvider, node MeshNode) []lib.Route {
+	routes := make([]lib.Route, 0)
+
+	for _, route := range wgNode.AllowedIPs {
+		ula := &ip.ULABuilder{}
+		ipNet, _ := ula.GetIPNet(mesh.GetMeshId())
+
+		_, defaultRoute, _ := net.ParseCIDR("::/0")
+
+		if !ipNet.Contains(route.IP) && !ipNet.IP.Equal(defaultRoute.IP) {
+			routes = append(routes, lib.Route{
+				Gateway:     node.GetWgHost().IP,
+				Destination: route,
+			})
+		}
+	}
+
+	return routes
+}
+
+func (m *WgMeshConfigApplyer) getPeerConfig(params *GetConfigParams) (*wgtypes.Config, error) {
 	peerToClients := make(map[string][]net.IPNet)
-	routes := m.getRoutes(mesh)
 	installedRoutes := make([]lib.Route, 0)
 	peerConfigs := make([]wgtypes.PeerConfig, 0)
-	self, err := m.meshManager.GetSelf(mesh.GetMeshId())
+	self, err := m.meshManager.GetSelf(params.mesh.GetMeshId())
 
 	if err != nil {
 		return nil, err
 	}
 
-	for _, n := range clients {
-		if len(peers) > 0 {
-			peer := m.getCorrespondingPeer(peers, n)
+	for _, n := range params.clients {
+		if len(params.peers) > 0 {
+			peer := m.getCorrespondingPeer(params.peers, n)
 			pubKey, _ := peer.GetPublicKey()
 			clients, ok := peerToClients[pubKey.String()]
 
@@ -229,53 +318,56 @@ func (m *WgMeshConfigApplyer) getPeerConfig(mesh MeshProvider, peers []MeshNode,
 			peerToClients[pubKey.String()] = append(clients, *n.GetWgHost())
 
 			if NodeEquals(self, peer) {
-				cfg, err := m.convertMeshNode(n, dev, peerToClients, routes)
+				cfg, err := m.convertMeshNode(convertMeshNodeParams{
+					node:          n,
+					self:          self,
+					mesh:          params.mesh,
+					device:        params.dev,
+					peerToClients: peerToClients,
+					routes:        params.routes,
+				})
 
 				if err != nil {
 					return nil, err
 				}
 
+				installedRoutes = append(installedRoutes, m.getRoutesToInstall(cfg, params.mesh, n)...)
 				peerConfigs = append(peerConfigs, *cfg)
 			}
 		}
 	}
 
-	for _, n := range peers {
+	for _, n := range params.peers {
 		if NodeEquals(n, self) {
 			continue
 		}
 
-		peer, err := m.convertMeshNode(n, dev, peerToClients, routes)
+		peer, err := m.convertMeshNode(convertMeshNodeParams{
+			node:          n,
+			self:          self,
+			mesh:          params.mesh,
+			peerToClients: peerToClients,
+			routes:        params.routes,
+			device:        params.dev,
+		})
 
 		if err != nil {
 			return nil, err
 		}
 
-		for _, route := range peer.AllowedIPs {
-			ula := &ip.ULABuilder{}
-			ipNet, _ := ula.GetIPNet(mesh.GetMeshId())
-
-			if !ipNet.Contains(route.IP) {
-				installedRoutes = append(installedRoutes, lib.Route{
-					Gateway:     n.GetWgHost().IP,
-					Destination: route,
-				})
-			}
-		}
-
+		installedRoutes = append(installedRoutes, m.getRoutesToInstall(peer, params.mesh, n)...)
 		peerConfigs = append(peerConfigs, *peer)
 	}
 
 	cfg := wgtypes.Config{
-		Peers:        peerConfigs,
-		ReplacePeers: true,
+		Peers: peerConfigs,
 	}
 
-	err = m.routeInstaller.InstallRoutes(dev.Name, installedRoutes...)
+	err = m.routeInstaller.InstallRoutes(params.dev.Name, installedRoutes...)
 	return &cfg, err
 }
 
-func (m *WgMeshConfigApplyer) updateWgConf(mesh MeshProvider) error {
+func (m *WgMeshConfigApplyer) updateWgConf(mesh MeshProvider, routes map[string][]routeNode) error {
 	snap, err := mesh.GetMesh()
 
 	if err != nil {
@@ -305,17 +397,28 @@ func (m *WgMeshConfigApplyer) updateWgConf(mesh MeshProvider) error {
 
 	var cfg *wgtypes.Config = nil
 
+	configParams := &GetConfigParams{
+		mesh:    mesh,
+		peers:   peers,
+		clients: clients,
+		dev:     dev,
+		routes:  routes,
+	}
+
 	switch self.GetType() {
 	case conf.PEER_ROLE:
-		cfg, err = m.getPeerConfig(mesh, peers, clients, dev)
+		cfg, err = m.getPeerConfig(configParams)
 	case conf.CLIENT_ROLE:
-		cfg, err = m.getClientConfig(mesh, peers, clients)
+		cfg, err = m.getClientConfig(configParams)
 	}
 
 	if err != nil {
 		return err
 	}
 
+	toRemove := m.getPeerCfgsToRemove(dev, cfg.Peers)
+	cfg.Peers = append(cfg.Peers, toRemove...)
+
 	err = m.meshManager.GetClient().ConfigureDevice(dev.Name, *cfg)
 
 	if err != nil {
@@ -325,9 +428,36 @@ func (m *WgMeshConfigApplyer) updateWgConf(mesh MeshProvider) error {
 	return nil
 }
 
-func (m *WgMeshConfigApplyer) ApplyConfig() error {
+func (m *WgMeshConfigApplyer) getAllRoutes() map[string][]routeNode {
+	allRoutes := make(map[string][]routeNode)
+
 	for _, mesh := range m.meshManager.GetMeshes() {
-		err := m.updateWgConf(mesh)
+		routes := m.getRoutes(mesh)
+
+		for destination, route := range routes {
+			_, ok := allRoutes[destination]
+
+			if !ok {
+				allRoutes[destination] = route
+				continue
+			}
+
+			if allRoutes[destination][0].route.GetHopCount() == route[0].route.GetHopCount() {
+				allRoutes[destination] = append(allRoutes[destination], route...)
+			} else if route[0].route.GetHopCount() < allRoutes[destination][0].route.GetHopCount() {
+				allRoutes[destination] = route
+			}
+		}
+	}
+
+	return allRoutes
+}
+
+func (m *WgMeshConfigApplyer) ApplyConfig() error {
+	allRoutes := m.getAllRoutes()
+
+	for _, mesh := range m.meshManager.GetMeshes() {
+		err := m.updateWgConf(mesh, allRoutes)
 
 		if err != nil {
 			return err
@@ -362,9 +492,12 @@ func (m *WgMeshConfigApplyer) SetMeshManager(manager MeshManager) {
 	m.meshManager = manager
 }
 
-func NewWgMeshConfigApplyer(config *conf.WgMeshConfiguration) MeshConfigApplyer {
+func NewWgMeshConfigApplyer() MeshConfigApplyer {
 	return &WgMeshConfigApplyer{
-		config:         config,
 		routeInstaller: route.NewRouteInstaller(),
+		hashFunc: func(mn MeshNode) int {
+			pubKey, _ := mn.GetPublicKey()
+			return lib.HashString(pubKey.String())
+		},
 	}
 }

pkg/mesh/manager.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/tim-beatham/wgmesh/pkg/cmd"
 	"github.com/tim-beatham/wgmesh/pkg/conf"
 	"github.com/tim-beatham/wgmesh/pkg/ip"
 	"github.com/tim-beatham/wgmesh/pkg/lib"
@@ -14,7 +15,7 @@ import (
 )
 
 type MeshManager interface {
-	CreateMesh(port int) (string, error)
+	CreateMesh(params *CreateMeshParams) (string, error)
 	AddMesh(params *AddMeshParams) error
 	HasChanges(meshid string) bool
 	GetMesh(meshId string) MeshProvider
@@ -30,7 +31,6 @@ type MeshManager interface {
 	UpdateTimeStamp() error
 	GetClient() *wgctrl.Client
 	GetMeshes() map[string]MeshProvider
-	Prune() error
 	Close() error
 	GetMonitor() MeshMonitor
 	GetNode(string, string) MeshNode
@@ -45,7 +45,7 @@ type MeshManagerImpl struct {
 	// HostParameters contains information that uniquely locates
 	// the node in the mesh network.
 	HostParameters       *HostParameters
-	conf                 *conf.WgMeshConfiguration
+	conf                 *conf.DaemonConfiguration
 	meshProviderFactory  MeshProviderFactory
 	nodeFactory          MeshNodeFactory
 	configApplyer        MeshConfigApplyer
@@ -53,6 +53,7 @@ type MeshManagerImpl struct {
 	ipAllocator          ip.IPAllocator
 	interfaceManipulator wg.WgInterfaceManipulator
 	Monitor              MeshMonitor
+	cmdRunner            cmd.CmdRunner
 	OnDelete             func(MeshProvider)
 }
 
@@ -108,21 +109,38 @@ func (m *MeshManagerImpl) GetMonitor() MeshMonitor {
 	return m.Monitor
 }
 
-// Prune implements MeshManager.
-func (m *MeshManagerImpl) Prune() error {
-	for _, mesh := range m.Meshes {
-		err := mesh.Prune()
+// CreateMeshParams contains the parameters required to create a mesh
+type CreateMeshParams struct {
+	Port int
+	Conf *conf.WgConfiguration
+}
+
+// getConf: gets the new configuration with the base configuration overriden
+// from the recent
+func (m *MeshManagerImpl) getConf(override *conf.WgConfiguration) (*conf.WgConfiguration, error) {
+	meshConfiguration := m.conf.BaseConfiguration
+
+	if override != nil {
+		newConf, err := conf.MergeMeshConfiguration(meshConfiguration, *override)
 
 		if err != nil {
-			return err
+			return nil, err
 		}
+
+		meshConfiguration = newConf
 	}
 
-	return nil
+	return &meshConfiguration, nil
 }
 
 // CreateMesh: Creates a new mesh, stores it and returns the mesh id
-func (m *MeshManagerImpl) CreateMesh(port int) (string, error) {
+func (m *MeshManagerImpl) CreateMesh(args *CreateMeshParams) (string, error) {
+	meshConfiguration, err := m.getConf(args.Conf)
+
+	if err != nil {
+		return "", err
+	}
+
 	meshId, err := m.idGenerator.GetId()
 
 	var ifName string = ""
@@ -131,8 +149,10 @@ func (m *MeshManagerImpl) CreateMesh(port int) (string, error) {
 		return "", err
 	}
 
+	m.cmdRunner.RunCommands(m.conf.BaseConfiguration.PreUp...)
+
 	if !m.conf.StubWg {
-		ifName, err = m.interfaceManipulator.CreateInterface(port, m.HostParameters.PrivateKey)
+		ifName, err = m.interfaceManipulator.CreateInterface(args.Port, m.HostParameters.PrivateKey)
 
 		if err != nil {
 			return "", fmt.Errorf("error creating mesh: %w", err)
@@ -140,12 +160,13 @@ func (m *MeshManagerImpl) CreateMesh(port int) (string, error) {
 	}
 
 	nodeManager, err := m.meshProviderFactory.CreateMesh(&MeshProviderFactoryParams{
-		DevName: ifName,
-		Port:    port,
-		Conf:    m.conf,
-		Client:  m.Client,
-		MeshId:  meshId,
-		NodeID:  m.HostParameters.GetPublicKey(),
+		DevName:    ifName,
+		Port:       args.Port,
+		Conf:       meshConfiguration,
+		Client:     m.Client,
+		MeshId:     meshId,
+		DaemonConf: m.conf,
+		NodeID:     m.HostParameters.GetPublicKey(),
 	})
 
 	if err != nil {
@@ -155,6 +176,9 @@ func (m *MeshManagerImpl) CreateMesh(port int) (string, error) {
 	m.lock.Lock()
 	m.Meshes[meshId] = nodeManager
 	m.lock.Unlock()
+
+	m.cmdRunner.RunCommands(m.conf.BaseConfiguration.PostUp...)
+
 	return meshId, nil
 }
 
@@ -162,6 +186,7 @@ type AddMeshParams struct {
 	MeshId    string
 	WgPort    int
 	MeshBytes []byte
+	Conf      *conf.WgConfiguration
 }
 
 // AddMesh: Add the mesh to the list of meshes
@@ -169,6 +194,14 @@ func (m *MeshManagerImpl) AddMesh(params *AddMeshParams) error {
 	var ifName string
 	var err error
 
+	meshConfiguration, err := m.getConf(params.Conf)
+
+	if err != nil {
+		return err
+	}
+
+	m.cmdRunner.RunCommands(meshConfiguration.PreUp...)
+
 	if !m.conf.StubWg {
 		ifName, err = m.interfaceManipulator.CreateInterface(params.WgPort, m.HostParameters.PrivateKey)
 
@@ -178,14 +211,17 @@ func (m *MeshManagerImpl) AddMesh(params *AddMeshParams) error {
 	}
 
 	meshProvider, err := m.meshProviderFactory.CreateMesh(&MeshProviderFactoryParams{
-		DevName: ifName,
-		Port:    params.WgPort,
-		Conf:    m.conf,
-		Client:  m.Client,
-		MeshId:  params.MeshId,
-		NodeID:  m.HostParameters.GetPublicKey(),
+		DevName:    ifName,
+		Port:       params.WgPort,
+		Conf:       meshConfiguration,
+		Client:     m.Client,
+		MeshId:     params.MeshId,
+		DaemonConf: m.conf,
+		NodeID:     m.HostParameters.GetPublicKey(),
 	})
 
+	m.cmdRunner.RunCommands(meshConfiguration.PostUp...)
+
 	if err != nil {
 		return err
 	}
@@ -255,10 +291,11 @@ func (s *MeshManagerImpl) AddSelf(params *AddSelfParams) error {
 	}
 
 	node := s.nodeFactory.Build(&MeshNodeFactoryParams{
-		PublicKey: &pubKey,
-		NodeIP:    nodeIP,
-		WgPort:    params.WgPort,
-		Endpoint:  params.Endpoint,
+		PublicKey:  &pubKey,
+		NodeIP:     nodeIP,
+		WgPort:     params.WgPort,
+		Endpoint:   params.Endpoint,
+		MeshConfig: mesh.GetConfiguration(),
 	})
 
 	if !s.conf.StubWg {
@@ -276,7 +313,7 @@ func (s *MeshManagerImpl) AddSelf(params *AddSelfParams) error {
 	}
 
 	s.Meshes[params.MeshId].AddNode(node)
-	return s.RouteManager.UpdateRoutes()
+	return nil
 }
 
 // LeaveMesh leaves the mesh network
@@ -287,10 +324,7 @@ func (s *MeshManagerImpl) LeaveMesh(meshId string) error {
 		return fmt.Errorf("mesh %s does not exist", meshId)
 	}
 
-	var err error
-
-	s.RouteManager.RemoveRoutes(meshId)
-	err = mesh.RemoveNode(s.HostParameters.GetPublicKey())
+	err := mesh.RemoveNode(s.HostParameters.GetPublicKey())
 
 	if err != nil {
 		return err
@@ -304,6 +338,8 @@ func (s *MeshManagerImpl) LeaveMesh(meshId string) error {
 	delete(s.Meshes, meshId)
 	s.lock.Unlock()
 
+	s.cmdRunner.RunCommands(s.conf.BaseConfiguration.PreDown...)
+
 	if !s.conf.StubWg {
 		device, err := mesh.GetDevice()
 
@@ -318,6 +354,8 @@ func (s *MeshManagerImpl) LeaveMesh(meshId string) error {
 		}
 	}
 
+	s.cmdRunner.RunCommands(s.conf.BaseConfiguration.PostDown...)
+
 	return err
 }
 
@@ -439,7 +477,7 @@ func (s *MeshManagerImpl) Close() error {
 
 // NewMeshManagerParams params required to create an instance of a mesh manager
 type NewMeshManagerParams struct {
-	Conf                 conf.WgMeshConfiguration
+	Conf                 conf.DaemonConfiguration
 	Client               *wgctrl.Client
 	MeshProvider         MeshProviderFactory
 	NodeFactory          MeshNodeFactory
@@ -448,6 +486,7 @@ type NewMeshManagerParams struct {
 	InterfaceManipulator wg.WgInterfaceManipulator
 	ConfigApplyer        MeshConfigApplyer
 	RouteManager         RouteManager
+	CommandRunner        cmd.CmdRunner
 	OnDelete             func(MeshProvider)
 }
 
@@ -474,6 +513,10 @@ func NewMeshManager(params *NewMeshManagerParams) MeshManager {
 		m.RouteManager = NewRouteManager(m)
 	}
 
+	if params.CommandRunner == nil {
+		m.cmdRunner = &cmd.UnixCmdRunner{}
+	}
+
 	m.idGenerator = params.IdGenerator
 	m.ipAllocator = params.IPAllocator
 	m.interfaceManipulator = params.InterfaceManipulator

pkg/mesh/manager_test.go

@@ -9,16 +9,9 @@ import (
 	"github.com/tim-beatham/wgmesh/pkg/wg"
 )
 
-func getMeshConfiguration() *conf.WgMeshConfiguration {
-	return &conf.WgMeshConfiguration{
-		GrpcPort:           "8080",
-		Endpoint:           "abc.com",
-		ClusterSize:        64,
-		SyncRate:           4,
-		BranchRate:         3,
-		InterClusterChance: 0.15,
-		InfectionCount:     2,
-		KeepAliveTime:      60,
+func getMeshConfiguration() *conf.DaemonConfiguration {
+	return &conf.DaemonConfiguration{
+		GrpcPort: 8080,
 	}
 }
 

pkg/mesh/pruner.go

@@ -1,16 +0,0 @@
-package mesh
-
-import (
-	"github.com/tim-beatham/wgmesh/pkg/conf"
-	"github.com/tim-beatham/wgmesh/pkg/lib"
-)
-
-func pruneFunction(m MeshManager) lib.TimerFunc {
-	return func() error {
-		return m.Prune()
-	}
-}
-
-func NewPruner(m MeshManager, conf conf.WgMeshConfiguration) *lib.Timer {
-	return lib.NewTimer(pruneFunction(m), conf.PruneTime/2)
-}

pkg/mesh/route.go

@@ -1,14 +1,14 @@
 package mesh
 
 import (
+	"net"
+
 	"github.com/tim-beatham/wgmesh/pkg/ip"
 	"github.com/tim-beatham/wgmesh/pkg/lib"
-	logging "github.com/tim-beatham/wgmesh/pkg/log"
 )
 
 type RouteManager interface {
 	UpdateRoutes() error
-	RemoveRoutes(meshId string) error
 }
 
 type RouteManagerImpl struct {
@@ -17,77 +17,100 @@ type RouteManagerImpl struct {
 
 func (r *RouteManagerImpl) UpdateRoutes() error {
 	meshes := r.meshManager.GetMeshes()
-	ulaBuilder := new(ip.ULABuilder)
+	routes := make(map[string][]Route)
 
 	for _, mesh1 := range meshes {
+		if !*mesh1.GetConfiguration().AdvertiseRoutes {
+			continue
+		}
+
 		self, err := r.meshManager.GetSelf(mesh1.GetMeshId())
 
 		if err != nil {
 			return err
 		}
 
-		pubKey, err := self.GetPublicKey()
-
-		if err != nil {
-			return err
+		if _, ok := routes[mesh1.GetMeshId()]; !ok {
+			routes[mesh1.GetMeshId()] = make([]Route, 0)
 		}
 
-		routes, err := mesh1.GetRoutes(pubKey.String())
+		if *mesh1.GetConfiguration().AdvertiseDefaultRoute {
+			_, ipv6Default, _ := net.ParseCIDR("::/0")
+
+			defaultRoute := &RouteStub{
+				Destination: ipv6Default,
+				HopCount:    0,
+				Path:        []string{mesh1.GetMeshId()},
+			}
+
+			mesh1.AddRoutes(NodeID(self), defaultRoute)
+			routes[mesh1.GetMeshId()] = append(routes[mesh1.GetMeshId()], defaultRoute)
+		}
+
+		routeMap, err := mesh1.GetRoutes(NodeID(self))
 
 		if err != nil {
 			return err
 		}
 
 		for _, mesh2 := range meshes {
+			routeValues, ok := routes[mesh2.GetMeshId()]
+
+			if !ok {
+				routeValues = make([]Route, 0)
+			}
+
 			if mesh1 == mesh2 {
 				continue
 			}
 
-			ipNet, err := ulaBuilder.GetIPNet(mesh2.GetMeshId())
+			mesh1IpNet, _ := (&ip.ULABuilder{}).GetIPNet(mesh1.GetMeshId())
 
-			if err != nil {
-				logging.Log.WriteErrorf(err.Error())
-				return err
-			}
-
-			err = mesh2.AddRoutes(NodeID(self), append(lib.MapValues(routes), &RouteStub{
-				Destination: ipNet,
+			routeValues = append(routeValues, &RouteStub{
+				Destination: mesh1IpNet,
 				HopCount:    0,
-				Path:        make([]string, 0),
-			})...)
+				Path:        []string{mesh1.GetMeshId()},
+			})
 
-			if err != nil {
-				return err
+			routeValues = append(routeValues, lib.MapValues(routeMap)...)
+			mesh2IpNet, _ := (&ip.ULABuilder{}).GetIPNet(mesh2.GetMeshId())
+			routeValues = lib.Filter(routeValues, func(r Route) bool {
+				pathNotMesh := func(s string) bool {
+					return s == mesh2.GetMeshId()
+				}
+
+				// Remove any potential routing loops
+				return !r.GetDestination().IP.Equal(mesh2IpNet.IP) &&
+					!lib.Contains(r.GetPath()[1:], pathNotMesh)
+			})
+
+			routes[mesh2.GetMeshId()] = routeValues
+		}
+	}
+
+	// Calculate the set different of each, working out routes to remove and to keep.
+	for meshId, meshRoutes := range routes {
+		mesh := r.meshManager.GetMesh(meshId)
+		self, _ := r.meshManager.GetSelf(meshId)
+		toRemove := make([]Route, 0)
+
+		prevRoutes, _ := mesh.GetRoutes(NodeID(self))
+
+		for _, route := range prevRoutes {
+			if !lib.Contains(meshRoutes, func(r Route) bool {
+				return RouteEquals(r, route)
+			}) {
+				toRemove = append(toRemove, route)
 			}
 		}
+
+		mesh.RemoveRoutes(NodeID(self), toRemove...)
+		mesh.AddRoutes(NodeID(self), meshRoutes...)
 	}
 
 	return nil
 }
 
-// removeRoutes: removes all meshes we are no longer a part of
-func (r *RouteManagerImpl) RemoveRoutes(meshId string) error {
-	ulaBuilder := new(ip.ULABuilder)
-	meshes := r.meshManager.GetMeshes()
-
-	ipNet, err := ulaBuilder.GetIPNet(meshId)
-
-	if err != nil {
-		return err
-	}
-
-	for _, mesh1 := range meshes {
-		self, err := r.meshManager.GetSelf(meshId)
-
-		if err != nil {
-			return err
-		}
-
-		mesh1.RemoveRoutes(NodeID(self), ipNet.String())
-	}
-	return nil
-}
-
 func NewRouteManager(m MeshManager) RouteManager {
 	return &RouteManagerImpl{meshManager: m}
 }

pkg/mesh/stub_types.go

@@ -81,6 +81,11 @@ type MeshProviderStub struct {
 	snapshot *MeshSnapshotStub
 }
 
+// GetConfiguration implements MeshProvider.
+func (*MeshProviderStub) GetConfiguration() *conf.WgConfiguration {
+	panic("unimplemented")
+}
+
 // Mark implements MeshProvider.
 func (*MeshProviderStub) Mark(nodeId string) {
 	panic("unimplemented")
@@ -126,7 +131,7 @@ func (*MeshProviderStub) SetAlias(nodeId string, alias string) error {
 }
 
 // RemoveRoutes implements MeshProvider.
-func (*MeshProviderStub) RemoveRoutes(nodeId string, route ...string) error {
+func (*MeshProviderStub) RemoveRoutes(nodeId string, route ...Route) error {
 	return nil
 }
 
@@ -195,7 +200,7 @@ func (s *StubMeshProviderFactory) CreateMesh(params *MeshProviderFactoryParams)
 }
 
 type StubNodeFactory struct {
-	Config *conf.WgMeshConfiguration
+	Config *conf.DaemonConfiguration
 }
 
 func (s *StubNodeFactory) Build(params *MeshNodeFactoryParams) MeshNode {
@@ -274,7 +279,7 @@ func NewMeshManagerStub() MeshManager {
 	return &MeshManagerStub{meshes: make(map[string]MeshProvider)}
 }
 
-func (m *MeshManagerStub) CreateMesh(port int) (string, error) {
+func (m *MeshManagerStub) CreateMesh(*CreateMeshParams) (string, error) {
 	return "tim123", nil
 }
 

pkg/mesh/types.go

@@ -4,6 +4,7 @@ package mesh
 
 import (
 	"net"
+	"slices"
 
 	"github.com/tim-beatham/wgmesh/pkg/conf"
 	"golang.zx2c4.com/wireguard/wgctrl"
@@ -19,6 +20,12 @@ type Route interface {
 	GetPath() []string
 }
 
+func RouteEquals(r1, r2 Route) bool {
+	return r1.GetDestination().String() == r2.GetDestination().String() &&
+		r1.GetHopCount() == r2.GetHopCount() &&
+		slices.Equal(r1.GetPath(), r2.GetPath())
+}
+
 type RouteStub struct {
 	Destination *net.IPNet
 	HopCount    int
@@ -71,11 +78,6 @@ func NodeEquals(node1, node2 MeshNode) bool {
 	return key1.String() == key2.String()
 }
 
-func RouteEquals(route1, route2 Route) bool {
-	return route1.GetDestination().String() == route2.GetDestination().String() &&
-		route1.GetHopCount() == route2.GetHopCount()
-}
-
 func NodeID(node MeshNode) string {
 	key, _ := node.GetPublicKey()
 	return key.String()
@@ -116,7 +118,7 @@ type MeshProvider interface {
 	// AddRoutes: adds routes to the given node
 	AddRoutes(nodeId string, route ...Route) error
 	// DeleteRoutes: deletes the routes from the node
-	RemoveRoutes(nodeId string, route ...string) error
+	RemoveRoutes(nodeId string, route ...Route) error
 	// GetSyncer: returns the automerge syncer for sync
 	GetSyncer() MeshSyncer
 	// GetNode get a particular not within the mesh
@@ -143,6 +145,9 @@ type MeshProvider interface {
 	// Mark: marks the node as unreachable. This is not broadcast to the entire
 	// this is not considered when syncing node state
 	Mark(nodeId string)
+	// GetConfiguration: gets the configuration parameters specific for this
+	// mesh network
+	GetConfiguration() *conf.WgConfiguration
 }
 
 // HostParameters contains the IDs of a node
@@ -157,12 +162,13 @@ func (h *HostParameters) GetPublicKey() string {
 
 // MeshProviderFactoryParams parameters required to build a mesh provider
 type MeshProviderFactoryParams struct {
-	DevName string
-	MeshId  string
-	Port    int
-	Conf    *conf.WgMeshConfiguration
-	Client  *wgctrl.Client
-	NodeID  string
+	DevName    string
+	MeshId     string
+	Port       int
+	Conf       *conf.WgConfiguration
+	DaemonConf *conf.DaemonConfiguration
+	Client     *wgctrl.Client
+	NodeID     string
 }
 
 // MeshProviderFactory creates an instance of a mesh provider
@@ -173,10 +179,11 @@ type MeshProviderFactory interface {
 // MeshNodeFactoryParams are the parameters required to construct
 // a mesh node
 type MeshNodeFactoryParams struct {
-PublicKey *wgtypes.Key
-	NodeIP    net.IP
-	WgPort    int
-	Endpoint  string
+	PublicKey  *wgtypes.Key
+	NodeIP     net.IP
+	WgPort     int
+	Endpoint   string
+	MeshConfig *conf.WgConfiguration
 }
 
 // MeshBuilder build the hosts mesh node for it to be added to the mesh

pkg/robin/requester.go

@@ -2,17 +2,15 @@ package robin
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"strconv"
 	"time"
 
+	"github.com/tim-beatham/wgmesh/pkg/conf"
 	"github.com/tim-beatham/wgmesh/pkg/ctrlserver"
 	"github.com/tim-beatham/wgmesh/pkg/ipc"
-	"github.com/tim-beatham/wgmesh/pkg/lib"
 	"github.com/tim-beatham/wgmesh/pkg/mesh"
-	"github.com/tim-beatham/wgmesh/pkg/query"
 	"github.com/tim-beatham/wgmesh/pkg/rpc"
 )
 
@@ -20,8 +18,39 @@ type IpcHandler struct {
 	Server ctrlserver.CtrlServer
 }
 
+func getOverrideConfiguration(args *ipc.WireGuardArgs) conf.WgConfiguration {
+	overrideConf := conf.WgConfiguration{}
+
+	if args.Role != "" {
+		role := conf.NodeType(args.Role)
+		overrideConf.Role = &role
+	}
+
+	if args.Endpoint != "" {
+		overrideConf.Endpoint = &args.Endpoint
+	}
+
+	if args.KeepAliveWg != 0 {
+		keepAliveWg := args.KeepAliveWg
+		overrideConf.KeepAliveWg = &keepAliveWg
+	}
+
+	overrideConf.AdvertiseRoutes = &args.AdvertiseRoutes
+	overrideConf.AdvertiseDefaultRoute = &args.AdvertiseDefaultRoute
+	return overrideConf
+}
+
 func (n *IpcHandler) CreateMesh(args *ipc.NewMeshArgs, reply *string) error {
-	meshId, err := n.Server.GetMeshManager().CreateMesh(args.WgPort)
+	overrideConf := getOverrideConfiguration(&args.WgArgs)
+
+	if overrideConf.Role != nil && *overrideConf.Role == conf.CLIENT_ROLE {
+		return fmt.Errorf("cannot create a mesh with no public endpoint")
+	}
+
+	meshId, err := n.Server.GetMeshManager().CreateMesh(&mesh.CreateMeshParams{
+		Port: args.WgArgs.WgPort,
+		Conf: &overrideConf,
+	})
 
 	if err != nil {
 		return err
@@ -29,8 +58,8 @@ func (n *IpcHandler) CreateMesh(args *ipc.NewMeshArgs, reply *string) error {
 
 	err = n.Server.GetMeshManager().AddSelf(&mesh.AddSelfParams{
 		MeshId:   meshId,
-		WgPort:   args.WgPort,
-		Endpoint: args.Endpoint,
+		WgPort:   args.WgArgs.WgPort,
+		Endpoint: args.WgArgs.Endpoint,
 	})
 
 	if err != nil {
@@ -45,7 +74,7 @@ func (n *IpcHandler) ListMeshes(_ string, reply *ipc.ListMeshReply) error {
 	meshNames := make([]string, len(n.Server.GetMeshManager().GetMeshes()))
 
 	i := 0
-	for meshId, _ := range n.Server.GetMeshManager().GetMeshes() {
+	for meshId := range n.Server.GetMeshManager().GetMeshes() {
 		meshNames[i] = meshId
 		i++
 	}
@@ -55,6 +84,8 @@ func (n *IpcHandler) ListMeshes(_ string, reply *ipc.ListMeshReply) error {
 }
 
 func (n *IpcHandler) JoinMesh(args ipc.JoinMeshArgs, reply *string) error {
+	overrideConf := getOverrideConfiguration(&args.WgArgs)
+
 	peerConnection, err := n.Server.GetConnectionManager().GetConnection(args.IpAdress)
 
 	if err != nil {
@@ -86,8 +117,9 @@ func (n *IpcHandler) JoinMesh(args ipc.JoinMeshArgs, reply *string) error {
 
 	err = n.Server.GetMeshManager().AddMesh(&mesh.AddMeshParams{
 		MeshId:    args.MeshId,
-		WgPort:    args.Port,
+		WgPort:    args.WgArgs.WgPort,
 		MeshBytes: meshReply.Mesh,
+		Conf:      &overrideConf,
 	})
 
 	if err != nil {
@@ -96,8 +128,8 @@ func (n *IpcHandler) JoinMesh(args ipc.JoinMeshArgs, reply *string) error {
 
 	err = n.Server.GetMeshManager().AddSelf(&mesh.AddSelfParams{
 		MeshId:   args.MeshId,
-		WgPort:   args.Port,
-		Endpoint: args.Endpoint,
+		WgPort:   args.WgArgs.WgPort,
+		Endpoint: args.WgArgs.Endpoint,
 	})
 
 	if err != nil {
@@ -140,30 +172,9 @@ func (n *IpcHandler) GetMesh(meshId string, reply *ipc.GetMeshReply) error {
 
 	i := 0
 	for _, node := range meshSnapshot.GetNodes() {
-		pubKey, _ := node.GetPublicKey()
+		node := ctrlserver.NewCtrlNode(theMesh, node)
 
-		if err != nil {
-			return err
-		}
-
-		node := ctrlserver.MeshNode{
-			HostEndpoint: node.GetHostEndpoint(),
-			WgEndpoint:   node.GetWgEndpoint(),
-			PublicKey:    pubKey.String(),
-			WgHost:       node.GetWgHost().String(),
-			Timestamp:    node.GetTimeStamp(),
-			Routes: lib.Map(node.GetRoutes(), func(r mesh.Route) ctrlserver.MeshRoute {
-				return ctrlserver.MeshRoute{
-					Destination: r.GetDestination().String(),
-					Path:        r.GetPath(),
-				}
-			}),
-			Description: node.GetDescription(),
-			Alias:       node.GetAlias(),
-			Services:    node.GetServices(),
-		}
-
-		nodes[i] = node
+		nodes[i] = *node
 		i += 1
 	}
 
@@ -239,27 +250,6 @@ func (n *IpcHandler) DeleteService(service string, reply *string) error {
 	return nil
 }
 
-func (n *IpcHandler) GetNode(args ipc.GetNodeArgs, reply *string) error {
-	node := n.Server.GetMeshManager().GetNode(args.MeshId, args.NodeId)
-
-	if node == nil {
-		*reply = "nil"
-		return nil
-	}
-
-	queryNode := query.MeshNodeToQueryNode(node)
-
-	bytes, err := json.Marshal(queryNode)
-
-	if err != nil {
-		*reply = err.Error()
-		return nil
-	}
-
-	*reply = string(bytes)
-	return nil
-}
-
 type RobinIpcParams struct {
 	CtrlServer ctrlserver.CtrlServer
 }

pkg/sync/syncer.go

@@ -1,6 +1,8 @@
 package sync
 
 import (
+	"errors"
+	"fmt"
 	"io"
 	"math/rand"
 	"time"
@@ -24,22 +26,27 @@ type SyncerImpl struct {
 	infectionCount int
 	syncCount      int
 	cluster        conn.ConnCluster
-	conf           *conf.WgMeshConfiguration
-	lastSync       uint64
+	conf           *conf.DaemonConfiguration
+	lastSync       map[string]uint64
 }
 
 // Sync: Sync random nodes
 func (s *SyncerImpl) Sync(meshId string) error {
-	self, err := s.manager.GetSelf(meshId)
+	// Self can be nil if the node is removed
+	self, _ := s.manager.GetSelf(meshId)
 
-	if err != nil {
-		return err
-	}
+	correspondingMesh := s.manager.GetMesh(meshId)
 
-	s.manager.GetMesh(meshId).Prune()
+	correspondingMesh.Prune()
 
-	if self.GetType() == conf.PEER_ROLE && !s.manager.HasChanges(meshId) && s.infectionCount == 0 {
+	if self != nil && self.GetType() == conf.PEER_ROLE && !s.manager.HasChanges(meshId) && s.infectionCount == 0 {
 		logging.Log.WriteInfof("No changes for %s", meshId)
+
+		// If not synchronised in certain pull from random neighbour
+		if uint64(time.Now().Unix())-s.lastSync[meshId] > 20 {
+			return s.Pull(meshId)
+		}
+
 		return nil
 	}
 
@@ -50,12 +57,18 @@ func (s *SyncerImpl) Sync(meshId string) error {
 
 	logging.Log.WriteInfof(publicKey.String())
 
-	nodeNames := s.manager.GetMesh(meshId).GetPeers()
+	nodeNames := correspondingMesh.GetPeers()
+
+	if self != nil {
+		nodeNames = lib.Filter(nodeNames, func(s string) bool {
+			return s != mesh.NodeID(self)
+		})
+	}
 
 	var gossipNodes []string
 
 	// Clients always pings its peer for configuration
-	if self.GetType() == conf.CLIENT_ROLE {
+	if self != nil && self.GetType() == conf.CLIENT_ROLE {
 		keyFunc := lib.HashString
 		bucketFunc := lib.HashString
 
@@ -105,10 +118,10 @@ func (s *SyncerImpl) Sync(meshId string) error {
 	}
 
 	s.manager.GetMesh(meshId).SaveChanges()
-	s.lastSync = uint64(time.Now().Unix())
+	s.lastSync[meshId] = uint64(time.Now().Unix())
 
 	logging.Log.WriteInfof("UPDATING WG CONF")
-	err = s.manager.ApplyConfig()
+	err := s.manager.ApplyConfig()
 
 	if err != nil {
 		logging.Log.WriteInfof("Failed to update config %w", err)
@@ -117,20 +130,65 @@ func (s *SyncerImpl) Sync(meshId string) error {
 	return nil
 }
 
+// Pull one node in the cluster, if there has not been message dissemination
+// in a certain period of time pull a random node within the cluster
+func (s *SyncerImpl) Pull(meshId string) error {
+	mesh := s.manager.GetMesh(meshId)
+	self, err := s.manager.GetSelf(meshId)
+
+	if err != nil {
+		return err
+	}
+
+	pubKey, _ := self.GetPublicKey()
+
+	if mesh == nil {
+		return errors.New("mesh is nil, invalid operation")
+	}
+
+	peers := mesh.GetPeers()
+	neighbours := s.cluster.GetNeighbours(peers, pubKey.String())
+	neighbour := lib.RandomSubsetOfLength(neighbours, 1)
+
+	if len(neighbour) == 0 {
+		logging.Log.WriteInfof("no neighbours")
+		return nil
+	}
+
+	logging.Log.WriteInfof("PULLING from node %s", neighbour[0])
+
+	pullNode, err := mesh.GetNode(neighbour[0])
+
+	if err != nil || pullNode == nil {
+		return fmt.Errorf("node %s does not exist in the mesh", neighbour[0])
+	}
+
+	err = s.requester.SyncMesh(meshId, pullNode)
+
+	if err == nil || err == io.EOF {
+		s.lastSync[meshId] = uint64(time.Now().Unix())
+	} else {
+		return err
+	}
+
+	s.syncCount++
+	return nil
+}
+
 // SyncMeshes: Sync all meshes
 func (s *SyncerImpl) SyncMeshes() error {
 	for meshId := range s.manager.GetMeshes() {
 		err := s.Sync(meshId)
 
 		if err != nil {
-			return err
+			logging.Log.WriteErrorf(err.Error())
 		}
 	}
 
 	return nil
 }
 
-func NewSyncer(m mesh.MeshManager, conf *conf.WgMeshConfiguration, r SyncRequester) Syncer {
+func NewSyncer(m mesh.MeshManager, conf *conf.DaemonConfiguration, r SyncRequester) Syncer {
 	cluster, _ := conn.NewConnCluster(conf.ClusterSize)
 	return &SyncerImpl{
 		manager:        m,
@@ -138,5 +196,6 @@ func NewSyncer(m mesh.MeshManager, conf *conf.WgMeshConfiguration, r SyncRequest
 		requester:      r,
 		infectionCount: 0,
 		syncCount:      0,
-		cluster:        cluster}
+		cluster:        cluster,
+		lastSync:       make(map[string]uint64)}
 }

pkg/sync/syncrequester.go

@@ -91,7 +91,7 @@ func (s *SyncRequesterImpl) SyncMesh(meshId string, meshNode mesh.MeshNode) erro
 
 	c := rpc.NewSyncServiceClient(client)
 
-	syncTimeOut := s.server.Conf.SyncRate * float64(time.Second)
+	syncTimeOut := float64(s.server.Conf.SyncRate) * float64(time.Second)
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(syncTimeOut))
 	defer cancel()

pkg/sync/syncscheduler.go

@@ -8,10 +8,11 @@ import (
 // Run implements SyncScheduler.
 func syncFunction(syncer Syncer) lib.TimerFunc {
 	return func() error {
-		return syncer.SyncMeshes()
+		syncer.SyncMeshes()
+		return nil
 	}
 }
 
 func NewSyncScheduler(s *ctrlserver.MeshCtrlServer, syncRequester SyncRequester, syncer Syncer) *lib.Timer {
-	return lib.NewTimer(syncFunction(syncer), int(s.Conf.SyncRate))
+	return lib.NewTimer(syncFunction(syncer), s.Conf.SyncRate)
 }

pkg/timers/timers.go

@@ -11,6 +11,5 @@ func NewTimestampScheduler(ctrlServer *ctrlserver.MeshCtrlServer) lib.Timer {
 		logging.Log.WriteInfof("Updated Timestamp")
 		return ctrlServer.MeshManager.UpdateTimeStamp()
 	}
-
 	return *lib.NewTimer(timerFunc, ctrlServer.Conf.KeepAliveTime)
 }