X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=39e04c56640e7eeac6a4c0ec01a0310a8f314bd1;hp=7684cf33b682dad6212861880aa52df1bab245ac;hb=7b07f0b5fd215702dc58c53bd1cd7c63767f5710;hpb=034284c3d2f1bdc9c9c4e7762b40b34a9713f566

diff --git a/client b/client
index 7684cf3..39e04c5 100755
--- a/client
+++ b/client
@@ -2,22 +2,6 @@
 
 from hippotat import *
 
-defcfg = '''
-[DEFAULT]
-max_requests_outstanding = 4
-
-[virtual]
-mtu = 1500
-# [server]  # maybe computed from `network' (see server defaults)
-# [routes]  # default is none
-
-[server]
-# url     # maybe computed from `addrs' and `port' (see server defaults)
-
-# [<my ip address>]
-# password = <password>
-'''
-
 client_cs = None
 
 def set_client(ci,cs,pw):
@@ -27,6 +11,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():
@@ -44,21 +29,70 @@ def process_cfg():
 
   process_cfg_clients(set_client)
 
-  try:
-    c.routes = cfg.get('virtual','routes')
-  except NoOptionError:
-    c.routes = ''
+  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')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),
                     ('peer',  'server'),
                     ('rnets', 'routes')))
 
+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))
-  pass
+  #print('OUT ', saddr, daddr, repr(packet))
+  queue.append(packet)
+  check_outbound()
+
+def req_ok(data)
+
+def req_err(err):
+  print(err, >>sys.stderr)
+  outstanding--
+
+def req_fin(*args):  
+
+def check_outbound():
+  while True:
+    if                         outstanding >= c.max_outstanding   : break
+    if not queue.nonempty() && outstanding >= c.target_outstanding: break
+
+    d = b''
+    queue.process((lambda: len(d)),
+                  (lambda s: d += s),
+                  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)
+
+    hh = { 'User-Agent': ['hippotat'],
+           'Content-Type': ['multipart/form-data; boundary="b"'] }
+    req = agent.request('POST',
+                        c.url,
+                        twisted.web.client.Headers(hh))
+    req.addTimeout(c.http_timeout, 
+    req.addCallbacks(req_ok, req_err)
+    req.addBoth(req_fin)
+    outstanding++
 
-common_startup(defcfg)
+common_startup()
 process_cfg()
+start_client()
 start_ipif(c.ipif_command, outbound)
 common_run()