Browse Source

removing windows from pid call and fixing nil pointer in mac

afeiszli 3 years ago
parent
commit
c35aec1eb7
2 changed files with 11 additions and 10 deletions
  1. 10 9
      netclient/ncutils/pid.go
  2. 1 1
      netclient/wireguard/mac.go

+ 10 - 9
netclient/ncutils/pid.go

@@ -33,14 +33,15 @@ func SavePID() error {
 func ReadPID() (int, error) {
 func ReadPID() (int, error) {
 	if IsWindows() {
 	if IsWindows() {
 		return 0, &WindowsPIDError{}
 		return 0, &WindowsPIDError{}
+	} else {
+		bytes, err := os.ReadFile(PIDFILE)
+		if err != nil {
+			return 0, fmt.Errorf("could not read pid file %w", err)
+		}
+		pid, err := strconv.Atoi(string(bytes))
+		if err != nil {
+			return 0, fmt.Errorf("pid file contents invalid %w", err)
+		}
+		return pid, nil
 	}
 	}
-	bytes, err := os.ReadFile(PIDFILE)
-	if err != nil {
-		return 0, fmt.Errorf("could not read pid file %w", err)
-	}
-	pid, err := strconv.Atoi(string(bytes))
-	if err != nil {
-		return 0, fmt.Errorf("pid file contents invalid %w", err)
-	}
-	return pid, nil
 }
 }

+ 1 - 1
netclient/wireguard/mac.go

@@ -151,7 +151,7 @@ func deleteInterface(iface string, realIface string) error {
 		os.Remove("/var/run/wireguard/" + iface + ".name")
 		os.Remove("/var/run/wireguard/" + iface + ".name")
 	}
 	}
 	out, err = ncutils.RunCmd("ifconfig "+realIface+" down", false)
 	out, err = ncutils.RunCmd("ifconfig "+realIface+" down", false)
-	if strings.Contains(err.Error(), "does not exist") {
+	if err != nil && strings.Contains(err.Error(), "does not exist") {
 		err = nil
 		err = nil
 	} else if err != nil && out != "" {
 	} else if err != nil && out != "" {
 		err = errors.New(out)
 		err = errors.New(out)