X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=server;h=b746bc26e543433e78e0f08ef0065d99a2b9ac19;hp=1a9049b845131db9c6148373e6f121853fd60e9a;hb=1672ded0fa4c22a2c13cbe9f80baaf3f939bd5fa;hpb=ec88b1f1080f9adffbe1c4c05c38c01e758f124b

diff --git a/server b/server
index 1a9049b..b746bc2 100755
--- a/server
+++ b/server
@@ -1,97 +1,191 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
-from twisted.web.server import Site
-from twisted.web.resource import Resource
+from hippotat import *
+
+import sys
+import os
+
+import twisted.internet
 from twisted.web.server import NOT_DONE_YET
-from twisted.internet import reactor
 
-import ConfigParser
-import ipaddress
+#import twisted.web.server import Site
+#from twisted.web.resource import Resource
+
+import syslog
 
 clients = { }
 
-def ipaddress(input):
-  try:
-    r = ipaddress.IPv4Address(input)
-  except AddressValueError:
-    r = ipaddress.IPv6Address(input)
-  return r
-
-def ipnetwork(input):
-  try:
-    r = ipaddress.IPv4Network(input)
-  except NetworkValueError:
-    r = ipaddress.IPv6Network(input)
-  return r
-
-defcfg = u'''
-[default]
-max_batch_down: 65536
-max_queue_time: 10
-max_request_time: 54
-
-[global]
-max_batch_down: 262144
-max_queue_time: 121
-max_request_time: 121
-'''
+#---------- "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)
+  elif daddr == c.server or daddr not in c.network:
+    print('TRACE INBOUND ', saddr, daddr, packet)
+    queue_inbound(packet)
+  elif daddr == relay:
+    log_discard(packet, saddr, daddr, 'relay')
+  else:
+    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))
+
+#---------- client ----------
 
 class Client():
-  def __init__(ip, cs):
+  def __init__(self, ip, cs, pw):
     # instance data members
     self._ip = ip
     self._cs = cs
-    self.pw = cfg.get(cs, 'password')
-    # plus:
-    #  .cfg[<config-key>]
-    self.cfg = { }
-    for k in ('max_batch_down','max_queue_time','max_request_time'):
+    self.pw = pw
+    self._rq = collections.deque() # requests
+    # self._pq = PacketQueue(...)
+    # plus from config:
+    #  .max_batch_down
+    #  .max_queue_time
+    #  .max_request_time
+    #  .target_requests_outstanding
+
+    if ip not in c.network:
+      raise ValueError('client %s not in network' % ip)
+
+    for k in ('max_batch_down','max_queue_time','max_request_time',
+              'target_requests_outstanding'):
       req = cfg.getint(cs, k)
-      limit = cfg.getint('global',k)
-      self.cfg[k] = min(req, limit)
-
-    def process_arriving_data(d):
-      
-
-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):
+      limit = cfg.getint('limits',k)
+      self.__dict__[k] = min(req, limit)
+
+    self._pq = PacketQueue(self.max_queue_time)
+
+    if ip in clients:
+      raise ValueError('multiple client cfg sections for %s' % ip)
+    clients[ip] = self
+
+  def process_arriving_data(self, 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, saddr, daddr)
+
+  def _req_cancel(self, request):
+    request.finish()
+
+  def _req_error(self, err, request):
+    self._req_cancel(request)
+
+  def queue_outbound(self, packet):
+    self._pq.append(packet)
+    self._check_outbound()
+
+  def http_request(self, request):
+    request.setHeader('Content-Type','application/octet-stream')
+    reactor.callLater(self.max_request_time, self._req_cancel, request)
+    request.notifyFinish().addErrback(self._req_error, request)
+    self._rq.append(request)
+    self._check_outbound()
+
+  def _check_outbound(self):
+    while True:
+      try: request = self._rq[0]
+      except IndexError: request = None
+      if request and request.finished:
+        self._rq.popleft()
+        continue
+
+      if not self._pq.nonempty():
+        # no packets, oh well
+        continue
+
+      if request is None:
+        # no request
+        break
+
+      # request, and also some non-expired packets
+      while True:
+        packet = self.pq.popleft()
+        if packet is None: break
+
+        encoded = slip.encode(packet)
+        
+        if request.sentLength > 0:
+          if (request.sentLength + len(slip.delimiter)
+              + len(encoded) > self.max_batch_down):
+            break
+          request.write(slip.delimiter)
+
+        request.write(encoded)
+        self._pq.popLeft()
+
+      assert(request.sentLength)
+      self._rq.popLeft()
+      request.finish()
+      # round again, looking for more to do
+
+    while len(self._rq) > self.target_requests_outstanding:
+      request = self._rq.popleft()
+      request.finish()
+
+class IphttpResource(twisted.web.resource.Resource):
+  isLeaf = True
   def render_POST(self, request):
     # find client, update config, etc.
-    ci = ipaddress(request.args['i'])
-    c = clients[ci]
-    pw = request.args['pw']
-    if pw != c.pw: raise ValueError('bad password')
-
-    # update config
-    for r, w in (('mbd', 'max_batch_down'),
-                 ('mqt', 'max_queue_time'),
-                 ('mrt', 'max_request_time')):
-      try: v = request.args[r]
-      except KeyError: continue
-      v = int(v)
-      c.cfg[w] = v
+    metadata = request.args['m']
+    (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
+    ci = ipaddr(ci_s])
+    cl = clients[ci]
+    if pw != cl.pw: raise ValueError('bad password')
+
+    if pw != cl.target_requests_outstanding:
+      raise ...
 
     try: d = request.args['d']
     except KeyError: d = ''
 
-    c.process_arriving_data(d)
+    cl.process_arriving_data(d)
+    cl.new_request(request)
+
+  def render_GET(self, request):
+    return b'<html><body>hippotat</body></html>'
 
-    reactor.
+def start_http():
+  resource = IphttpResource()
+  site = twisted.web.server.Site(resource)
+  for sa in c.saddrs:
+    ep = sa.make_endpoint()
+    crash_on_defer(ep.listen(site))
+
+#---------- config and setup ----------
+        
+def process_cfg():
+  process_cfg_common_always()
+  process_cfg_server()
+  process_cfg_network()
+
+  try:
+    c.relay = cfg.get('virtual','relay')
+  except NoOptionError:
+    for search in c.network.hosts():
+      if search == c.server: continue
+      c.relay = search
+      break
+
+  process_cfg_saddrs()
+  process_cfg_clients(Client)
+
+  process_cfg_ipif('server',
+                   (('local','server'),
+                    ('peer', 'relay'),
+                    ('rnets','network')))
+
+common_startup(defcfg)
+process_cfg()
+start_ipif(c.ipif_command, route)
+start_http()
+common_run()