X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=f26d46b8eff30e177a11c379bd81100249d6ee1e;hp=39e04c56640e7eeac6a4c0ec01a0310a8f314bd1;hb=74934d63b06bf4fc045ac9aabac381cedfe9f10f;hpb=7b07f0b5fd215702dc58c53bd1cd7c63767f5710;ds=sidebyside diff --git a/client b/client index 39e04c5..f26d46b 100755 --- a/client +++ b/client @@ -2,97 +2,250 @@ from hippotat import * -client_cs = None - -def set_client(ci,cs,pw): - global client_cs - global password - assert(client_cs is None) - client_cs = cs - c.client = ci - c.max_outstanding = cfg.getint(cs, 'max_requests_outstanding') - c.target_outstanding = cfg.getint(cs, 'target_requests_outstanding') - password = pw - -def process_cfg(): - global url - global max_requests_outstanding - - process_cfg_common_always() - process_cfg_server() - - try: - c.url = cfg.get('server','url') - except NoOptionError: - process_cfg_saddrs() - sa = c.saddrs[0].url() - - process_cfg_clients(set_client) - - c.routes = cfg.get('virtual','routes') - c.max_queue_time = cfg.getint(client_cs, 'max_queue_time') - c.max_batch_up = cfg.getint(client_cs, 'max_batch_up') - - process_cfg_ipif(client_cs, - (('local', 'client'), - ('peer', 'server'), - ('rnets', 'routes'))) - -outstanding = 0 - -def start_client(): - global queue - global agent - queue = PacketQueue(c.max_queue_time) - agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout) - -def outbound(packet, saddr, daddr): - #print('OUT ', saddr, daddr, repr(packet)) - queue.append(packet) - check_outbound() - -def req_ok(data) - -def req_err(err): - print(err, >>sys.stderr) - outstanding-- - -def req_fin(*args): - -def check_outbound(): - while True: - if outstanding >= c.max_outstanding : break - if not queue.nonempty() && outstanding >= c.target_outstanding: break - - d = b'' - queue.process((lambda: len(d)), - (lambda s: d += s), - c.max_batch_up) - assert(len(d)) - - crlf = b'\r\n' - mime = (b'--b' + crlf + - b'Content-Disposition: form-data; name="m"' + crlf + - password + crlf + - c.client + crlf + - c.target_outstanding + crlf + - b'--b' + crlf + - b'Content-Disposition: form-data; name="d"' + crlf + - mime_translate(d) + crlf + - b'--b--' + crlf) - - hh = { 'User-Agent': ['hippotat'], - 'Content-Type': ['multipart/form-data; boundary="b"'] } - req = agent.request('POST', - c.url, - twisted.web.client.Headers(hh)) - req.addTimeout(c.http_timeout, - req.addCallbacks(req_ok, req_err) - req.addBoth(req_fin) - outstanding++ - -common_startup() -process_cfg() -start_client() -start_ipif(c.ipif_command, outbound) +import twisted.web +import twisted.web.client + +import io + +class GeneralResponseConsumer(twisted.internet.protocol.Protocol): + def __init__(self, cl, req, desc): + self._cl = cl + self._req = req + self._desc = desc + + def _log(self, dflag, msg, **kwargs): + self._cl.log(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, cl, req): + super().__init__(cl, req, 'RC') + ssddesc = '[%s] %s' % (id(req), self._desc) + self._ssd = SlipStreamDecoder(ssddesc, cl.queue_inbound) + self._log(DBG.HTTP_CTRL, '__init__') + self._success_reported = False + + def dataReceived(self, data): + self._log(DBG.HTTP, 'dataReceived', d=data) + try: + self._ssd.inputdata(data) + except Exception as e: + self._handleexception() + + 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._log(DBG.HTTP, 'ResponseDone') + self._ssd.flush() + self._cl.req_fin(self._req) + except Exception as e: + self._handleexception() + if not self._success_reported: + log.info(cl.desc + 'running OK', dflag=False) + self._success_reported = True + + def _handleexception(self): + self._latefailure(traceback.format_exc()) + + def _latefailure(self, reason): + self._log(DBG.HTTP_CTRL, '_latefailure ' + str(reason)) + self._cl.req_err(self._req, reason) + +class ErrorResponseConsumer(GeneralResponseConsumer): + def __init__(self, cl, req, resp): + super().__init__(cl, 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 dataReceived(self, data): + self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data)) + self._m += data + + 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) + self._cl.req_err(self._req, + "FAILED %d %s | %s" + % (self._resp.code, self._phrase, mbody)) + +class Client(): + def __init__(cl, c,ss,cs): + cl.c = c + cl.outstanding = { } + cl.desc = '[%s %s] ' % (ss,cs) + log.info(cl.desc + 'setting up', dflag=False) + + def log(cl, dflag, msg, **kwargs): + log_debug(dflag, cl.desc + msg, **kwargs) + + def log_outstanding(cl): + cl.log(DBG.CTRL_DUMP, 'OS %s' % cl.outstanding) + + def start(cl): + cl.queue = PacketQueue('up', cl.c.max_queue_time) + cl.agent = twisted.web.client.Agent( + reactor, connectTimeout = cl.c.http_timeout) + + def outbound(cl, packet, saddr, daddr): + #print('OUT ', saddr, daddr, repr(packet)) + cl.queue.append(packet) + cl.check_outbound() + + def req_ok(cl, req, resp): + cl.log(DBG.HTTP_CTRL, + 'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)), + idof=req) + if resp.code == 200: + rc = ResponseConsumer(cl, req) + else: + rc = ErrorResponseConsumer(cl, req, resp) + + resp.deliverBody(rc) + # now rc is responsible for calling req_fin + + def req_err(cl, req, err): + # called when the Deferred fails, or (if it completes), + # later, by ResponsConsumer or ErrorResponsConsumer + try: + cl.log(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(cl.outstanding[req], int): + raise RuntimeError('[%#x] previously %s' % + (id(req), cl.outstanding[req])) + cl.outstanding[req] = err + cl.log_outstanding() + reactor.callLater(cl.c.http_retry, partial(cl.req_fin, req)) + except Exception as e: + crash(traceback.format_exc() + '\n----- handling -----\n' + err) + + def req_fin(cl, req): + del cl.outstanding[req] + cl.log(DBG.HTTP_CTRL, 'req_fin OS=%d' % len(cl.outstanding), idof=req) + cl.check_outbound() + + def check_outbound(cl): + while True: + if len(cl.outstanding) >= cl.c.max_outstanding: + break + + if (not cl.queue.nonempty() and + len(cl.outstanding) >= cl.c.target_requests_outstanding): + break + + d = b'' + def moredata(s): nonlocal d; d += s + cl.queue.process((lambda: len(d)), + moredata, + cl.c.max_batch_up) + + d = mime_translate(d) + + crlf = b'\r\n' + 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(cl.c.client) .encode('ascii') + crlf + + cl.c.password + crlf + + str(cl.c.target_requests_outstanding) + .encode('ascii') + crlf + + str(cl.c.http_timeout) .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/