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

diff --git a/server b/server
index b746bc2..e3e28ce 100755
--- a/server
+++ b/server
@@ -2,7 +2,6 @@
 
 from hippotat import *
 
-import sys
 import os
 
 import twisted.internet
@@ -31,11 +30,6 @@ def route(packet, saddr, daddr):
   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():
@@ -108,20 +102,9 @@ class Client():
         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()
+      self._pq.process((lambda: request.sentLength),
+                       request.write,
+                       self.max_batch_down)
 
       assert(request.sentLength)
       self._rq.popLeft()
@@ -138,7 +121,7 @@ class IphttpResource(twisted.web.resource.Resource):
     # find client, update config, etc.
     metadata = request.args['m']
     (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
-    ci = ipaddr(ci_s])
+    ci = ipaddr(ci_s)
     cl = clients[ci]
     if pw != cl.pw: raise ValueError('bad password')
 
@@ -184,7 +167,7 @@ def process_cfg():
                     ('peer', 'relay'),
                     ('rnets','network')))
 
-common_startup(defcfg)
+common_startup()
 process_cfg()
 start_ipif(c.ipif_command, route)
 start_http()