X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=829087e3936c8029e7f17d5f8e27fc56877848b1;hp=270901506c4caec692694c1fc70494033bb6b1aa;hb=9aa11043fa621582edc95c11140c9904db99bc84;hpb=bd9e77fb859455383fdfc162fb9e1bdaf7a3289e;ds=sidebyside

diff --git a/client b/client
index 2709015..829087e 100755
--- a/client
+++ b/client
@@ -59,42 +59,25 @@ def outbound(packet, saddr, daddr):
   check_outbound()
 
 class ResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self, req):
-    self._req = req
+  def __init__(self):
     self._ssd = SlipStreamDecoder(queue_inbound)
 
-  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', d=data)
-
+    try: self._ssd.inputdata(mime_translate(data))
+    except Exception as e: asyncfailure(e)
+  def connectionMade(self): pass
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost', d=data)
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
-      except Exception as e:
-        self._asyncfailure(e)
+      except Exception as e: asyncfailure(e)
     else:
-      self._asyncfailure(reason)
-
-  def _asyncfailure(self, reason):
-    global outstanding
-    outstanding += 1
-    req_err(self._req, reason)
+      asyncfailure(reason)
 
-def req_ok(req, resp):
-  resp.deliverBody(ResponseConsumer(req))
+def req_ok(resp):
+  resp.deliverBody(ResponseConsumer())
   req_fin()
 
-def req_err(req, err):
+def req_err(err):
   print(err, file=sys.stderr)
   reactor.callLater(c.http_retry, req_fin)
 
@@ -103,6 +86,11 @@ def req_fin(*args):
   outstanding -= 1
   check_outbound()
 
+def asyncfailure(reason):
+  global outstanding
+  outstanding += 1
+  req_err(reason)
+
 def check_outbound():
   global outstanding
 
@@ -116,6 +104,8 @@ def check_outbound():
                   moredata,
                   c.max_batch_up)
     
+    d = mime_translate(d)
+
     crlf = b'\r\n'
     lf   =   b'\n'
     mime = (b'--b'                                        + crlf +
@@ -128,7 +118,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)
 
@@ -150,11 +140,8 @@ def check_outbound():
                         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.addCallbacks((lambda resp: req_ok(req,resp)),
-                     (lambda resp: req_err(req,resp)))
+    req.addCallbacks(req_ok, req_err)
     outstanding += 1
 
 common_startup()