From ca50a636df557dc2b109c4aa82692e3cae0fd9f5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Aug 2021 02:12:39 +0100 Subject: [PATCH] messages Signed-off-by: Ian Jackson --- server/server.rs | 10 +++++----- server/slocal.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/server.rs b/server/server.rs index 8df75a9..3e85105 100644 --- a/server/server.rs +++ b/server/server.rs @@ -61,7 +61,7 @@ pub async fn route_packet(global: &Global, let c = &global.config; let len = packet.len(); let trace = |how: &str, why: &str| { - trace!("{} to={:?} via={} user={} len={} {}", + trace!("{} to={:?} came=={} user={} len={} {}", how, daddr, transport_conn, match source { Some(s) => (s as &dyn Display), @@ -72,17 +72,17 @@ pub async fn route_packet(global: &Global, let (dest, why) = if daddr == c.vaddr || ! c.vnetwork.iter().any(|n| n.contains(&daddr)) { - (Some(&global.local_rx), "") + (Some(&global.local_rx), "via=local") } else if daddr == c.vrelay { (None, " vrelay") } else if let Some(client) = global.all_clients.get(&ClientName(daddr)) { - (Some(&client.route), " client") + (Some(&client.route), "via=client") } else { - (None, " no-client") + (None, "no-client") }; let dest = if let Some(d) = dest { d } else { - trace("discard", why); return; + trace("discard ", why); return; }; let packet = RoutedPacket { diff --git a/server/slocal.rs b/server/slocal.rs index eaa7ada..a30aad6 100644 --- a/server/slocal.rs +++ b/server/slocal.rs @@ -47,7 +47,7 @@ pub async fn run(global: Arc, // pretent as if this came from route trace!( target: "hippotatd", - "discard to={:?} via=ipif user=local from-outside-vnets-={:?}", + "discard to={:?} came=ipif user=local from-outside-vnets-={:?}", daddr, saddr); return Ok(()) } -- 2.30.2