X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=64025919900694a2955e97f298c8477cc62176af;hp=c9682bd944e135b4a57f0bdb8c375f5bdf2188fa;hb=3a7aaa41178a5e0aed6c3214414a8f00e26e7177;hpb=00192d6acf47a29fcedba761125ebd9ccfb84dba

diff --git a/client b/client
index c9682bd..6402591 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):
@@ -57,24 +59,45 @@ 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
+    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')
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
-      except Exception as e: asyncfailure(e)
+      except Exception as e:
+        self._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(self._req, reason)
+
+def req_ok(req, resp):
+  rc = ResponseConsumer(req)
+  resp.deliverBody(rc)
   req_fin()
 
-def req_err(err):
+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, req_fin)
 
@@ -86,7 +109,7 @@ def req_fin(*args):
 def asyncfailure(reason):
   global outstanding
   outstanding += 1
-  req_err(reason)
+  req_err(None, reason)
 
 def check_outbound():
   global outstanding
@@ -101,34 +124,45 @@ def check_outbound():
                   moredata,
                   c.max_batch_up)
     
+    d = mime_translate(d)
+
     crlf = b'\r\n'
     lf   =   b'\n'
-    mime = (b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="m"' + crlf + crlf +
-            password                                    + crlf +
-            str(c.client)             .encode('ascii')  + crlf +
-            str(c.target_outstanding) .encode('ascii')  + crlf +
+    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-Disposition: form-data; name="d"' + crlf + crlf +
-            mime_translate(d)                           + 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)
+            b'--b--'                                      + crlf)
 
-    df = open('data.dump.dbg', mode='wb')
-    df.write(mime)
-    df.close()
+    #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)
     req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks(req_ok, req_err)
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback((lambda err: req_err(req, err)))
     outstanding += 1
 
 common_startup()