diff --git a/snow-scanner/src/main.rs b/snow-scanner/src/main.rs index 226fdf9..d6650ae 100644 --- a/snow-scanner/src/main.rs +++ b/snow-scanner/src/main.rs @@ -244,7 +244,7 @@ async fn handle_scan( let msg = EventBusWriterEvent::BroadcastMessage( WorkerMessages::DoWorkRequest { - neworks: vec![Network(cidr)], + networks: vec![Network(cidr)], } .into(), ); diff --git a/snow-scanner/src/server.rs b/snow-scanner/src/server.rs index 0e32780..b452e40 100644 --- a/snow-scanner/src/server.rs +++ b/snow-scanner/src/server.rs @@ -271,7 +271,7 @@ impl<'a> Worker<'a> { Ok(()) } WorkerMessages::GetWorkRequest {} => { - worker_reply = Some(WorkerMessages::DoWorkRequest { neworks: vec![] }); + worker_reply = Some(WorkerMessages::DoWorkRequest { networks: vec![] }); Ok(()) } WorkerMessages::DoWorkRequest { .. } | WorkerMessages::Invalid { .. } => { diff --git a/snow-scanner/src/worker/modules.rs b/snow-scanner/src/worker/modules.rs index f51d995..4c7026d 100644 --- a/snow-scanner/src/worker/modules.rs +++ b/snow-scanner/src/worker/modules.rs @@ -15,7 +15,7 @@ pub enum WorkerMessages { #[serde(rename = "get_work")] GetWorkRequest {}, #[serde(rename = "do_work")] - DoWorkRequest { neworks: Vec }, + DoWorkRequest { networks: Vec }, #[serde(rename = "scanner_found")] ScannerFoundResponse { name: String, address: IpAddr }, #[serde(rename = "")] @@ -95,25 +95,25 @@ mod tests { #[test] fn deserialize_do_work_empty() { - let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[]}}"; + let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[]}}"; let result: WorkerMessages = data.to_string().into(); assert_eq!( result, WorkerMessages::DoWorkRequest { - neworks: [].to_vec() + networks: [].to_vec() } ); } #[test] fn deserialize_do_work() { - let data = "{\"type\":\"do_work\",\"request\":{\"neworks\":[\"127.0.0.0/31\"]}}"; + let data = "{\"type\":\"do_work\",\"request\":{\"networks\":[\"127.0.0.0/31\"]}}"; let result: WorkerMessages = data.to_string().into(); let cidr: IpCidr = IpCidr::from_str("127.0.0.0/31").unwrap(); assert_eq!( result, WorkerMessages::DoWorkRequest { - neworks: [Network(cidr)].to_vec() + networks: [Network(cidr)].to_vec() } ); } diff --git a/snow-scanner/src/worker/worker.rs b/snow-scanner/src/worker/worker.rs index 5ccc4d4..1619454 100644 --- a/snow-scanner/src/worker/worker.rs +++ b/snow-scanner/src/worker/worker.rs @@ -195,9 +195,9 @@ impl Worker { pub fn receive_request(&mut self, server_request: WorkerMessages) -> &Worker { match server_request { - WorkerMessages::DoWorkRequest { neworks } => { - info!("Work request received for neworks: {:?}", neworks); - for cidr in neworks { + WorkerMessages::DoWorkRequest { networks } => { + info!("Work request received for networks: {:?}", networks); + for cidr in networks { let cidr = cidr.0; self.work_on_cidr(cidr); }