#---------- "router" ----------
-def route(packet, daddr):
+def route(packet, saddr, daddr):
+ print('TRACE ', saddr, daddr, packet)
try: client = clients[daddr]
except KeyError: dclient = None
if dclient is not None:
dclient.queue_outbound(packet)
+ elif saddr.is_link_local or daddr.is_link_local:
+ log_discard(packet, saddr, daddr, 'link-local')
elif daddr == host or daddr not in network:
+ print('TRACE INBOUND ', saddr, daddr, packet)
queue_inbound(packet)
elif daddr == relay:
log_discard(packet, saddr, daddr, 'relay')
log_discard(packet, saddr, daddr, 'no client')
def log_discard(packet, saddr, daddr, why):
- syslog.syslog(syslog.LOG_DEBUG,
- 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
+ print('DROP ', saddr, daddr, why)
+# syslog.syslog(syslog.LOG_DEBUG,
+# 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
#---------- ipif (slip subprocess) ----------
packets = slip_decode(self._buffer)
self._buffer = packets.pop()
for packet in packets:
+ if not len(packet): continue
(saddr, daddr) = packet_addrs(packet)
- route(packet, daddr)
+ route(packet, saddr, daddr)
def processEnded(self, status):
status.raiseException()
#---------- packet parsing ----------
def packet_addrs(packet):
- pass
+ version = packet[0] >> 4
+ if version == 4:
+ addrlen = 4
+ saddroff = 3*4
+ factory = ipaddress.IPv4Address
+ elif version == 6:
+ addrlen = 16
+ saddroff = 2*4
+ factory = ipaddress.IPv6Address
+ else:
+ raise ValueError('unsupported IP version %d' % version)
+ saddr = factory(packet[ saddroff : saddroff + addrlen ])
+ daddr = factory(packet[ saddroff + addrlen : saddroff + addrlen*2 ])
+ return (saddr, daddr)
#---------- client ----------
(saddr, daddr) = packet_addrs(packet)
if saddr != self._ip:
raise ValueError('wrong source address %s' % saddr)
- route(packet, daddr)
+ route(packet, saddr, daddr)
def _req_cancel(self, request):
request.finish()
addr = ipaddress.IPv6Address(addrspec)
endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint
ep = endpointfactory(reactor, cfg.getint('server','port'), addr)
- ep.listen(sitefactory)
+ defer = ep.listen(sitefactory)
+ defer.addErrback(lambda err: err.raiseException())
#---------- config and setup ----------