fixed network cleanup

protosio · Sep 17, 2024 · 23a443e · 23a443e
1 parent 0ab23e2
commit 23a443e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/apic/apic.go b/apic/apic.go
@@ -85,6 +85,7 @@ func StartGRPCServer(dataPath string, version string, protosClient *protosc.Prot
 		log.Info("stopping gRPC server")
 		srv.GracefulStop()
 		if protosClient.NetworkManager != nil {
+			log.Info("bringing down network")
 			err = protosClient.NetworkManager.Down()
 			if err != nil {
 				log.Error(err)

diff --git a/internal/wireguard/link_darwin.go b/internal/wireguard/link_darwin.go
@@ -340,8 +340,14 @@ func (m *linkMngr) CreateLink(name string) (Link, error) {
 }
 
 func (m *linkMngr) DelLink(name string) error {
+	interfaceFile := fmt.Sprintf("%s/%s.name", m.interfacesDir, name)
 	lnk, err := m.GetLink(name)
 	if err != nil {
+		// remove the .name file
+		err = os.Remove(interfaceFile)
+		if err != nil {
+			return fmt.Errorf("could not delete link '%s': %w", name, err)
+		}
 		return err
 	}
 
@@ -351,14 +357,20 @@ func (m *linkMngr) DelLink(name string) error {
 	cmd := exec.Command(sudoPath, rmPath, "-f", link.interfaceSockFile)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
+		// remove the .name file
+		err = os.Remove(interfaceFile)
+		if err != nil {
+			return fmt.Errorf("could not delete link '%s': %w", name, err)
+		}
 		return fmt.Errorf("failed to delete link '%s': \n---- output ----\n%s-------------------", name, string(output))
 	}
 
 	// remove the .name file
-	err = os.Remove(link.interfaceNameFile)
+	err = os.Remove(interfaceFile)
 	if err != nil {
 		return fmt.Errorf("could not delete link '%s': %w", name, err)
 	}
+
 	return nil
 }