diff options
Diffstat (limited to 'src/pkt')
| -rw-r--r-- | src/pkt/fake.rs | 10 | ||||
| -rw-r--r-- | src/pkt/hoptab.rs | 14 |
2 files changed, 7 insertions, 17 deletions
diff --git a/src/pkt/fake.rs b/src/pkt/fake.rs index b876748..2535d58 100644 --- a/src/pkt/fake.rs +++ b/src/pkt/fake.rs @@ -2,11 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later use anyhow::Result; -use log::LogLevel; -use crate::log; use crate::opt; -use crate::log_println; use crate::pkt::hoptab; use super::PktView; @@ -96,15 +93,12 @@ pub fn fake_clienthello( match daddr_hop(&view) { Ok(hop) => { let fake_ttl = hop.saturating_sub(AUTOTTL_DELTA); - log_println!(LogLevel::Debug, - "autottl: set ttl to {fake_ttl}" - ); + crate::debug!("autottl: set ttl to {fake_ttl}"); fake_ttl }, Err(e) => { let fake_ttl = opt::fake_ttl(); - log_println!(LogLevel::Warning, - "autottl: sv_hop_find: {e}; fallback to {fake_ttl}"); + crate::warn!("autottl: sv_hop_find: {e}; fallback to {fake_ttl}"); fake_ttl } } diff --git a/src/pkt/hoptab.rs b/src/pkt/hoptab.rs index 50bc996..d8ba562 100644 --- a/src/pkt/hoptab.rs +++ b/src/pkt/hoptab.rs @@ -33,9 +33,6 @@ use std::net::IpAddr; use std::sync::{Mutex, OnceLock}; use std::net::{Ipv4Addr, Ipv6Addr}; -use crate::log_println; -use crate::log::LogLevel; - /// Size of [`HopTab`] const CAP: usize = 1 << 7; // 128 @@ -306,7 +303,7 @@ impl<const CAP: usize> HopTab<CAP> { if e.key() == key && e.has(HopTabEntry::ST_OCCUPIED) { victim = (idx, EvictPriority::MustUpdate); #[cfg(debug_assertions)] - log_println!(LogLevel::Debug, "HopTab::put: hit {}; {:#?}", victim.0, entry); + crate::debug!("HopTab::put: hit {}; {:#?}", victim.0, entry); break; } @@ -317,8 +314,7 @@ impl<const CAP: usize> HopTab<CAP> { if prio == EvictPriority::Empty { #[cfg(debug_assertions)] - log_println!(LogLevel::Debug, - "HopTab::put: hit empty {}; {:#?}", victim.0, entry); + crate::debug!("HopTab::put: hit empty {}; {:#?}", victim.0, entry); break; // linear probing; there is no key here } } @@ -327,9 +323,9 @@ impl<const CAP: usize> HopTab<CAP> { if victim.1 > EvictPriority::None { self.update(victim.0, entry); #[cfg(debug_assertions)] - log_println!(LogLevel::Debug, "HopTab::put: update {} to {:#?}", victim.0, entry); + crate::debug!("HopTab::put: update {} to {:#?}", victim.0, entry); } else { - log_println!(LogLevel::Error, "HopTab::put: update fail: corrupted; {:#?}", entry); + crate::error!("HopTab::put: update fail: corrupted; {:#?}", entry); } } @@ -349,7 +345,7 @@ impl<const CAP: usize> HopTab<CAP> { self.entries[idx].touch(); #[cfg(debug_assertions)] - log_println!(LogLevel::Debug, "HopTab::find_hop: found {idx}; {:#?}", e); + crate::debug!("HopTab::find_hop: found {idx}; {:#?}", e); return Ok(e.hop()); } } |
