X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/ca732796fd94e7bc50750c11377da63880e4beff..213fbe989ae5642701a264e94e90286bb67fcf6e:/client

diff --git a/client b/client
index b60f3d1..018da51 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):
@@ -11,6 +14,7 @@ def set_client(ci,cs,pw):
   client_cs = cs
   c.client = ci
   c.max_outstanding = cfg.getint(cs, 'max_requests_outstanding')
+  c.target_outstanding = cfg.getint(cs, 'target_requests_outstanding')
   password = pw
 
 def process_cfg():
@@ -29,7 +33,9 @@ def process_cfg():
   process_cfg_clients(set_client)
 
   c.routes = cfg.get('virtual','routes')
-  c.max_queue_time = cfg.get(client_cs, 'max_queue_time')
+  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'),
@@ -40,24 +46,71 @@ outstanding = 0
 
 def start_client():
   global queue
+  global agent
   queue = PacketQueue(c.max_queue_time)
+  agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout)
 
 def outbound(packet, saddr, daddr):
   #print('OUT ', saddr, daddr, repr(packet))
   queue.append(packet)
   check_outbound()
 
+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, file=sys.stderr)
+
+def req_fin(*args):  
+  outstanding -= 1
+
 def check_outbound():
   while True:
-    if outstanding >= c.max_outstanding: break
-    elements = { }
-    if not queue.nonempty():
-      if outstanding >= c.target_
+    if                          outstanding >= c.max_outstanding   : break
+    if not queue.nonempty() and outstanding >= c.target_outstanding: break
+
+    d = b''
+    def moredata(s): global d; d += s
+    queue.process((lambda: len(d)),
+                  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 +
+            b'--b'                                      + crlf +
+            b'Content-Disposition: form-data; name="d"' + crlf +
+            mime_translate(d)                           + crlf +
+            b'--b--'                                    + crlf)
 
-  while (outstanding <  and
-         (queue.notempty() or outstanding < c.
+    hh = { 'User-Agent': ['hippotat'],
+           'Content-Type': ['multipart/form-data; boundary="b"'] }
+    req = agent.request(b'POST',
+                        c.url,
+                        twisted.web.client.Headers(hh))
+    req.addTimeout(c.http_timeout)
+    req.addCallbacks(req_ok, req_err)
+    req.addBoth(req_fin)
+    outstanding += 1
 
-common_startup(defcfg)
+common_startup()
 process_cfg()
+start_client()
 start_ipif(c.ipif_command, outbound)
 common_run()