chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip, towards target
[hippotat.git]
/
client
diff --git
a/client
b/client
index 922242d3bca8fe1cb447a19ca73698f5c70057d4..e4e5eae7a01df3e180be74d170b6404f37a78f6f 100755
(executable)
--- a/
client
+++ b/
client
@@
-5,6
+5,8
@@
from hippotat import *
import twisted.web
import twisted.web.client
import twisted.web
import twisted.web.client
+import io
+
client_cs = None
def set_client(ci,cs,pw):
client_cs = None
def set_client(ci,cs,pw):
@@
-57,21
+59,37
@@
def outbound(packet, saddr, daddr):
check_outbound()
class ResponseConsumer(twisted.internet.protocol.Protocol):
check_outbound()
class ResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self):
+ def __init__(self, req):
+ self._req = req
self._ssd = SlipStreamDecoder(queue_inbound)
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 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):
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:
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):
req_fin()
def req_err(err):
@@
-101,19
+119,23
@@
def check_outbound():
moredata,
c.max_batch_up)
moredata,
c.max_batch_up)
+ d = mime_translate(d)
+
crlf = b'\r\n'
lf = b'\n'
crlf = b'\r\n'
lf = b'\n'
- mime = (b'--b' + 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 +
+ 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'') +
) if len(d) else b'') +
- b'--b--' + crlf)
+ b'--b--'
+ crlf)
#df = open('data.dump.dbg', mode='wb')
#df.write(mime)
#df = open('data.dump.dbg', mode='wb')
#df.write(mime)
@@
-123,12
+145,19
@@
def check_outbound():
log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
hh = { 'User-Agent': ['hippotat'],
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,
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.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()
outstanding += 1
common_startup()