X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=client;h=afdee9dcb7e7c8a8e2f72cfbd1f610687c1a29a9;hb=0d10f35fe22e53f7d0161c44ba0d0476114f99d3;hp=39e04c56640e7eeac6a4c0ec01a0310a8f314bd1;hpb=7b07f0b5fd215702dc58c53bd1cd7c63767f5710;p=hippotat.git

diff --git a/client b/client
index 39e04c5..afdee9d 100755
--- a/client
+++ b/client
@@ -2,6 +2,9 @@
 
 from hippotat import *
 
+import twisted.web
+import twisted.web.client
+
 client_cs = None
 
 def set_client(ci,cs,pw):
@@ -25,13 +28,14 @@ def process_cfg():
     c.url = cfg.get('server','url')
   except NoOptionError:
     process_cfg_saddrs()
-    sa = c.saddrs[0].url()
+    c.url = c.saddrs[0].url()
 
   process_cfg_clients(set_client)
 
   c.routes = cfg.get('virtual','routes')
   c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
   c.max_batch_up   = cfg.getint(client_cs, 'max_batch_up')
+  c.http_timeout   = cfg.getint(client_cs, 'http_timeout')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),
@@ -51,31 +55,46 @@ def outbound(packet, saddr, daddr):
   queue.append(packet)
   check_outbound()
 
-def req_ok(data)
+class ResponseConsumer(twisted.internet.protocol.Protocol):
+  def __init__(self):
+    self._ssd = SlipStreamDecoder(queue_inbound)
+  def dataReceived(self, data):
+    self._ssd.inputdata(mime_translate(data))
+  def connectionMade(self): pass
+  def connectionLost(self, reason):
+    if isinstance(reason, twisted.internet.error.ConnectionDone):
+      self._ssd.flush()
+    else:
+      print(reason, file=sys.stderr)
+
+def req_ok(resp):
+  resp.deliverBody(ResponseConsumer())
 
 def req_err(err):
-  print(err, >>sys.stderr)
-  outstanding--
+  print(err, file=sys.stderr)
 
-def req_fin(*args):  
+def req_fin(*args):
+  global outstanding
+  outstanding -= 1
 
 def check_outbound():
+  global outstanding
   while True:
-    if                         outstanding >= c.max_outstanding   : break
-    if not queue.nonempty() && outstanding >= c.target_outstanding: break
+    if                          outstanding >= c.max_outstanding   : break
+    if not queue.nonempty() and outstanding >= c.target_outstanding: break
 
     d = b''
+    def moredata(s): nonlocal d; d += s
     queue.process((lambda: len(d)),
-                  (lambda s: d += s),
+                  moredata,
                   c.max_batch_up)
-    assert(len(d))
     
     crlf = b'\r\n'
     mime = (b'--b'                                      + crlf +
             b'Content-Disposition: form-data; name="m"' + crlf +
             password                                    + crlf +
-            c.client                                    + crlf +
-            c.target_outstanding                        + crlf +
+            str(c.client)             .encode('ascii')  + crlf +
+            str(c.target_outstanding) .encode('ascii')  + crlf +
             b'--b'                                      + crlf +
             b'Content-Disposition: form-data; name="d"' + crlf +
             mime_translate(d)                           + crlf +
@@ -83,13 +102,13 @@ def check_outbound():
 
     hh = { 'User-Agent': ['hippotat'],
            'Content-Type': ['multipart/form-data; boundary="b"'] }
-    req = agent.request('POST',
+    req = agent.request(b'POST',
                         c.url,
                         twisted.web.client.Headers(hh))
-    req.addTimeout(c.http_timeout, 
+    req.addTimeout(c.http_timeout, reactor)
     req.addCallbacks(req_ok, req_err)
     req.addBoth(req_fin)
-    outstanding++
+    outstanding += 1
 
 common_startup()
 process_cfg()