X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/2b95da1651737967c69a18030fae6eb76876d048..c491fea13a428b0c33df3294b23db7e2773e8dc6:/server diff --git a/server b/server index b3285ed..6650073 100755 --- a/server +++ b/server @@ -1,5 +1,8 @@ #!/usr/bin/python3 +import signal +signal.signal(signal.SIGINT, signal.SIG_DFL) + import sys import os @@ -10,9 +13,6 @@ from twisted.internet import reactor from twisted.web.server import NOT_DONE_YET from twisted.logger import LogLevel -import ipaddress -from ipaddress import AddressValueError - #import twisted.web.server import Site #from twisted.web.resource import Resource @@ -24,21 +24,9 @@ import collections import syslog -clients = { } - -def ipaddr(input): - try: - r = ipaddress.IPv4Address(input) - except AddressValueError: - r = ipaddress.IPv6Address(input) - return r +from hippotit import * -def ipnetwork(input): - try: - r = ipaddress.IPv4Network(input) - except NetworkValueError: - r = ipaddress.IPv6Network(input) - return r +clients = { } defcfg = ''' [DEFAULT] @@ -55,7 +43,7 @@ mtu = 1500 [server] ipif = userv root ipif %(host)s,%(relay)s,%(mtu)s,slip %(network)s addrs = 127.0.0.1 ::1 -port = 80 +port = 8099 [limits] max_batch_down = 262144 @@ -63,14 +51,32 @@ max_queue_time = 121 max_request_time = 121 ''' +#---------- error handling ---------- + +def crash(err): + print('CRASH ', err, file=sys.stderr) + try: reactor.stop() + except twisted.internet.error.ReactorNotRunning: pass + +def crash_on_defer(defer): + defer.addErrback(lambda err: crash(err)) + +def crash_on_critical(event): + if event.get('log_level') >= LogLevel.critical: + crash(twisted.logger.formatEvent(event)) + #---------- "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') @@ -78,8 +84,9 @@ def route(packet, daddr): 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) ---------- @@ -88,12 +95,14 @@ class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): self._buffer = b'' def connectionMade(self): pass def outReceived(self, data): + #print('RECV ', repr(data)) self._buffer += data - packets = slip_decode(self._buffer) + 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() @@ -101,13 +110,13 @@ def start_ipif(): global ipif ipif = IpifProcessProtocol() reactor.spawnProcess(ipif, - '/bin/sh',['sh','-c', ipif_command], + '/bin/sh',['sh','-xc', ipif_command], childFDs={0:'w', 1:'r', 2:2}) def queue_inbound(packet): - ipif.transport.write(slip_delimiter) - ipif.transport.write(slip_encode(packet)) - ipif.transport.write(slip_delimiter) + ipif.transport.write(slip.delimiter) + ipif.transport.write(slip.encode(packet)) + ipif.transport.write(slip.delimiter) #---------- client ---------- @@ -129,11 +138,11 @@ class Client(): self.__dict__[k] = min(req, limit) def process_arriving_data(self, d): - for packet in slip_decode(d): + for packet in slip.decode(d): (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() @@ -179,13 +188,13 @@ class Client(): try: (dummy, packet) = self._pq[0] except IndexError: break - encoded = slip_encode(packet) + encoded = slip.encode(packet) if request.sentLength > 0: - if (request.sentLength + len(slip_delimiter) + if (request.sentLength + len(slip.delimiter) + len(encoded) > self.max_batch_down): break - request.write(slip_delimiter) + request.write(slip.delimiter) request.write(encoded) self._pq.popLeft() @@ -196,6 +205,7 @@ class Client(): # round again, looking for more to do class IphttpResource(twisted.web.resource.Resource): + isLeaf = True def render_POST(self, request): # find client, update config, etc. ci = ipaddr(request.args['i']) @@ -218,9 +228,12 @@ class IphttpResource(twisted.web.resource.Resource): c.process_arriving_data(d) c.new_request(request) + def render_GET(self, request): + return b'hippotit' + def start_http(): resource = IphttpResource() - sitefactory = twisted.web.server.Site(resource) + site = twisted.web.server.Site(resource) for addrspec in cfg.get('server','addrs').split(): try: addr = ipaddress.IPv4Address(addrspec) @@ -229,7 +242,7 @@ def start_http(): addr = ipaddress.IPv6Address(addrspec) endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint ep = endpointfactory(reactor, cfg.getint('server','port'), addr) - ep.listen(sitefactory) + crash_on_defer(ep.listen(site)) #---------- config and setup ---------- @@ -274,14 +287,6 @@ def process_cfg(): ipif_command = cfg.get('server','ipif', vars=iic_vars) -def crash_on_critical(event): - if event.get('log_level') >= LogLevel.critical: - print('crashing: ', twisted.logger.formatEvent(event), file=sys.stderr) - #print('crashing!', file=sys.stderr) - #os._exit(1) - try: reactor.stop() - except twisted.internet.error.ReactorNotRunning: pass - def startup(): global cfg @@ -304,3 +309,4 @@ def startup(): startup() reactor.run() +print('CRASHED (end)', file=sys.stderr)