#!/usr/bin/python3
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
import sys
import os
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
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]
[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
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):
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
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)
-
-#---------- SLIP handling ----------
-
-slip_end = b'\300'
-slip_esc = b'\333'
-slip_esc_end = b'\334'
-slip_esc_esc = b'\335'
-slip_delimiter = slip_end
-
-def slip_encode(packet):
- return (packet
- .replace(slip_esc, slip_esc + slip_esc_esc)
- .replace(slip_end, slip_esc + slip_esc_end))
-
-def slip_decode(data):
- print('DECODE ', repr(data))
- out = []
- for packet in data.split(slip_end):
- pdata = b''
- while True:
- eix = packet.find(slip_esc)
- if eix == -1:
- pdata += packet
- break
- #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
- else: raise ValueError('invalid SLIP escape')
- packet = packet[eix+2 : ]
- out.append(pdata)
- print('DECODED ', repr(out))
- return out
-
-#---------- packet parsing ----------
-
-def packet_addrs(packet):
- 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)
+ ipif.transport.write(slip.delimiter)
+ ipif.transport.write(slip.encode(packet))
+ ipif.transport.write(slip.delimiter)
#---------- 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)
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()
# 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'])
c.process_arriving_data(d)
c.new_request(request)
+ def render_GET(self, request):
+ return b'<html><body>hippotit</body></html>'
+
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)
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 ----------
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
startup()
reactor.run()
+print('CRASHED (end)', file=sys.stderr)
~ian / hippotat.git / blobdiff