#!/usr/bin/python3
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+import sys
+import os
+
import twisted
+import twisted.internet
+import twisted.internet.endpoints
+from twisted.internet import reactor
+from twisted.web.server import NOT_DONE_YET
+from twisted.logger import LogLevel
#import twisted.web.server import Site
#from twisted.web.resource import Resource
-from twisted.web.server import NOT_DONE_YET
-from twisted.internet import reactor
from optparse import OptionParser
from configparser import ConfigParser
from configparser import NoOptionError
-import ipaddress
import collections
import syslog
-clients = { }
-
-def ipaddress(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]
# [relay]
[server]
-ipif = userv root ipif %(host),%(relay),%(mtu),slip %(network)
+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. 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)
- else if daddr = host or daddr not in network:
+ 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)
- else if daddr = relay:
+ elif daddr == relay:
log_discard(packet, saddr, daddr, 'relay')
else:
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) ----------
self._buffer = b''
def connectionMade(self): pass
def outReceived(self, data):
- buffer += data
- packets = slip_decode(buffer)
- buffer = packets.pop()
+ #print('RECV ', repr(data))
+ self._buffer += data
+ 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()
global ipif
ipif = IpifProcessProtocol()
reactor.spawnProcess(ipif,
- '/bin/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 ----------
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()
# now request is an unfinished request, or None
try: (queuetime, packet) = self._pq[0]
- except: IndexError:
+ except IndexError:
# no packets, oh well
break
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 = ipaddress(request.args['i'])
+ ci = ipaddr(request.args['i'])
c = clients[ci]
pw = request.args['pw']
if pw != c.pw: raise ValueError('bad password')
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)
- for addrspec in cfg.get('server','addresses').split():
+ site = twisted.web.server.Site(resource)
+ for addrspec in cfg.get('server','addrs').split():
try:
addr = ipaddress.IPv4Address(addrspec)
endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint
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 ----------
try:
host = cfg.get('virtual','host')
except NoOptionError:
- host = network.hosts().next()
+ host = next(network.hosts())
try:
relay = cfg.get('virtual','relay')
- except OptionError:
+ except NoOptionError:
for search in network.hosts():
- if search = host: continue
+ if search == host: continue
relay = search
break
for cs in cfg.sections():
if not (':' in cs or '.' in cs): continue
- ci = ipaddress(cs)
+ ci = ipaddr(cs)
if ci not in network:
raise ValueError('client %s not in network' % ci)
if ci in clients:
raise ValueError('multiple client cfg sections for %s' % ci)
clients[ci] = Client(ci, cs)
+ global mtu
+ mtu = cfg.get('virtual','mtu')
+
iic_vars = { }
for k in ('host','relay','mtu','network'):
iic_vars[k] = globals()[k]
ipif_command = cfg.get('server','ipif', vars=iic_vars)
def startup():
+ global cfg
+
op = OptionParser()
op.add_option('-c', '--config', dest='configfile',
default='/etc/hippottd/server.conf')
(opts, args) = op.parse_args()
if len(args): op.error('no non-option arguments please')
+ twisted.logger.globalLogPublisher.addObserver(crash_on_critical)
+
cfg = ConfigParser()
cfg.read_string(defcfg)
- cfg.read_file(opts['configfile'])
+ cfg.read(opts.configfile)
process_cfg()
start_ipif()
start_http()
+
+startup()
+reactor.run()
+print('CRASHED (end)', file=sys.stderr)
~ian / hippotat.git / blobdiff