X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=e4e5eae7a01df3e180be74d170b6404f37a78f6f;hp=856c6742b6827b00c362359e3fd0855361a152c5;hb=3393242040c461d71187af33fb0338036784e513;hpb=dd6665eea9fc248770b757a4314c3c2b8de7cc86

diff --git a/client b/client
index 856c674..e4e5eae 100755
--- a/client
+++ b/client
@@ -59,21 +59,37 @@ 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):
     try: self._ssd.inputdata(mime_translate(data))
     except Exception as e: asyncfailure(e)
-  def connectionMade(self): pass
+
+  def connectionMade(self):
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
+
   def connectionLost(self, reason):
+    self._log(DBG.HTTP_CTRL, 'connectionLost')
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
       except Exception as e: asyncfailure(e)
     else:
-      asyncfailure(reason)
+      self._asyncfailure(reason)
 
-def req_ok(resp):
-  resp.deliverBody(ResponseConsumer())
+  def _asyncfailure(self, reason):
+    global outstanding
+    outstanding += 1
+    req_err(reason)
+
+def req_ok(req, resp):
+  rc = ResponseConsumer(req)
+  resp.deliverBody(rc)
   req_fin()
 
 def req_err(err):
@@ -103,6 +119,8 @@ def check_outbound():
                   moredata,
                   c.max_batch_up)
     
+    d = mime_translate(d)
+
     crlf = b'\r\n'
     lf   =   b'\n'
     mime = (b'--b'                                        + crlf +
@@ -115,7 +133,7 @@ def check_outbound():
             b'--b'                                        + crlf +
             b'Content-Type: application/octet-stream'     + crlf +
             b'Content-Disposition: form-data; name="d"'   + crlf + crlf +
-            mime_translate(d)                             + crlf
+            d                                             + crlf
            ) if len(d) else b'')                               +
             b'--b--'                                      + crlf)
 
@@ -138,7 +156,8 @@ def check_outbound():
                         twisted.web.client.Headers(hh),
                         producer)
     req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks(req_ok, req_err)
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback(req_err)
     outstanding += 1
 
 common_startup()