server messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/server/server.rs b/server/server.rs
index 70311643b62be2efa9ea65e12b6b2b7c6af10cf2..ff95d744cf9c280b4db984a844ab9427ea580337 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -61,13 +61,13 @@ pub async fn route_packet(global: &Global,
   let c = &global.config;
   let len = packet.len();
   let trace = |how: &str, why: &str| {
-    trace!("{} {} {} {} daddr={:?} len={}",
-           transport_conn,
+    trace!("{} to={:?} via={} user={} len={} {}",
+           how, daddr, transport_conn,
            match source {
              Some(s) => (s as &dyn Display),
              None => &"local",
            },
-           how, why, daddr, len);
+           len, why);
   };
 
   let (dest, why) =

diff --git a/server/slocal.rs b/server/slocal.rs
index 130df23942b4c9de28d630aa9c7281635ff770e2..893a0700050bd5d27f6c4faf2efabb0f58deef38 100644 (file)
--- a/server/slocal.rs
+++ b/server/slocal.rs
@@ -36,8 +36,11 @@ pub async fn run(global: Arc<Global>,
             let may_route = &may_route;
             async move {
               if ! global.config.vnetwork.iter().any(|n| n.contains(&saddr)) {
-                trace!( "ipif local discard outside-vnets saddr={:?}",
-                         saddr);
+                // pretent as if this came from route
+                trace!(
+                  target: "hippotatd",
+ "discard to={:?} via=ipif user=local from-outside-vnets-={:?}",
+                  daddr, saddr);
                 return Ok(())
               }