extern/smegmesh
1
0
Fork 1
mirror of https://github.com/tim-beatham/smegmesh.git synced 2025-08-18 00:49:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrated to using grpc for handling rpc calls

Browse Source
This commit is contained in:
Tim Beatham
2023-09-19 18:29:35 +01:00
parent 86756903c7
commit 6e9ca4f31f
12 changed files with 451 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/wg-mesh/main.go
View File

@@ -2,16 +2,17 @@ package main
import (
"fmt"
"net/rpc"
ipcRpc "net/rpc"
"os"
"github.com/akamensky/argparse"
"github.com/tim-beatham/wgmesh/pkg/ctrlserver"
"github.com/tim-beatham/wgmesh/pkg/ipc"
)
const SockAddr = "/tmp/wgmesh_ipc.sock"
func createNewMesh(client *rpc.Client) {
func createNewMesh(client *ipcRpc.Client) {
var reply string
err := client.Call("Mesh.CreateNewMesh", "", &reply)
@@ -23,7 +24,7 @@ func createNewMesh(client *rpc.Client) {
fmt.Println(reply)
}
func listMeshes(client *rpc.Client) {
func listMeshes(client *ipcRpc.Client) {
var reply map[string]ctrlserver.Mesh
err := client.Call("Mesh.ListMeshes", "", &reply)
@@ -38,8 +39,19 @@ func listMeshes(client *rpc.Client) {
}
}
func joinMesh(client *rpc.Client, meshId string, ipAddress string) {
fmt.Println(meshId + " " + ipAddress)
func joinMesh(client *ipcRpc.Client, meshId string, ipAddress string) {
var reply string
args := ipc.JoinMeshArgs{MeshId: meshId, IpAdress: ipAddress}
err := client.Call("Mesh.JoinMesh", &args, &reply)
if err != nil {
fmt.Println(err.Error())
return
}
fmt.Println(reply)
}
func main() {
@@ -50,8 +62,8 @@ func main() {
listMeshCmd := parser.NewCommand("list-meshes", "List meshes the node is connected to")
joinMeshCmd := parser.NewCommand("join-mesh", "Join a mesh network")
var meshId *string = joinMeshCmd.StringPositional(&argparse.Options{Required: true})
var ipAddress *string = joinMeshCmd.StringPositional(&argparse.Options{Required: true})
var meshId *string = joinMeshCmd.String("m", "mesh", &argparse.Options{Required: true})
var ipAddress *string = joinMeshCmd.String("i", "ip", &argparse.Options{Required: true})
err := parser.Parse(os.Args)
@@ -60,7 +72,7 @@ func main() {
return
}
client, err := rpc.DialHTTP("unix", SockAddr)
client, err := ipcRpc.DialHTTP("unix", SockAddr)
if err != nil {
fmt.Println(err.Error())
return