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

diff --git a/client b/client
index 7684cf3..ec28fd0 100755
--- a/client
+++ b/client
@@ -2,21 +2,10 @@
 
 from hippotat import *
 
-defcfg = '''
-[DEFAULT]
-max_requests_outstanding = 4
+import twisted.web
+import twisted.web.client
 
-[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>
-'''
+import io
 
 client_cs = None
 
@@ -27,6 +16,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():
@@ -40,25 +30,154 @@ 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)
 
-  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')
+  c.http_timeout   = cfg.getint(client_cs, 'http_timeout')
+  c.http_retry     = cfg.getint(client_cs, 'http_retry')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),
                     ('peer',  'server'),
                     ('rnets', 'routes')))
 
+outstanding = 0
+
+def start_client():
+  global queue
+  global agent
+  queue = PacketQueue('up', 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()
+
+class ResponseConsumer(twisted.internet.protocol.Protocol):
+  def __init__(self, req):
+    self._req = req
+    self._ssd = SlipStreamDecoder(queue_inbound)
+    self._log(DBG.HTTP_CTRL, '__init__')
+
+  def _log(self, dflag, msg, **kwargs):
+    log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
+
+  def dataReceived(self, data):
+    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+    try:
+      self._ssd.inputdata(mime_translate(data))
+    except Exception as e:
+      self._asyncfailure(e)
+
+  def connectionMade(self):
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
+
+  def connectionLost(self, reason):
+    self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+    if reason.check(twisted.web.client.ResponseDone):
+      try: self._ssd.flush()
+      except Exception as e:
+        self._asyncfailure(e)
+    else:
+      self._asyncfailure(reason)
+
+  def _asyncfailure(self, reason):
+    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
+    global outstanding
+    outstanding += 1
+    req_err(self._req, reason)
+
+def req_ok(req, resp):
+  log_debug(DBG.HTTP_CTRL,
+            'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)),
+            idof=req)
+  if resp.code != 200:
+    try:
+      phrase = resp.phrase.decode('utf-8')
+    except UnicodeDecodeError:
+      phrase = repr(resp.phrase)
+    req_err(req, "FAILED %d %s" % (resp.code, phrase))
+    return
+
+  rc = ResponseConsumer(req)
+  resp.deliverBody(rc)
+  req_fin(req)
+
+def req_err(req, err):
+  log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+  print(err, file=sys.stderr)
+  reactor.callLater(c.http_retry, (lambda: req_fin(req)))
+
+def req_fin(req):
+  log_debug(DBG.HTTP_CTRL, 'req_fin', idof=req)
+  global outstanding
+  outstanding -= 1
+  check_outbound()
+
+def check_outbound():
+  global outstanding
+
+  while True:
+    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)),
+                  moredata,
+                  c.max_batch_up)
+    
+    d = mime_translate(d)
+
+    crlf = b'\r\n'
+    lf   =   b'\n'
+    mime = (b'--b'                                        + crlf +
+            b'Content-Type: text/plain; charset="utf-8"'  + crlf +
+            b'Content-Disposition: form-data; name="m"'   + crlf + crlf +
+            str(c.client)             .encode('ascii')    + crlf +
+            password                                      + crlf +
+            str(c.target_outstanding) .encode('ascii')    + crlf +
+          ((
+            b'--b'                                        + crlf +
+            b'Content-Type: application/octet-stream'     + crlf +
+            b'Content-Disposition: form-data; name="d"'   + crlf + crlf +
+            d                                             + crlf
+           ) if len(d) else b'')                               +
+            b'--b--'                                      + crlf)
+
+    #df = open('data.dump.dbg', mode='wb')
+    #df.write(mime)
+    #df.close()
+    # POST -use -c 'multipart/form-data; boundary="b"' http://localhost:8099/ <data.dump.dbg
+
+    log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
+
+    hh = { 'User-Agent': ['hippotat'],
+           'Content-Type': ['multipart/form-data; boundary="b"'],
+           'Content-Length': [str(len(mime))] }
+
+    bytesreader = io.BytesIO(mime)
+    producer = twisted.web.client.FileBodyProducer(bytesreader)
+
+    req = agent.request(b'POST',
+                        c.url,
+                        twisted.web.client.Headers(hh),
+                        producer)
+
+    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
+    req.addTimeout(c.http_timeout, reactor)
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback((lambda err: req_err(req, err)))
+    outstanding += 1
 
-common_startup(defcfg)
+common_startup()
 process_cfg()
+start_client()
 start_ipif(c.ipif_command, outbound)
+check_outbound()
 common_run()