X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=hippotat%2F__init__.py;h=064909100fbe409fe30ee67b772c902140060443;hp=35c87f2e1ce2b494c24da44ca8d7911bfb2a5bac;hb=a8827d595150e75f3fcd7353e08032ca5aa0135f;hpb=b68c0739e0dbabf20117e637b10ac3cf61ebb783 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):