messages

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

diff --git a/server/server.rs b/server/server.rs
index 8df75a9c6d5ac051a42e4df46fa0e100f41db6ac..3e85105c87d39c89c1c1664a7a52568de1f19175 100644 (file)
--- 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 eaa7adaa4ef5819a8e0ce39061cdb333ca372cb3..a30aad6a61e76c2b6b877a5340cf7b693b47b969 100644 (file)
--- a/server/slocal.rs
+++ b/server/slocal.rs
@@ -47,7 +47,7 @@ pub async fn run(global: Arc<Global>,
                 // 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(())
               }