X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=server;h=3abebe96bfb69bdf5921dfa64cf1a8da2f70bbf0;hb=b0eae083a34b61e851dea6ba8c0c237c14d25814;hp=df49699367cac880caa02e5e838cfb3528f3be65;hpb=ec0c4d95c95f6335241464453e9d68b5a6569a76;p=hippotat.git diff --git a/server b/server index df49699..3abebe9 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 @@ -55,7 +58,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,6 +66,20 @@ 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, saddr, daddr): @@ -71,9 +88,7 @@ def route(packet, saddr, daddr): except KeyError: dclient = None if dclient is not None: dclient.queue_outbound(packet) - elif daddr.is_multicast: - log_discard(packet, saddr, daddr, 'multicast') - elif daddr.is_link_local: + 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) @@ -84,7 +99,7 @@ def route(packet, saddr, daddr): log_discard(packet, saddr, daddr, 'no client') def log_discard(packet, saddr, daddr, why): - print('DROP ', saddr, daddr, why, packet) + print('DROP ', saddr, daddr, why) # syslog.syslog(syslog.LOG_DEBUG, # 'discarded packet %s -> %s (%s)' % (saddr, daddr, why)) @@ -144,8 +159,9 @@ def slip_decode(data): #print('ESC ', repr((pdata, packet, eix))) pdata += packet[0 : eix] ck = packet[eix+1] - if ck == slip_esc_esc: pdata += slip_esc - elif ck == slip_esc_end: pdata += slip_end + #print('ESC... %o' % ck) + if ck == slip_esc_esc[0]: pdata += slip_esc + elif ck == slip_esc_end[0]: pdata += slip_end else: raise ValueError('invalid SLIP escape') packet = packet[eix+2 : ] out.append(pdata) @@ -279,6 +295,9 @@ class IphttpResource(twisted.web.resource.Resource): c.process_arriving_data(d) c.new_request(request) + def render_GET(self, request): + return 'hippotit' + def start_http(): resource = IphttpResource() sitefactory = twisted.web.server.Site(resource) @@ -290,7 +309,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(sitefactory)) #---------- config and setup ---------- @@ -335,14 +354,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 @@ -365,3 +376,4 @@ def startup(): startup() reactor.run() +print('CRASHED (end)', file=sys.stderr)