sta: refactor remove network all

novalabsxyz · May 22, 2024 · 2e60f26 · 2e60f26
1 parent 4303d66
commit 2e60f26
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/src/sta/client.rs b/src/sta/client.rs
@@ -35,6 +35,11 @@ impl fmt::Display for SelectResult {
     }
 }
 
+pub enum RemoveNetwork {
+    Id(usize),
+    All,
+}
+
 #[derive(Debug)]
 pub(crate) enum Request {
     Custom(String, oneshot::Sender<Result<String>>),
@@ -44,8 +49,7 @@ pub(crate) enum Request {
     AddNetwork(oneshot::Sender<Result<usize>>),
     SetNetwork(usize, SetNetwork, oneshot::Sender<Result>),
     SaveConfig(oneshot::Sender<Result>),
-    RemoveNetwork(usize, oneshot::Sender<Result>),
-    RemoveAllNetworks(oneshot::Sender<Result>),
+    RemoveNetwork(RemoveNetwork, oneshot::Sender<Result>),
     SelectNetwork(usize, oneshot::Sender<Result<SelectResult>>),
     Shutdown,
     SelectTimeout,
@@ -81,9 +85,6 @@ impl ShutdownSignal for Request {
             Request::RemoveNetwork(_, response) => {
                 let _ = response.send(Err(error::Error::StartupAborted));
             }
-            Request::RemoveAllNetworks(response) => {
-                let _ = response.send(Err(error::Error::StartupAborted));
-            }
             Request::SelectNetwork(_, response) => {
                 let _ = response.send(Err(error::Error::StartupAborted));
             }
@@ -200,16 +201,9 @@ impl RequestClient {
         request.await?
     }
 
-    pub async fn remove_network(&self, network_id: usize) -> Result {
-        let (response, request) = oneshot::channel();
-        self.send_request(Request::RemoveNetwork(network_id, response))
-            .await?;
-        request.await?
-    }
-
-    pub async fn remove_all_networks(&self) -> Result {
+    pub async fn remove_network(&self, remove_network: RemoveNetwork) -> Result {
         let (response, request) = oneshot::channel();
-        self.send_request(Request::RemoveAllNetworks(response))
+        self.send_request(Request::RemoveNetwork(remove_network, response))
             .await?;
         request.await?
     }

diff --git a/src/sta/mod.rs b/src/sta/mod.rs
@@ -247,21 +247,17 @@ impl WifiStation {
                 debug!("wpa_ctrl config saved");
                 let _ = response.send(Ok(()));
             }
-            Request::RemoveNetwork(id, response) => {
-                let cmd = format!("REMOVE_NETWORK {id}");
+            Request::RemoveNetwork(remove_network, response) => {
+                let str = match remove_network {
+                    RemoveNetwork::All => "all".to_string(),
+                    RemoveNetwork::Id(id) => id.to_string(),
+                };
+                let cmd = format!("REMOVE_NETWORK {str}");
                 let bytes = cmd.into_bytes();
                 if let Err(e) = socket_handle.command(&bytes).await {
-                    warn!("Error while removing network {id}: {e}");
+                    warn!("Error while removing network {str}: {e}");
                 }
-                debug!("wpa_ctrl removed network {id}");
-                let _ = response.send(Ok(()));
-            }
-            Request::RemoveAllNetworks(response) => {
-                if let Err(e) = socket_handle.command(b"REMOVE_NETWORK all").await {
-                    warn!("Error while removing network all: {e}");
-                }
-                debug!("wpa_ctrl removed network all");
-                let _ = response.send(Ok(()));
+                debug!("wpa_ctrl removed network {str}");
             }
             Request::SelectNetwork(id, response_sender) => {
                 let response_sender = match select_request {