messages

[hippotat.git] / server / server.rs

diff --git a/server/server.rs b/server/server.rs
index 667ff2e56df1bf445bfe4851790ea3449422d172..3e85105c87d39c89c1c1664a7a52568de1f19175 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -61,28 +61,28 @@ pub async fn route_packet(global: &Global,
   let c = &global.config;
   let len = packet.len();
   let trace = |how: &str, why: &str| {
-    trace!("{} {} {} {} {:?} len={}",
-           transport_conn,
+    trace!("{} to={:?} came=={} 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) =
     if daddr == c.vaddr || ! c.vnetwork.iter().any(|n| n.contains(&daddr)) {
-      (None, "ipif-inbound-xxx")
+      (Some(&global.local_rx), "via=local")
     } else if daddr == c.vrelay {
-      (None, "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")
     };
 
   let dest = if let Some(d) = dest { d } else {
-    trace("discard", why); return;
+    trace("discard ", why); return;
   };
 
   let packet = RoutedPacket {