handle interface removal errors

Author: Maciej Wójcik

src/error.rs

@@ -33,11 +33,15 @@ pub enum WireguardInterfaceError {
     KernelNotSupported,
     #[error("DNS error: {0}")]
     DnsError(String),
+    #[cfg(target_os = "windows")]
     #[error("Service installation failed: `{message}`")]
     ServiceInstallationFailed {
         err: std::io::Error,
         message: String,
     },
+    #[cfg(target_os = "windows")]
+    #[error("Tunnel service removal failed: `{0}`")]
+    ServiceRemovalFailed(String),
     #[error("Socket is closed: {0}")]
     SocketClosed(String),
 }

src/wgapi_windows.rs

@@ -251,7 +251,7 @@ impl WireguardInterfaceApi for WGApi<Kernel> {
     fn remove_interface(&self) -> Result<(), WireguardInterfaceError> {
         debug!("Removing interface {}", self.ifname);
 
-        Command::new("wireguard")
+        let command_output = Command::new("wireguard")
             .arg("/uninstalltunnelservice")
             .arg(&self.ifname)
             .output()
@@ -260,6 +260,14 @@ impl WireguardInterfaceApi for WGApi<Kernel> {
                 WireguardInterfaceError::CommandExecutionFailed(err)
             })?;
 
+        if !command_output.status.success() {
+            let message = format!(
+                "Failed to remove WireGuard tunnel service: {:?}",
+                command_output.stdout
+            );
+            return Err(WireguardInterfaceError::ServiceRemovalError { message });
+        }
+
         info!("Interface {} removed successfully", self.ifname);
         Ok(())
     }