hackmaster/gatuna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format MAC addresses as hex with colons in logs

Browse Source 
Add Display impl for MacAddr (XX:XX:XX:XX:XX:XX) and use {src}
instead of {src:?} in all log calls.
This commit is contained in:
Mute
2026-08-16 08:03:28 +00:00
parent 781fe959eb
commit 527b462291
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gatunad/src/link.rs
+10
View File
@@ -12,6 +12,16 @@ use crate::frame::{ETHERTYPE, ETH_HEADER_LEN};
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct MacAddr(pub [u8; 6]); pub struct MacAddr(pub [u8; 6]);
impl std::fmt::Display for MacAddr {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}",
self.0[0], self.0[1], self.0[2], self.0[3], self.0[4], self.0[5]
)
}
}
impl MacAddr { impl MacAddr {
#[allow(dead_code)] #[allow(dead_code)]
pub fn broadcast() -> Self { pub fn broadcast() -> Self {
gatunad/src/main.rs
+6 -6
View File
@@ -114,7 +114,7 @@ async fn main() -> ExitCode {
let frame = match Frame::parse(payload) { let frame = match Frame::parse(payload) {
Ok(f) => f, Ok(f) => f,
Err(e) => { Err(e) => {
error!("decode from {src:?}: {e}"); error!("decode from {src}: {e}");
continue; continue;
} }
}; };
@@ -145,16 +145,16 @@ async fn handle_frame(
) { ) {
match frame { match frame {
Frame::Discover => { Frame::Discover => {
info!("DISCOVER from {src:?}"); info!("DISCOVER from {src}");
let manifest = Frame::Manifest { let manifest = Frame::Manifest {
hostname: (**hostname).clone(), hostname: (**hostname).clone(),
entries: table.entries(), entries: table.entries(),
}; };
let _ = tx.send((src, manifest.encode())).await; let _ = tx.send((src, manifest.encode())).await;
info!("MANIFEST sent to {src:?} ({} upstreams)", table.0.len()); info!("MANIFEST sent to {src} ({} upstreams)", table.0.len());
} }
Frame::Open { upstream_id, proto: _ } => { Frame::Open { upstream_id, proto: _ } => {
info!("OPEN upstream {upstream_id} from {src:?}"); info!("OPEN upstream {upstream_id} from {src}");
let upstream = table.get(upstream_id); let upstream = table.get(upstream_id);
match upstream { match upstream {
Some(upstream) => { Some(upstream) => {
@@ -188,7 +188,7 @@ async fn handle_frame(
} }
Err(e) => { Err(e) => {
error!("connect 127.0.0.1:{port} failed: {e}"); error!("connect 127.0.0.1:{port} failed: {e}");
info!("OPEN_NAK upstream {upstream_id} (connect_failed) to {src:?}"); info!("OPEN_NAK upstream {upstream_id} (connect_failed) to {src}");
let nak = let nak =
Frame::OpenNak { upstream_id, reason: REASON_CONNECT_FAILED }; Frame::OpenNak { upstream_id, reason: REASON_CONNECT_FAILED };
let _ = tx.send((src, nak.encode())).await; let _ = tx.send((src, nak.encode())).await;
@@ -224,7 +224,7 @@ async fn handle_frame(
} }
} }
Frame::Close { session_id, reason: _ } => { Frame::Close { session_id, reason: _ } => {
info!("CLOSE session {session_id} from {src:?}"); info!("CLOSE session {session_id} from {src}");
store.lock().expect("store poisoned").remove(&session_id); store.lock().expect("store poisoned").remove(&session_id);
} }
Frame::Ping { nonce } => { Frame::Ping { nonce } => {