From a8827d595150e75f3fcd7353e08032ca5aa0135f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 1 Apr 2017 12:30:37 +0100
Subject: [PATCH] wip log iface

---
 hippotat/__init__.py | 6 +++---
 server               | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index 35c87f2..0649091 100644
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -111,9 +111,9 @@ class ConfigResults:
 
 c = ConfigResults()
 
-def log_discard(packet, saddr, daddr, why):
+def log_discard(packet, iface, saddr, daddr, why):
   log_debug(DBG.DROP,
-            'discarded packet %s -> %s (%s)' % (saddr, daddr, why),
+            'discarded packet [%s] %s -> %s: %s' % (iface, saddr, daddr, why),
             d=packet)
 
 #---------- packet parsing ----------
@@ -184,7 +184,7 @@ class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
   def slip_on_packet(self, packet):
     (saddr, daddr) = packet_addrs(packet)
     if saddr.is_link_local or daddr.is_link_local:
-      log_discard(packet, saddr, daddr, 'link-local')
+      log_discard(packet, 'ipif', saddr, daddr, 'link-local')
       return
     self._router(packet, saddr, daddr)
   def processEnded(self, status):
diff --git a/server b/server
index f76f501..19a04d2 100755
--- a/server
+++ b/server
@@ -16,7 +16,7 @@ clients = { }
 
 #---------- "router" ----------
 
-def route(packet, saddr, daddr):
+def route(packet, iface, saddr, daddr):
   def lt(dest):
     log_debug(DBG.ROUTE, 'route: %s -> %s: %s' % (saddr,daddr,dest), d=packet)
   try: dclient = clients[daddr]
@@ -29,10 +29,10 @@ def route(packet, saddr, daddr):
     queue_inbound(packet)
   elif daddr == relay:
     lt('discard relay')
-    log_discard(packet, saddr, daddr, 'relay')
+    log_discard(packet, iface, saddr, daddr, 'relay')
   else:
     lt('discard no-client')
-    log_discard(packet, saddr, daddr, 'no-client')
+    log_discard(packet, iface, saddr, daddr, 'no-client')
 
 #---------- client ----------
 
@@ -76,7 +76,7 @@ class Client():
       (saddr, daddr) = packet_addrs(packet)
       if saddr != self._ip:
         raise ValueError('wrong source address %s' % saddr)
-      route(packet, saddr, daddr)
+      route(packet, self._ip, saddr, daddr)
 
   def _req_cancel(self, request):
     self._log(DBG.HTTPCTRL, 'cancel', idof=request)
-- 
2.30.2