X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=829087e3936c8029e7f17d5f8e27fc56877848b1;hp=5d0f427d354714c37f1cd544ac54fd82f5d06ec0;hb=9aa11043fa621582edc95c11140c9904db99bc84;hpb=534f07dffbf813ba75cdeab63475a2ea81e7a0f2

diff --git a/client b/client
index 5d0f427..829087e 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):
@@ -59,6 +61,7 @@ def outbound(packet, saddr, daddr):
 class ResponseConsumer(twisted.internet.protocol.Protocol):
   def __init__(self):
     self._ssd = SlipStreamDecoder(queue_inbound)
+
   def dataReceived(self, data):
     try: self._ssd.inputdata(mime_translate(data))
     except Exception as e: asyncfailure(e)
@@ -101,32 +104,42 @@ 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                                    +   lf +
-            str(c.client)             .encode('ascii')  +   lf +
-            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)
     outstanding += 1