summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelvin Zhang <zhangxp1998@gmail.com>2020-01-06 18:04:26 -0500
committerKelvin Zhang <zhangxp1998@gmail.com>2020-01-07 16:27:45 -0500
commitcf772acba35467b25ab59fef644199839882bc4a (patch)
tree73a43f63d1e947e707c54991b59bb1d393db11b3
parent9737ba98c01f3198e916c54f437801e12cce440d (diff)
Format code using rustfmt
-rw-r--r--src/network/connection.rs9
-rw-r--r--src/network/sniffer.rs4
-rw-r--r--src/os/lsof_utils.rs9
-rw-r--r--src/os/macos.rs2
-rw-r--r--src/tests/fakes/fake_input.rs2
5 files changed, 18 insertions, 8 deletions
diff --git a/src/network/connection.rs b/src/network/connection.rs
index c12311e..f98d17c 100644
--- a/src/network/connection.rs
+++ b/src/network/connection.rs
@@ -1,6 +1,6 @@
use ::std::collections::HashMap;
use ::std::fmt;
-use ::std::net::{Ipv4Addr, IpAddr};
+use ::std::net::{IpAddr, Ipv4Addr};
use ::std::net::SocketAddr;
@@ -71,7 +71,12 @@ pub fn display_connection_string(
}
impl Connection {
- pub fn new(remote_socket: SocketAddr, local_ip: IpAddr, local_port: u16, protocol: Protocol) -> Option<Self> {
+ pub fn new(
+ remote_socket: SocketAddr,
+ local_ip: IpAddr,
+ local_port: u16,
+ protocol: Protocol,
+ ) -> Option<Self> {
match remote_socket {
SocketAddr::V4(remote_socket) => Some(Connection {
remote_socket: Socket {
diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs
index b2f947f..ad57fbb 100644
--- a/src/network/sniffer.rs
+++ b/src/network/sniffer.rs
@@ -88,7 +88,9 @@ impl Sniffer {
let to = SocketAddr::new(IpAddr::V4(ip_packet.get_destination()), destination_port);
let connection = match direction {
- Direction::Download => Connection::new(from, to.ip(), destination_port, protocol)?,
+ Direction::Download => {
+ Connection::new(from, to.ip(), destination_port, protocol)?
+ }
Direction::Upload => Connection::new(to, from.ip(), source_port, protocol)?,
};
Some(Segment {
diff --git a/src/os/lsof_utils.rs b/src/os/lsof_utils.rs
index 4464abc..260c753 100644
--- a/src/os/lsof_utils.rs
+++ b/src/os/lsof_utils.rs
@@ -18,8 +18,7 @@ pub struct RawConnection {
lazy_static! {
static ref CONNECTION_REGEX: Regex =
Regex::new(r"\[?([^\s\]]*)\]?:(\d+)->\[?([^\s\]]*)\]?:(\d+)").unwrap();
- static ref LISTEN_REGEX: Regex =
- Regex::new(r"(.*):(.*)").unwrap();
+ static ref LISTEN_REGEX: Regex = Regex::new(r"(.*):(.*)").unwrap();
}
fn parse_ip_addr(ip: &str) -> IpAddr {
@@ -45,7 +44,11 @@ impl RawConnection {
pub fn new(raw_line: &str) -> Option<RawConnection> {
let columns: Vec<&str> = raw_line.split_ascii_whitespace().collect();
if columns.len() < 9 {
- println!("lsof's output string has {} columns, different than expected: {:#?}", columns.len(), columns);
+ println!(
+ "lsof's output string has {} columns, different than expected: {:#?}",
+ columns.len(),
+ columns
+ );
return None;
}
let process_name = columns[0].replace("\\x20", " ");
diff --git a/src/os/macos.rs b/src/os/macos.rs
index 35f0d8f..2594330 100644
--- a/src/os/macos.rs
+++ b/src/os/macos.rs
@@ -1,6 +1,6 @@
use ::std::collections::HashMap;
-use crate::network::{LocalSocket, Connection};
+use crate::network::{Connection, LocalSocket};
use super::lsof_utils;
use std::net::SocketAddr;
diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs
index f508be5..8faaa41 100644
--- a/src/tests/fakes/fake_input.rs
+++ b/src/tests/fakes/fake_input.rs
@@ -13,7 +13,7 @@ use ::termion::event::Event;
use crate::{
network::{
dns::{self, Lookup},
- Connection, Protocol, LocalSocket
+ Connection, LocalSocket, Protocol,
},
os::OnSigWinch,
};