holm/smegmesh
1
0
Fork 0
forked from extern/smegmesh
Code Pull Requests Activity

Merge pull request #84 from tim-beatham/81-separate-synchronisation-into-independent-processes

Browse Source 
81-seperate-processes
This commit is contained in:
Tim Beatham 2024-01-05 17:00:29 +00:00 committed by GitHub
commit b294f116a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/api/apiserver.go
View File

@ -74,6 +74,25 @@ func (s *SmegServer) meshToAPIMesh(meshId string, nodes []ctrlserver.MeshNode) S
return smegMesh
}
// putAlias: place an alias in the mesh
func (s *SmegServer) putAlias(meshId, alias string) error {
var reply string
return s.client.PutAlias(ipc.PutAliasArgs{
Alias: alias,
MeshId: meshId,
}, &reply)
}
func (s *SmegServer) putDescription(meshId, description string) error {
var reply string
return s.client.PutDescription(ipc.PutDescriptionArgs{
Description: description,
MeshId: meshId,
}, &reply)
}
// CreateMesh: creates a mesh network
func (s *SmegServer) CreateMesh(c *gin.Context) {
var createMesh CreateMeshRequest
@ -86,9 +105,15 @@ func (s *SmegServer) CreateMesh(c *gin.Context) {
return
}
fmt.Printf("%+v\n", createMesh)
ipcRequest := ipc.NewMeshArgs{
WgArgs: ipc.WireGuardArgs{
WgPort: createMesh.WgPort,
WgPort: createMesh.WgPort,
Role: createMesh.Role,
Endpoint: createMesh.PublicEndpoint,
AdvertiseRoutes: createMesh.AdvertiseRoutes,
AdvertiseDefaultRoute: createMesh.AdvertiseDefaults,
},
}
@ -103,6 +128,14 @@ func (s *SmegServer) CreateMesh(c *gin.Context) {
return
}
if createMesh.Alias != "" {
s.putAlias(reply, createMesh.Alias)
}
if createMesh.Description != "" {
s.putDescription(reply, createMesh.Description)
}
c.JSON(http.StatusOK, &gin.H{
"meshid": reply,
})
@ -123,7 +156,11 @@ func (s *SmegServer) JoinMesh(c *gin.Context) {
MeshId: joinMesh.MeshId,
IpAddress: joinMesh.Bootstrap,
WgArgs: ipc.WireGuardArgs{
WgPort: joinMesh.WgPort,
WgPort: joinMesh.WgPort,
Endpoint: joinMesh.PublicEndpoint,
Role: joinMesh.Role,
AdvertiseRoutes: joinMesh.AdvertiseRoutes,
AdvertiseDefaultRoute: joinMesh.AdvertiseDefaults,
},
}
@ -138,6 +175,14 @@ func (s *SmegServer) JoinMesh(c *gin.Context) {
return
}
if joinMesh.Alias != "" {
s.putAlias(reply, joinMesh.Alias)
}
if joinMesh.Description != "" {
s.putDescription(reply, joinMesh.Description)
}
c.JSON(http.StatusOK, &gin.H{
"status": "success",
})

24
pkg/api/types.go
View File

@ -71,6 +71,18 @@ type SmegMesh struct {
type CreateMeshRequest struct {
// WgPort is the WireGuard to create the mesh in
WgPort int `json:"port" binding:"omitempty,gte=1024,lt=65535"`
// Role is the role to take on in the mesh
Role string `json:"role" binding:"required,eq=client|eq=peer"`
// AdvertiseRoutes: advertise thi mesh to other meshes
AdvertiseRoutes bool `json:"advertiseRoutes"`
// AdvertiseDefaults: advertise an exit point
AdvertiseDefaults bool `json:"advertiseDefaults"`
// Alias: alias of the node in the mesh
Alias string `json:"alias"`
// Description: description of the node in the mesh
Description string `json:"description"`
// PublicEndpoint: an alternative public endpoint to advertise
PublicEndpoint string `json:"publicEndpoint"`
}
// JoinMeshRequests encapsulates a request to create a mesh network
@ -81,6 +93,18 @@ type JoinMeshRequest struct {
Bootstrap string `json:"bootstrap" binding:"required"`
// MeshId is the ID of the mesh to join
MeshId string `json:"meshid" binding:"required"`
// Role is the role to take on in the mesh
Role string `json:"role" binding:"required,eq=client|eq=peer"`
// AdvertiseRoutes: advertise thi mesh to other meshes
AdvertiseRoutes bool `json:"advertiseRoutes"`
// AdvertiseDefaults: advertise an exit point
AdvertiseDefaults bool `json:"advertiseDefaults"`
// Alias: alias of the node in the mesh
Alias string `json:"alias"`
// Description: description of the node in the mesh
Description string `json:"description"`
// PublicEndpoint: an alternative public endpoint to advertise
PublicEndpoint string `json:"publicEndpoint"`
}
// ApiServerConf configuration to instantiate the API server

20
pkg/robin/requester.go
View File

@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"slices"
"time"
"github.com/tim-beatham/smegmesh/pkg/conf"
@ -51,7 +52,7 @@ func (n *IpcHandler) CreateMesh(args *ipc.NewMeshArgs, reply *string) error {
})
if err != nil {
return err
return errors.New("could not create mesh")
}
err = n.Server.GetMeshManager().AddSelf(&mesh.AddSelfParams{
@ -61,7 +62,7 @@ func (n *IpcHandler) CreateMesh(args *ipc.NewMeshArgs, reply *string) error {
})
if err != nil {
return err
return errors.New("could not create mesh")
}
*reply = meshId
@ -78,6 +79,7 @@ func (n *IpcHandler) ListMeshes(_ string, reply *ipc.ListMeshReply) error {
i++
}
slices.Sort(meshNames)
*reply = ipc.ListMeshReply{Meshes: meshNames}
return nil
}
@ -93,19 +95,19 @@ func (n *IpcHandler) JoinMesh(args *ipc.JoinMeshArgs, reply *string) error {
peerConnection, err := n.Server.GetConnectionManager().GetConnection(args.IpAddress)
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
client, err := peerConnection.GetClient()
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
c := rpc.NewMeshCtrlServerClient(client)
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
configuration := n.Server.GetConfiguration()
@ -116,7 +118,7 @@ func (n *IpcHandler) JoinMesh(args *ipc.JoinMeshArgs, reply *string) error {
meshReply, err := c.GetMesh(ctx, &rpc.GetMeshRequest{MeshId: args.MeshId})
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
err = n.Server.GetMeshManager().AddMesh(&mesh.AddMeshParams{
@ -127,7 +129,7 @@ func (n *IpcHandler) JoinMesh(args *ipc.JoinMeshArgs, reply *string) error {
})
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
err = n.Server.GetMeshManager().AddSelf(&mesh.AddSelfParams{
@ -137,7 +139,7 @@ func (n *IpcHandler) JoinMesh(args *ipc.JoinMeshArgs, reply *string) error {
})
if err != nil {
return err
return fmt.Errorf("could not join mesh %s", args.MeshId)
}
*reply = fmt.Sprintf("Successfully Joined: %s", args.MeshId)
@ -219,7 +221,7 @@ func (n *IpcHandler) PutAlias(args ipc.PutAliasArgs, reply *string) error {
err := n.Server.GetMeshManager().SetAlias(args.MeshId, args.Alias)
if err != nil {
return err
return fmt.Errorf("could not set alias: %s", args.Alias)
}
*reply = fmt.Sprintf("Set alias to %s", args.Alias)