use uint16 for port flag

check interface name on macOS
netbirdio · Jan 15, 2024 · a2db272 · a2db272
1 parent e4684ee
commit a2db272
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/client/cmd/root.go b/client/cmd/root.go
@@ -55,7 +55,7 @@ var (
 	customDNSAddress        string
 	rosenpassEnabled        bool
 	interfaceName           string
-	wireguardPort           int
+	wireguardPort           uint16
 	rootCmd                 = &cobra.Command{
 		Use:          "netbird",
 		Short:        "",

diff --git a/client/cmd/up.go b/client/cmd/up.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
+	"runtime"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
@@ -38,7 +39,7 @@ var (
 func init() {
 	upCmd.PersistentFlags().BoolVarP(&foregroundMode, "foreground-mode", "F", false, "start service in foreground")
 	upCmd.PersistentFlags().StringVar(&interfaceName, interfaceNameFlag, iface.WgInterfaceDefault, "Wireguard interface name")
-	upCmd.PersistentFlags().IntVar(&wireguardPort, wireguardPortFlag, iface.DefaultWgPort, "Wireguard interface listening port")
+	upCmd.PersistentFlags().Uint16Var(&wireguardPort, wireguardPortFlag, iface.DefaultWgPort, "Wireguard interface listening port")
 }
 
 func upFunc(cmd *cobra.Command, args []string) error {
@@ -94,11 +95,15 @@ func runInForegroundMode(ctx context.Context, cmd *cobra.Command) error {
 	}
 
 	if cmd.Flag(interfaceNameFlag).Changed {
+		if err := parseInterfaceName(interfaceName); err != nil {
+			return err
+		}
 		ic.InterfaceName = &interfaceName
 	}
 
 	if cmd.Flag(wireguardPortFlag).Changed {
-		ic.WireguardPort = &wireguardPort
+		p := int(wireguardPort)
+		ic.WireguardPort = &p
 	}
 
 	if rootCmd.PersistentFlags().Changed(preSharedKeyFlag) {
@@ -173,6 +178,9 @@ func runInDaemonMode(ctx context.Context, cmd *cobra.Command) error {
 	}
 
 	if cmd.Flag(interfaceNameFlag).Changed {
+		if err := parseInterfaceName(interfaceName); err != nil {
+			return err
+		}
 		loginRequest.InterfaceName = &interfaceName
 	}
 
@@ -252,6 +260,18 @@ func validateNATExternalIPs(list []string) error {
 	return nil
 }
 
+func parseInterfaceName(name string) error {
+	if runtime.GOOS != "darwin" {
+		return nil
+	}
+
+	if strings.HasPrefix(name, "utun") {
+		return nil
+	}
+
+	return fmt.Errorf("invalid interface name %s. Please use the prefix utun followed by a number on MacOS. e.g., utun1 or utun199", name)
+}
+
 func validateElement(element string) (int, error) {
 	if isValidIP(element) {
 		return ipInputType, nil