chiark / gitweb /
hippotit -> hippotat
[hippotat.git] / server
diff --git a/server b/server
index 6c229a92bcd930680a209438a6c31678304fb6af..6650073ac4e54f532a0dc481c70b63914e8d8210 100755 (executable)
--- a/server
+++ b/server
 #!/usr/bin/python3
 
-import twisted.web.server import Site
-from twisted.web.resource import Resource
-from twisted.web.server import NOT_DONE_YET
+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
 
-import configparser
-import ipaddress
+from optparse import OptionParser
+from configparser import ConfigParser
+from configparser import NoOptionError
 
 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 = u'''
+defcfg = '''
 [DEFAULT]
 max_batch_down = 65536
 max_queue_time = 10
 max_request_time = 54
 
+[virtual]
+mtu = 1500
+# network
+# [host]
+# [relay]
+
+[server]
+ipif = userv root ipif %(host)s,%(relay)s,%(mtu)s,slip %(network)s
+addrs = 127.0.0.1 ::1
+port = 8099
+
 [limits]
 max_batch_down = 262144
 max_queue_time = 121
 max_request_time = 121
 '''
 
-def route(packet. daddr):
+#---------- 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):
+  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 = server 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)
+  elif daddr == relay:
+    log_discard(packet, saddr, daddr, 'relay')
   else:
-    syslog.syslog(syslog.LOG_DEBUG, 'no client for %s' % daddr)
+    log_discard(packet, saddr, daddr, 'no client')
+
+def log_discard(packet, saddr, daddr, why):
+  print('DROP ', saddr, daddr, why)
+#  syslog.syslog(syslog.LOG_DEBUG,
+#                'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
+
+#---------- ipif (slip subprocess) ----------
+
+class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
+  def __init__(self):
+    self._buffer = b''
+  def connectionMade(self): pass
+  def outReceived(self, data):
+    #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, saddr, daddr)
+  def processEnded(self, status):
+    status.raiseException()
+
+def start_ipif():
+  global ipif
+  ipif = IpifProcessProtocol()
+  reactor.spawnProcess(ipif,
+                       '/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)
+
+#---------- client ----------
 
 class Client():
   def __init__(self, ip, cs):
@@ -68,11 +138,11 @@ class Client():
       self.__dict__[k] = min(req, limit)
 
     def process_arriving_data(self, d):
-      for packet in slip_decode(d):
-        (saddr, daddr) = ip_64_addrs(packet)
+      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()
@@ -100,7 +170,7 @@ class Client():
 
         # now request is an unfinished request, or None
         try: (queuetime, packet) = self._pq[0]
-        except: IndexError:
+        except IndexError:
           # no packets, oh well
           break
 
@@ -118,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()
@@ -134,29 +204,11 @@ class Client():
         request.finish()
         # round again, looking for more to do
 
-def process_cfg():
-  global network
-  global ourself
-
-  network = ipnetwork(cfg.get('virtual','network'))
-  try:
-    ourself = cfg.get('virtual','server')
-  except ConfigParser.NoOptionError:
-    ourself = network.hosts().next()
-
-  for cs in cfg.sections():
-    if not (':' in cs or '.' in cs): continue
-    ci = ipaddress(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)
-
-class FormPage(Resource):
+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')
@@ -175,3 +227,86 @@ class FormPage(Resource):
 
     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()
+  site = twisted.web.server.Site(resource)
+  for addrspec in cfg.get('server','addrs').split():
+    try:
+      addr = ipaddress.IPv4Address(addrspec)
+      endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint
+    except AddressValueError:
+      addr = ipaddress.IPv6Address(addrspec)
+      endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint
+    ep = endpointfactory(reactor, cfg.getint('server','port'), addr)
+    crash_on_defer(ep.listen(site))
+
+#---------- config and setup ----------
+        
+def process_cfg():
+  global network
+  global host
+  global relay
+  global ipif_command
+
+  network = ipnetwork(cfg.get('virtual','network'))
+  if network.num_addresses < 3 + 2:
+    raise ValueError('network needs at least 2^3 addresses')
+
+  try:
+    host = cfg.get('virtual','host')
+  except NoOptionError:
+    host = next(network.hosts())
+
+  try:
+    relay = cfg.get('virtual','relay')
+  except NoOptionError:
+    for search in network.hosts():
+      if search == host: continue
+      relay = search
+      break
+
+  for cs in cfg.sections():
+    if not (':' in cs or '.' in cs): continue
+    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')
+  global opts
+  (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(opts.configfile)
+  process_cfg()
+
+  start_ipif()
+  start_http()
+
+startup()
+reactor.run()
+print('CRASHED (end)', file=sys.stderr)