Add support for the gRPC client to connect on a unix domain socket

Author: bbassingthwaite

cmd/gobgp/common.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	"google.golang.org/grpc"
@@ -207,11 +208,18 @@ func newClient(ctx context.Context) (api.GobgpApiClient, context.CancelFunc, err
 		grpcOpts = append(grpcOpts, grpc.WithInsecure())
 	}
 
-	target := net.JoinHostPort(globalOpts.Host, strconv.Itoa(globalOpts.Port))
+	target := globalOpts.Target
 	if target == "" {
-		target = ":50051"
+		target = net.JoinHostPort(globalOpts.Host, strconv.Itoa(globalOpts.Port))
+	} else if strings.HasPrefix(target, "unix://") {
+		target = target[len("unix://"):]
+		dialer := func(addr string, t time.Duration) (net.Conn, error) {
+			return net.Dial("unix", addr)
+		}
+		grpcOpts = append(grpcOpts, grpc.WithDialer(dialer))
 	}
 	cc, cancel := context.WithTimeout(ctx, time.Second)
+
 	conn, err := grpc.DialContext(cc, target, grpcOpts...)
 	if err != nil {
 		return nil, cancel, err

cmd/gobgp/root.go

@@ -28,6 +28,7 @@ import (
 var globalOpts struct {
 	Host         string
 	Port         int
+	Target       string
 	Debug        bool
 	Quiet        bool
 	Json         bool
@@ -83,6 +84,7 @@ func newRootCmd() *cobra.Command {
 
 	rootCmd.PersistentFlags().StringVarP(&globalOpts.Host, "host", "u", "127.0.0.1", "host")
 	rootCmd.PersistentFlags().IntVarP(&globalOpts.Port, "port", "p", 50051, "port")
+	rootCmd.PersistentFlags().StringVarP(&globalOpts.Target, "target", "", "", "alternative to host/port when using UDS. Ex: unix:///var/run/go-bgp.sock if running gobgpd with a UDS socket.")
 	rootCmd.PersistentFlags().BoolVarP(&globalOpts.Json, "json", "j", false, "use json format to output format")
 	rootCmd.PersistentFlags().BoolVarP(&globalOpts.Debug, "debug", "d", false, "use debug")
 	rootCmd.PersistentFlags().BoolVarP(&globalOpts.Quiet, "quiet", "q", false, "use quiet")