wip

[hippotat.git] / server
diff --git a/server b/server

index fc149c0f0ad5a98f3226cbdf25d12fc8d9a4f0a7..b746bc26e543433e78e0f08ef0065d99a2b9ac19 100755 (executable)
--- a/server
+++ b/server
@@ -6,7 +6,6 @@ import sys
  import os
  
  import twisted.internet
-import twisted.internet.endpoints
  from twisted.web.server import NOT_DONE_YET
  
  #import twisted.web.server import Site
@@ -16,31 +15,6 @@ import syslog
  
  clients = { }
  
-defcfg = '''
-[DEFAULT]
-max_batch_down = 65536
-max_queue_time = 10
-max_request_time = 54
-target_requests_outstanding = 3
-ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
-
-[virtual]
-mtu = 1500
-# network
-# [server]
-# [relay]
-
-[server]
-addrs = 127.0.0.1 ::1
-port = 8099
-
-[limits]
-max_batch_down = 262144
-max_queue_time = 121
-max_request_time = 121
-target_requests_outstanding = 10
-'''
-
  #---------- "router" ----------
  
  def route(packet, saddr, daddr):
@@ -49,8 +23,6 @@ def route(packet, saddr, daddr):
    except KeyError: dclient = None
    if dclient is not None:
      dclient.queue_outbound(packet)
-  elif saddr.is_link_local or daddr.is_link_local:
-    log_discard(packet, saddr, daddr, 'link-local')
    elif daddr == c.server or daddr not in c.network:
      print('TRACE INBOUND ', saddr, daddr, packet)
      queue_inbound(packet)
@@ -88,6 +60,7 @@ class Client():
        req = cfg.getint(cs, k)
        limit = cfg.getint('limits',k)
        self.__dict__[k] = min(req, limit)
+
      self._pq = PacketQueue(self.max_queue_time)
  
      if ip in clients:
@@ -109,6 +82,7 @@ class Client():
  
    def queue_outbound(self, packet):
      self._pq.append(packet)
+    self._check_outbound()
  
    def http_request(self, request):
      request.setHeader('Content-Type','application/octet-stream')
@@ -162,26 +136,20 @@ class IphttpResource(twisted.web.resource.Resource):
    isLeaf = True
    def render_POST(self, request):
      # find client, update config, etc.
-    ci = ipaddr(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'),
-                 ('tro', 'target_requests_outstanding')):
-      try: v = request.args[r]
-      except KeyError: continue
-      v = int(v)
-      c.__dict__[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)
-    c.new_request(request)
+    cl.process_arriving_data(d)
+    cl.new_request(request)
  
    def render_GET(self, request):
      return b'<html><body>hippotat</body></html>'
@@ -213,7 +181,7 @@ def process_cfg():
  
    process_cfg_ipif('server',
                     (('local','server'),
-                    ('peer','relay'),
+                    ('peer', 'relay'),
                      ('rnets','network')))
  
  common_startup(defcfg)