feat: add signal cmd

cmd/root.go

@@ -1,6 +1,12 @@
 package cmd
 
-import "github.com/spf13/cobra"
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"os"
+	"os/signal"
+	"syscall"
+)
 
 var (
 	rootCmd = &cobra.Command{
@@ -17,4 +23,13 @@ func Execute() error {
 
 func init() {
 	rootCmd.AddCommand(upCmd)
+	rootCmd.AddCommand(signalCmd)
+}
+
+func SetupCloseHandler() {
+	c := make(chan os.Signal)
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	<-c
+	fmt.Println("\r- Ctrl+C pressed in Terminal")
+	os.Exit(0)
 }

cmd/signal.go

@@ -0,0 +1,47 @@
+package cmd
+
+import (
+	"flag"
+	"fmt"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	sig "github.com/wiretrustee/wiretrustee/signal"
+	sProto "github.com/wiretrustee/wiretrustee/signal/proto"
+	"google.golang.org/grpc"
+	"net"
+)
+
+var (
+	port int
+
+	signalCmd = &cobra.Command{
+		Use:   "signal",
+		Short: "start Wiretrustee Signal Server",
+		Run: func(cmd *cobra.Command, args []string) {
+			flag.Parse()
+
+			lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
+			if err != nil {
+				log.Fatalf("failed to listen: %v", err)
+			}
+
+			if err != nil {
+				log.Fatalf("failed to listen: %v", err)
+			}
+			var opts []grpc.ServerOption
+			grpcServer := grpc.NewServer(opts...)
+			sProto.RegisterSignalExchangeServer(grpcServer, sig.NewServer())
+			log.Printf("started server: localhost:%v", port)
+			if err := grpcServer.Serve(lis); err != nil {
+				log.Fatalf("failed to serve: %v", err)
+			}
+
+			SetupCloseHandler()
+		},
+	}
+)
+
+func init() {
+	//upCmd.PersistentFlags().IntVar(&port, "port", 10000, "Server port to listen on (e.g. 10000)")
+	upCmd.PersistentFlags().IntVar(&port, "port", 10000, "Server port to listen on (e.g. 10000)")
+}

cmd/up.go

@@ -9,9 +9,7 @@ import (
 	"github.com/wiretrustee/wiretrustee/engine"
 	sig "github.com/wiretrustee/wiretrustee/signal"
 	"os"
-	"os/signal"
 	"strings"
-	"syscall"
 )
 
 const (
@@ -59,20 +57,11 @@ var (
 
 			//signalClient.WaitConnected()
 
-			SetupCloseHandler(signalClient)
+			SetupCloseHandler()
 		},
 	}
 )
 
-func SetupCloseHandler(signalClient *sig.Client) {
-	c := make(chan os.Signal)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	<-c
-	fmt.Println("\r- Ctrl+C pressed in Terminal")
-	signalClient.Close()
-	os.Exit(0)
-}
-
 func init() {
 	//upCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.wiretrustee.yaml)")
 	upCmd.PersistentFlags().StringVar(&config.WgAddr, "address", "", "IP address of a peer in CIDR notation (e.g. 10.30.30.1/24)")

signal/signal.go

@@ -67,14 +67,6 @@ func (s *SignalExchangeServer) ConnectStream(stream proto.SignalExchange_Connect
 	return stream.Context().Err()
 }
 
-func copyMessage(msg *proto.Message) *proto.Message {
-	return &proto.Message{
-		Type:      msg.Type,
-		Key:       msg.Key,
-		RemoteKey: msg.RemoteKey,
-	}
-}
-
 // Handles initial Peer connection.
 // Each connection must provide an ID header.
 // At this moment the connecting Peer will be registered in the peer.Registry