reorg SlipStreamDecoder again

[hippotat.git] / server

diff --git a/server b/server
index 2daf0b0223a2f692a1494629cd4db39890440f3c..e3e28cebada5e77c3186f47d2a3748fa90f8e1d7 100755 (executable)
--- a/server
+++ b/server
@@ -102,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()