Skip to content

A WiFi security auditing software

ipc: drop the now-redundant iface from the MonitorEnabled response (#225)

Martin Olivier3fc54fddb2c2
diff --git a/crates/agent/src/backend/interface.rs b/crates/agent/src/backend/interface.rs
index 304a876..7d340f6 100644
--- a/crates/agent/src/backend/interface.rs
+++ b/crates/agent/src/backend/interface.rs
@@ -102,12 +102,12 @@ fn set_interface_type(iface: &str, mode: &str) -> Result<bool, IfaceError> {
}
/// Enable monitor mode on an interface.
-pub fn enable_monitor_mode(iface: &str, kill_network_manager: bool) -> Result<String, IfaceError> {
+pub fn enable_monitor_mode(iface: &str, kill_network_manager: bool) -> Result<(), IfaceError> {
kill_network_manager_services(kill_network_manager);
if is_monitor_mode(iface)? {
*IFACE_WAS_MONITOR.lock().unwrap() = true;
- return Ok(iface.to_string());
+ return Ok(());
}
if !set_interface_type(iface, "monitor")? {
@@ -116,7 +116,7 @@ pub fn enable_monitor_mode(iface: &str, kill_network_manager: bool) -> Result<St
log::info!("{iface}: monitor mode enabled");
- Ok(iface.to_string())
+ Ok(())
}
/// Disable monitor mode on an interface, switching it back to managed mode.
diff --git a/crates/agent/src/server.rs b/crates/agent/src/server.rs
index ad50933..5d0a5c0 100644
--- a/crates/agent/src/server.rs
+++ b/crates/agent/src/server.rs
@@ -105,9 +105,9 @@ fn dispatch(request: Request) -> (Response, bool) {
return (err("invalid interface name"), false);
}
match backend::enable_monitor_mode(&iface, kill_network_manager) {
- Ok(mon_iface) => {
- backend::set_iface(mon_iface.clone());
- (Response::MonitorEnabled { iface: mon_iface }, false)
+ Ok(()) => {
+ backend::set_iface(iface.clone());
+ (Response::Ok, false)
}
Err(e) => (err(e), false),
}
diff --git a/crates/common/src/ipc.rs b/crates/common/src/ipc.rs
index b55c1ee..53d407a 100644
--- a/crates/common/src/ipc.rs
+++ b/crates/common/src/ipc.rs
@@ -96,10 +96,6 @@ pub enum Response {
Setup {
missing_dependencies: Vec<String>,
},
- /// The (possibly renamed) monitor-mode interface name.
- MonitorEnabled {
- iface: String,
- },
Bool(bool),
ScanData {
aps: Vec<AP>,
diff --git a/crates/gui/src/backend/client.rs b/crates/gui/src/backend/client.rs
index b463ad7..4f2f6bd 100644
--- a/crates/gui/src/backend/client.rs
+++ b/crates/gui/src/backend/client.rs
@@ -251,17 +251,13 @@ fn connect_with_timeout(sock: &str, child: &mut Child) -> Result<UnixStream, Age
// Interface
// --------------------------------------------------------------------------
-pub fn enable_monitor_mode(iface: &str) -> Result<String, AgentError> {
+pub fn enable_monitor_mode(iface: &str) -> Result<(), AgentError> {
let kill_network_manager = super::get_settings().kill_network_manager;
- match request(Request::EnableMonitor {
+ expect_ok(request(Request::EnableMonitor {
iface: iface.to_string(),
kill_network_manager,
- })? {
- Response::MonitorEnabled { iface } => Ok(iface),
- Response::Error { message } => Err(AgentError(message)),
- _ => Err(AgentError("unexpected response from agent".to_string())),
- }
+ })?)
}
pub fn set_mac_address(iface: &str) -> Result<(), AgentError> {
diff --git a/crates/gui/src/frontend/connections/interface.rs b/crates/gui/src/frontend/connections/interface.rs
index f146039..e6ec7f7 100644
--- a/crates/gui/src/frontend/connections/interface.rs
+++ b/crates/gui/src/frontend/connections/interface.rs
@@ -83,7 +83,7 @@ fn connect_interface_select(app_data: Rc<AppData>) {
}
match backend::enable_monitor_mode(&iface) {
- Ok(iface) => {
+ Ok(()) => {
if let Err(e) = backend::set_mac_address(&iface) {
backend::disable_monitor_mode(&iface).ok();