diff --git a/oryx-tui/src/app.rs b/oryx-tui/src/app.rs index b8c405d..e0e44b5 100644 --- a/oryx-tui/src/app.rs +++ b/oryx-tui/src/app.rs @@ -9,20 +9,27 @@ use ratatui::{ }, Frame, }; -use std::sync::{Arc, Mutex}; -use std::time::Duration; -use std::{error, thread}; +use std::{ + error, + sync::{Arc, Mutex}, + thread, + time::Duration, +}; use tui_big_text::{BigText, PixelSize}; use crate::alerts::alert::Alert; use crate::bandwidth::Bandwidth; -use crate::filters::filter::Filter; -use crate::filters::fuzzy::{self, Fuzzy}; +use crate::filters::{ + filter::Filter, + fuzzy::{self, Fuzzy}, +}; use crate::help::Help; use crate::interface::Interface; use crate::notification::Notification; -use crate::packets::network::{IpPacket, IpProto}; -use crate::packets::packet::AppPacket; +use crate::packets::{ + network::{IpPacket, IpProto}, + packet::AppPacket, +}; use crate::stats::Stats; pub type AppResult = std::result::Result>; diff --git a/oryx-tui/src/ebpf.rs b/oryx-tui/src/ebpf.rs index 029945d..edf08c8 100644 --- a/oryx-tui/src/ebpf.rs +++ b/oryx-tui/src/ebpf.rs @@ -1,22 +1,24 @@ -use std::os::fd::AsRawFd; -use std::sync::atomic::AtomicBool; -use std::sync::Arc; -use std::thread::spawn; -use std::time::Duration; -use std::{io, thread}; - -use aya::maps::ring_buf::RingBufItem; -use aya::maps::{Array, MapData, RingBuf}; -use aya::programs::{tc, SchedClassifier, TcAttachType}; -use aya::{include_bytes_aligned, Bpf}; -use mio::{Events, Interest, Poll, Registry, Token}; -use oryx_common::protocols::Protocol; -use oryx_common::RawPacket; - -use crate::event::Event; -use crate::notification::{Notification, NotificationLevel}; -use mio::event::Source; -use mio::unix::SourceFd; +use std::{ + io, + os::fd::AsRawFd, + sync::{atomic::AtomicBool, Arc}, + thread::{self, spawn}, + time::Duration, +}; + +use aya::{ + include_bytes_aligned, + maps::{ring_buf::RingBufItem, Array, MapData, RingBuf}, + programs::{tc, SchedClassifier, TcAttachType}, + Bpf, +}; +use oryx_common::{protocols::Protocol, RawPacket}; + +use crate::{ + event::Event, + notification::{Notification, NotificationLevel}, +}; +use mio::{event::Source, unix::SourceFd, Events, Interest, Poll, Registry, Token}; pub struct Ebpf; diff --git a/oryx-tui/src/event.rs b/oryx-tui/src/event.rs index 5c71572..42dcee7 100644 --- a/oryx-tui/src/event.rs +++ b/oryx-tui/src/event.rs @@ -1,8 +1,9 @@ -use crate::app::AppResult; -use crate::notification::Notification; +use crate::{app::AppResult, notification::Notification}; use crossterm::event::{self, Event as CrosstermEvent, KeyEvent, KeyEventKind, MouseEvent}; -use std::thread; -use std::time::{Duration, Instant}; +use std::{ + thread, + time::{Duration, Instant}, +}; #[derive(Clone)] pub enum Event { diff --git a/oryx-tui/src/export.rs b/oryx-tui/src/export.rs index a35aa02..e93ac93 100644 --- a/oryx-tui/src/export.rs +++ b/oryx-tui/src/export.rs @@ -1,10 +1,16 @@ -use std::fs::{create_dir, OpenOptions}; -use std::io::prelude::*; -use std::os::unix::fs::chown; +use std::{ + fs::{create_dir, OpenOptions}, + io::prelude::*, + os::unix::fs::chown, +}; -use crate::app::AppResult; -use crate::packets::network::{IpPacket, IpProto}; -use crate::packets::packet::AppPacket; +use crate::{ + app::AppResult, + packets::{ + network::{IpPacket, IpProto}, + packet::AppPacket, + }, +}; pub fn export(packets: &[AppPacket]) -> AppResult<()> { let uid = unsafe { libc::geteuid() }; diff --git a/oryx-tui/src/infos.rs b/oryx-tui/src/infos.rs deleted file mode 100644 index e69de29..0000000 diff --git a/oryx-tui/src/interface.rs b/oryx-tui/src/interface.rs index d3cde0f..81d6e56 100644 --- a/oryx-tui/src/interface.rs +++ b/oryx-tui/src/interface.rs @@ -8,13 +8,12 @@ use ratatui::{ }; use std::{ + ffi::CStr, fs::{self}, net::{IpAddr, Ipv4Addr, Ipv6Addr}, path::PathBuf, }; -use std::ffi::CStr; - use crate::app::FocusedBlock; #[derive(Debug, Clone)] diff --git a/oryx-tui/src/main.rs b/oryx-tui/src/main.rs index 623240a..e0e5816 100644 --- a/oryx-tui/src/main.rs +++ b/oryx-tui/src/main.rs @@ -4,12 +4,13 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; use std::io; use clap::{crate_description, crate_version, Command}; -use oryx_tui::app::{App, AppResult, TICK_RATE}; -use oryx_tui::event::{Event, EventHandler}; -use oryx_tui::handler::handle_key_events; -use oryx_tui::tui::Tui; -use ratatui::backend::CrosstermBackend; -use ratatui::Terminal; +use oryx_tui::{ + app::{App, AppResult, TICK_RATE}, + event::{Event, EventHandler}, + handler::handle_key_events, + tui::Tui, +}; +use ratatui::{backend::CrosstermBackend, Terminal}; fn main() -> AppResult<()> { Command::new("oryx") diff --git a/oryx-tui/src/packets/network.rs b/oryx-tui/src/packets/network.rs index 33ec9c1..e25dff2 100644 --- a/oryx-tui/src/packets/network.rs +++ b/oryx-tui/src/packets/network.rs @@ -1,4 +1,7 @@ -use core::fmt::Display; +use core::{ + fmt::Display, + net::{Ipv4Addr, Ipv6Addr}, +}; use ratatui::{ layout::{Constraint, Direction, Layout, Rect}, style::{Style, Stylize}, @@ -7,8 +10,6 @@ use ratatui::{ Frame, }; -use core::net::{Ipv4Addr, Ipv6Addr}; - use super::transport::{TcpPacket, UdpPacket}; #[derive(Debug, Copy, Clone)] diff --git a/oryx-tui/src/packets/packet.rs b/oryx-tui/src/packets/packet.rs index 4f4c79e..79e3cb0 100644 --- a/oryx-tui/src/packets/packet.rs +++ b/oryx-tui/src/packets/packet.rs @@ -1,14 +1,13 @@ -use core::fmt::Display; - -use core::net::Ipv4Addr; -use std::mem; +use std::{fmt::Display, mem, net::Ipv4Addr}; use network_types::ip::IpHdr; use oryx_common::{ProtoHdr, RawPacket}; -use super::link::{ArpPacket, ArpType, MacAddr}; -use super::network::{IcmpPacket, IcmpType, IpPacket, IpProto, Ipv4Packet, Ipv6Packet}; -use super::transport::{TcpPacket, UdpPacket}; +use super::{ + link::{ArpPacket, ArpType, MacAddr}, + network::{IcmpPacket, IcmpType, IpPacket, IpProto, Ipv4Packet, Ipv6Packet}, + transport::{TcpPacket, UdpPacket}, +}; #[derive(Debug, Copy, Clone)] pub enum AppPacket { diff --git a/oryx-tui/src/stats.rs b/oryx-tui/src/stats.rs index 7ce59c7..0555cc6 100644 --- a/oryx-tui/src/stats.rs +++ b/oryx-tui/src/stats.rs @@ -1,17 +1,21 @@ use dns_lookup::lookup_addr; -use std::collections::HashMap; -use std::net::{IpAddr, Ipv4Addr}; +use std::{ + collections::HashMap, + net::{IpAddr, Ipv4Addr}, +}; -use ratatui::layout::{Alignment, Constraint, Direction, Flex, Layout, Rect}; -use ratatui::style::{Color, Style}; -use ratatui::text::Line; use ratatui::{ + layout::{Alignment, Constraint, Direction, Flex, Layout, Rect}, + style::{Color, Style}, + text::Line, widgets::{Bar, BarChart, BarGroup, Block, Padding}, Frame, }; -use crate::packets::network::{IpPacket, IpProto}; -use crate::packets::packet::AppPacket; +use crate::packets::{ + network::{IpPacket, IpProto}, + packet::AppPacket, +}; #[derive(Debug)] pub struct Stats { diff --git a/oryx-tui/src/tui.rs b/oryx-tui/src/tui.rs index 732dc64..8bcf7d0 100644 --- a/oryx-tui/src/tui.rs +++ b/oryx-tui/src/tui.rs @@ -1,12 +1,14 @@ -use crate::app::{App, AppResult}; -use crate::event::EventHandler; -use crate::ui; -use crossterm::event::{DisableMouseCapture, EnableMouseCapture}; -use crossterm::terminal::{self, EnterAlternateScreen, LeaveAlternateScreen}; -use ratatui::backend::Backend; -use ratatui::Terminal; -use std::io; -use std::panic; +use crate::{ + app::{App, AppResult}, + event::EventHandler, + ui, +}; +use crossterm::{ + event::{DisableMouseCapture, EnableMouseCapture}, + terminal::{self, EnterAlternateScreen, LeaveAlternateScreen}, +}; +use ratatui::{backend::Backend, Terminal}; +use std::{io, panic}; #[derive(Debug)] pub struct Tui {