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

diff --git a/client b/client
index afdee9d..ec28fd0 100755
--- a/client
+++ b/client
@@ -5,6 +5,8 @@ from hippotat import *
 import twisted.web
 import twisted.web.client
 
+import io
+
 client_cs = None
 
 def set_client(ci,cs,pw):
@@ -36,6 +38,7 @@ def process_cfg():
   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'),
@@ -47,7 +50,7 @@ outstanding = 0
 def start_client():
   global queue
   global agent
-  queue = PacketQueue(c.max_queue_time)
+  queue = PacketQueue('up', c.max_queue_time)
   agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout)
 
 def outbound(packet, saddr, daddr):
@@ -56,29 +59,69 @@ def outbound(packet, saddr, daddr):
   check_outbound()
 
 class ResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self):
+  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._ssd.inputdata(mime_translate(data))
-  def connectionMade(self): pass
+    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):
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
-      self._ssd.flush()
+    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:
-      print(reason, file=sys.stderr)
-
-def req_ok(resp):
-  resp.deliverBody(ResponseConsumer())
+      self._asyncfailure(reason)
 
-def req_err(err):
+  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(*args):
+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
@@ -89,29 +132,52 @@ def check_outbound():
                   moredata,
                   c.max_batch_up)
     
+    d = mime_translate(d)
+
     crlf = b'\r\n'
-    mime = (b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="m"' + crlf +
-            password                                    + 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 +
-            b'--b--'                                    + crlf)
+    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-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))
+                        twisted.web.client.Headers(hh),
+                        producer)
+
+    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
     req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks(req_ok, req_err)
-    req.addBoth(req_fin)
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback((lambda err: req_err(req, err)))
     outstanding += 1
 
 common_startup()
 process_cfg()
 start_client()
 start_ipif(c.ipif_command, outbound)
+check_outbound()
 common_run()