|
diff --git a/resources/repository/header_repository.png b/resources/repository/header_repository.png
index b6b7183d..8d245abe 100644
Binary files a/resources/repository/header_repository.png and b/resources/repository/header_repository.png differ
diff --git a/src/gui/sniffer.rs b/src/gui/sniffer.rs
index cdc8a287..fa36a44c 100644
--- a/src/gui/sniffer.rs
+++ b/src/gui/sniffer.rs
@@ -265,6 +265,7 @@ fn window_subscription() -> Subscription {
})
}
+ #[allow(clippy::too_many_lines)]
pub fn update(&mut self, message: Message) -> Task {
self.dots_pulse.1 = (self.dots_pulse.1 + 1) % 3;
match message {
diff --git a/src/mmdb/asn.rs b/src/mmdb/asn.rs
index e120d2ee..c19c6074 100644
--- a/src/mmdb/asn.rs
+++ b/src/mmdb/asn.rs
@@ -7,7 +7,7 @@
#[allow(clippy::module_name_repetitions)]
pub fn get_asn(address: &IpAddr, asn_db_reader: &MmdbReader) -> Asn {
- if let Ok(Some(res)) = asn_db_reader.lookup::(*address) {
+ if let Some(res) = asn_db_reader.lookup::(*address) {
return res.get_asn();
}
Asn::default()
diff --git a/src/mmdb/country.rs b/src/mmdb/country.rs
index 9e5cd9a0..533163c1 100644
--- a/src/mmdb/country.rs
+++ b/src/mmdb/country.rs
@@ -7,7 +7,7 @@
#[allow(clippy::module_name_repetitions)]
pub fn get_country(address: &IpAddr, country_db_reader: &MmdbReader) -> Country {
- if let Ok(Some(res)) = country_db_reader.lookup::(*address) {
+ if let Some(res) = country_db_reader.lookup::(*address) {
return res.get_country();
}
Country::ZZ // unknown
diff --git a/src/mmdb/types/mmdb_reader.rs b/src/mmdb/types/mmdb_reader.rs
index d7e7e333..f67850c2 100644
--- a/src/mmdb/types/mmdb_reader.rs
+++ b/src/mmdb/types/mmdb_reader.rs
@@ -3,7 +3,7 @@
use crate::location;
use crate::utils::error_logger::{ErrorLogger, Location};
-use maxminddb::{MaxMindDbError, Reader};
+use maxminddb::Reader;
use serde::Deserialize;
#[derive(Clone)]
@@ -32,14 +32,11 @@ pub fn from(mmdb_path: &String, default_mmdb: &'static [u8]) -> MmdbReader {
}
}
- pub fn lookup<'a, T: Deserialize<'a>>(
- &'a self,
- ip: IpAddr,
- ) -> Result, MaxMindDbError> {
+ pub fn lookup<'a, T: Deserialize<'a>>(&'a self, ip: IpAddr) -> Option {
match self {
- MmdbReader::Default(reader) => reader.lookup(ip),
- MmdbReader::Custom(reader) => reader.lookup(ip),
- MmdbReader::Empty => Ok(None),
+ MmdbReader::Default(reader) => reader.lookup(ip).and_then(|lr| lr.decode()).ok()?,
+ MmdbReader::Custom(reader) => reader.lookup(ip).and_then(|lr| lr.decode()).ok()?,
+ MmdbReader::Empty => None,
}
}
}
diff --git a/src/networking/parse_packets.rs b/src/networking/parse_packets.rs
index 5a7d23a2..8ab1b577 100644
--- a/src/networking/parse_packets.rs
+++ b/src/networking/parse_packets.rs
@@ -37,6 +37,7 @@
use tokio::sync::broadcast::Receiver;
/// The calling thread enters a loop in which it waits for network packets
+#[allow(clippy::too_many_lines)]
pub fn parse_packets(
cap_id: usize,
mut cs: CaptureSource,
diff --git a/src/utils/error_logger.rs b/src/utils/error_logger.rs
index f4c5e7e8..b12108ce 100644
--- a/src/utils/error_logger.rs
+++ b/src/utils/error_logger.rs
@@ -14,7 +14,9 @@ fn log_err(self, location: Location) -> Result {
let line = location.line;
eprintln!("Sniffnet error at [{file}:{line}]: {e}");
// in debug mode, panic on error
- assert!(!cfg!(debug_assertions));
+ const {
+ assert!(!cfg!(debug_assertions));
+ }
}
self
|
+