X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=e6ea8edfb1b81442e14a7f1adcf21a3269f7c9cc;hp=931cb1f4c5fdcdd983407a2d9d7835d4e7bf6baf;hb=e8ed0029ef6388f2c9af9467f3958bdd145b2f9b;hpb=4edf77a3f6ad7ec05ad0809fc4c0408e6ca6405c diff --git a/client b/client index 931cb1f..e6ea8ed 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): @@ -43,12 +45,15 @@ def process_cfg(): ('peer', 'server'), ('rnets', 'routes'))) -outstanding = 0 +outstanding = { } + +def log_outstanding(): + log_debug(DBG.CTRL_DUMP, 'OS %s' % outstanding) def start_client(): global queue global agent - queue = PacketQueue(c.max_queue_time) + queue = PacketQueue('up', c.max_queue_time) agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout) def outbound(packet, saddr, daddr): @@ -56,44 +61,114 @@ def outbound(packet, saddr, daddr): queue.append(packet) check_outbound() -class ResponseConsumer(twisted.internet.protocol.Protocol): - def __init__(self): - self._ssd = SlipStreamDecoder(queue_inbound) +class GeneralResponseConsumer(twisted.internet.protocol.Protocol): + def __init__(self, req, desc): + self._req = req + self._desc = desc + + def _log(self, dflag, msg, **kwargs): + log_debug(dflag, '%s: %s' % (self._desc, msg), idof=self._req, **kwargs) + + def connectionMade(self): + self._log(DBG.HTTP_CTRL, 'connectionMade') + +class ResponseConsumer(GeneralResponseConsumer): + def __init__(self, req): + super().__init__(req, 'RC') + ssddesc = '[%s] %s' % (id(req), self._desc) + self._ssd = SlipStreamDecoder(ssddesc, queue_inbound) + self._log(DBG.HTTP_CTRL, '__init__') + def dataReceived(self, data): - try: self._ssd.inputdata(mime_translate(data)) - except Exception as e: asyncfailure(e) - def connectionMade(self): pass - def connectionLost(self, reason): - if isinstance(reason, twisted.internet.error.ConnectionDone): - try: self._ssd.flush() - except Exception as e: asyncfailure(e) - else: - asyncfailure(reason) + self._log(DBG.HTTP_CTRL, 'dataReceived', d=data) + try: + self._ssd.inputdata(data) + except Exception as e: + self._handleexception() -def req_ok(resp): - resp.deliverBody(ResponseConsumer()) - req_fin() + def connectionLost(self, reason): + self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason)) + if not reason.check(twisted.web.client.ResponseDone): + self.latefailure() + return + try: + self._ssd.flush() + req_fin(req) + except Exception as e: + self._handleexception() + + def _handleexception(self): + self._latefailure(traceback.format_exc()) + + def _latefailure(self, reason): + self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason)) + req_err(self._req, reason) + +class ErrorResponseConsumer(twisted.internet.protocol.Protocol): + def __init__(self, req, resp): + super().__init__(req, 'ERROR-RC') + self._resp = resp + self._m = b'' + try: + self._phrase = resp.phrase.decode('utf-8') + except Exception: + self._phrase = repr(resp.phrase) + self._log(DBG.HTTP_CTRL, '__init__ %d %s' % (resp.code, self._phrase)) -def req_err(err): - print(err, file=sys.stderr) - reactor.callLater(c.http_retry, req_fin) + def dataReceived(self, data): + self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data)) + self._m += data -def req_fin(*args): - global outstanding - outstanding -= 1 + def connectionLost(self, reason): + try: + mbody = self._m.decode('utf-8') + except Exception: + mbody = repr(self._m) + if not reason.check(twisted.web.client.ResponseDone): + mbody += ' || ' + str(reason) + req_err(self._req, + "FAILED %d %s | %s" + % (self._resp.code, self._phrase, mbody)) + +def req_ok(req, resp): + log_debug(DBG.HTTP_CTRL, + 'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)), + idof=req) + if resp.code == 200: + rc = ResponseConsumer(req) + else: + rc = ErrorResponseConsumer(req, resp) + + resp.deliverBody(rc) + # now rc is responsible for calling req_fin + +def req_err(req, err): + # called when the Deferred fails, or (if it completes), + # later, by ResponsConsumer or ErrorResponsConsumer + try: + log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req) + if isinstance(err, twisted.python.failure.Failure): + err = err.getTraceback() + print('[%#x] %s' % (id(req), err), file=sys.stderr) + if not isinstance(outstanding[req], int): + raise RuntimeError('[%#x] previously %s' % (id(req), outstanding[req])) + outstanding[req] = err + log_outstanding() + reactor.callLater(c.http_retry, (lambda: req_fin(req))) + except Exception as e: + crash(traceback.format_exc() + '\n----- handling -----\n' + err) + +def req_fin(req): + del outstanding[req] + log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % len(outstanding), idof=req) check_outbound() -def asyncfailure(reason): - global outstanding - outstanding += 1 - req_err(reason) - def check_outbound(): global outstanding while True: - if outstanding >= c.max_outstanding : break - if not queue.nonempty() and outstanding >= c.target_outstanding: break + if len(outstanding) >= c.max_outstanding : break + if not queue.nonempty() and len(outstanding) >= c.target_outstanding: break d = b'' def moredata(s): nonlocal d; d += s @@ -101,27 +176,50 @@ def check_outbound(): moredata, c.max_batch_up) + d = mime_translate(d) + crlf = b'\r\n' - mime = (b'--b' + crlf + - b'Content-Disposition: form-data; name="m"' + crlf + - password + crlf + - str(c.client) .encode('ascii') + crlf + - str(c.target_outstanding) .encode('ascii') + crlf + - b'--b' + crlf + - b'Content-Disposition: form-data; name="d"' + crlf + - mime_translate(d) + crlf + - b'--b--' + crlf) - - print('REQUESTING ', mime, file=sys.stderr) + lf = b'\n' + 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-Type: application/octet-stream' + crlf + + b'Content-Disposition: form-data; name="d"' + crlf + crlf + + d + crlf + ) if len(d) else b'') + + b'--b--' + crlf) + + #df = open('data.dump.dbg', mode='wb') + #df.write(mime) + #df.close() + # POST -use -c 'multipart/form-data; boundary="b"' http://localhost:8099/