X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/88487243bc0be906c63258005df75b96bc8165a5..ca732796fd94e7bc50750c11377da63880e4beff:/server?ds=sidebyside

diff --git a/server b/server
index fc149c0..d36a84e 100755
--- 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')
@@ -168,6 +142,8 @@ class IphttpResource(twisted.web.resource.Resource):
     if pw != c.pw: raise ValueError('bad password')
 
     # update config
+    
+    xxx check sanity, do not update
     for r, w in (('mbd', 'max_batch_down'),
                  ('mqt', 'max_queue_time'),
                  ('mrt', 'max_request_time'),
@@ -213,7 +189,7 @@ def process_cfg():
 
   process_cfg_ipif('server',
                    (('local','server'),
-                    ('peer','relay'),
+                    ('peer', 'relay'),
                     ('rnets','network')))
 
 common_startup(defcfg)