From 83c59420de80bacf029b22e2fe9bfce29e225a0d Mon Sep 17 00:00:00 2001 From: SkuldNorniern Date: Mon, 8 Jan 2024 14:30:30 +0900 Subject: [PATCH] style: `rustfmt` --- src/main.rs | 2 +- src/net/capture.rs | 10 ++++++---- src/net/live_fluereflow.rs | 4 ++-- src/net/mod.rs | 10 +++++----- src/net/online_fluereflow.rs | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 79ef476..e47dc9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -338,7 +338,7 @@ async fn main() { println!("Found {} devices", interfaces.len()); for (i, interface) in interfaces.iter().enumerate() { println!("[{}]: {}", i, interface.name); - } + } exit(0); } let use_mac = args.get_flag("useMACaddress"); diff --git a/src/net/capture.rs b/src/net/capture.rs index 31dd3c9..0da63e1 100644 --- a/src/net/capture.rs +++ b/src/net/capture.rs @@ -1,4 +1,4 @@ -use pcap::{Capture, Active, Device,Error as PcapError,Address}; +use pcap::{Active, Address, Capture, Device, Error as PcapError}; use std::time::Instant; #[derive(Debug)] @@ -22,14 +22,14 @@ impl From for CaptureError { } } -pub struct CaptureDevice{ +pub struct CaptureDevice { pub name: String, pub desc: String, pub address: Vec
, pub capture: Capture, } -impl CaptureDevice{ +impl CaptureDevice { pub fn new(device: Device) -> Result { let capture = initialize_capture(device.clone())?; @@ -41,9 +41,11 @@ impl CaptureDevice{ }) } } + pub fn list_devices() -> Result, CaptureError> { - Ok(Device::list().map_err(CaptureError::Cap)?) + Device::list().map_err(CaptureError::Cap) } + pub fn find_device(identifier: &str) -> Result { let start = Instant::now(); println!("Requested Device: {}", identifier); diff --git a/src/net/live_fluereflow.rs b/src/net/live_fluereflow.rs index 14e89b3..841ca0b 100644 --- a/src/net/live_fluereflow.rs +++ b/src/net/live_fluereflow.rs @@ -26,11 +26,11 @@ use tokio::time::sleep; use crate::{ net::{ + find_device, flows::update_flow, parser::{microseconds_to_timestamp, parse_fluereflow, parse_keys, parse_microseconds}, types::TcpFlags, CaptureDevice, - find_device, }, types::{Args, UDFlowKey}, utils::{cur_time_file, fluere_exporter}, @@ -83,7 +83,7 @@ pub async fn online_packet_capture(arg: Args) { .load_plugins(&config) .await .expect("Failed to load plugins"); - + let interface = find_device(interface_name.as_str()).unwrap(); let cap_device = CaptureDevice::new(interface.clone()).unwrap(); let mut cap = cap_device.capture; diff --git a/src/net/mod.rs b/src/net/mod.rs index ae0e099..34fe534 100644 --- a/src/net/mod.rs +++ b/src/net/mod.rs @@ -1,8 +1,8 @@ pub mod errors; //mod fluereflow; +mod capture; mod flows; mod interface; -mod capture; pub mod live_fluereflow; mod offline_fluereflows; pub mod online_fluereflow; @@ -11,12 +11,12 @@ pub mod parser; pub mod types; //pub use flows::packet_capture; +pub use capture::find_device; +pub use capture::list_devices; +pub use capture::CaptureDevice; +pub use capture::CaptureError; pub use interface::list_interface_names; pub use interface::list_interfaces; pub use offline_fluereflows::fluereflow_fileparse; pub use packet_pcap::pcap_capture; -pub use capture::CaptureDevice; -pub use capture::CaptureError; -pub use capture::find_device; -pub use capture::list_devices; //pub use types::FluereRecord; diff --git a/src/net/online_fluereflow.rs b/src/net/online_fluereflow.rs index 1730843..88b0b31 100644 --- a/src/net/online_fluereflow.rs +++ b/src/net/online_fluereflow.rs @@ -12,11 +12,11 @@ use tokio::time::sleep; use crate::{ net::{ + find_device, flows::update_flow, parser::{parse_fluereflow, parse_keys, parse_microseconds}, types::{Key, TcpFlags}, CaptureDevice, - find_device, }, types::{Args, UDFlowKey}, utils::{cur_time_file, fluere_exporter},