fix: darwin: extra error check that route exists

webmeshproj · Nov 7, 2023 · b791001 · b791001
1 parent 51dc24f
commit b791001
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/meshnet/system/routes/routes_darwin.go b/pkg/meshnet/system/routes/routes_darwin.go
@@ -54,9 +54,9 @@ func SetDefaultIPv4Gateway(ctx context.Context, gateway Gateway) error {
 
 // Add adds a route to the interface with the given name.
 func Add(ctx context.Context, ifaceName string, addr netip.Prefix) error {
-	out, err := common.ExecOutput(ctx, "route", "-n", "add", "-"+getFamily(addr.Addr()), addr.Masked().String(), "-interface", ifaceName)
+	_, err := common.ExecOutput(ctx, "route", "-n", "add", "-"+getFamily(addr.Addr()), addr.Masked().String(), "-interface", ifaceName)
 	if err != nil {
-		if strings.Contains(string(out), "already in table") || strings.Contains(string(out), "exists") {
+		if strings.Contains(err.Error(), "already in table") || strings.Contains(err.Error(), "exists") {
 			return ErrRouteExists
 		}
 		return err

diff --git a/pkg/meshnet/system/routes/routes_freebsd.go b/pkg/meshnet/system/routes/routes_freebsd.go
@@ -55,9 +55,9 @@ func SetDefaultIPv4Gateway(ctx context.Context, gateway Gateway) error {
 
 // Add adds a route to the interface with the given name.
 func Add(ctx context.Context, ifaceName string, addr netip.Prefix) error {
-	out, err := common.ExecOutput(ctx, "route", "-n", "add", "-"+getFamily(addr.Addr()), addr.Masked().String(), "-interface", ifaceName)
+	_, err := common.ExecOutput(ctx, "route", "-n", "add", "-"+getFamily(addr.Addr()), addr.Masked().String(), "-interface", ifaceName)
 	if err != nil {
-		if strings.Contains(string(out), "already in table") || strings.Contains(string(out), "exists") {
+		if strings.Contains(err.Error(), "already in table") || strings.Contains(err.Error(), "exists") {
 			return ErrRouteExists
 		}
 		return err