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 ----------
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):
#---------- "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]
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 ----------
(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)