import io
-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()
- c.url = 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')
- c.http_timeout = cfg.getint(client_cs, 'http_timeout')
- c.http_retry = cfg.getint(client_cs, 'http_retry')
-
- process_cfg_ipif(client_cs,
- (('local', 'client'),
- ('peer', 'server'),
- ('rnets', 'routes')))
-
-outstanding = 0
-
-def start_client():
- global queue
- global agent
- queue = PacketQueue('up', 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()
-
-class ResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self, req):
+class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
+ def __init__(self, cl, req, desc):
+ self._cl = cl
self._req = req
- self._ssd = SlipStreamDecoder('req %s' % id(req), queue_inbound)
- self._log(DBG.HTTP_CTRL, '__init__')
+ self._desc = desc
def _log(self, dflag, msg, **kwargs):
- log_debug(dflag, 'RC ' + msg, idof=self._req, **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__')
def dataReceived(self, data):
- self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+ self._log(DBG.HTTP, 'dataReceived', d=data)
try:
- self._ssd.inputdata(mime_translate(data))
+ self._ssd.inputdata(data)
except Exception as e:
self._handleexception()
- def connectionMade(self):
- self._log(DBG.HTTP_CTRL, 'connectionMade')
-
def connectionLost(self, reason):
self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
if not reason.check(twisted.web.client.ResponseDone):
- self._asyncfailure(reason)
+ self.latefailure()
return
try:
+ self._log(DBG.HTTP, 'ResponseDone')
self._ssd.flush()
+ self.cl.req_fin(self._req)
except Exception as e:
self._handleexception()
def _handleexception(self):
- self._asyncfailure(traceback.format_exc())
+ self._latefailure(traceback.format_exc())
- def _asyncfailure(self, reason):
- self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
- req_err(self._req, reason)
+ def _latefailure(self, reason):
+ self._log(DBG.HTTP_CTRL, '_latefailure ' + str(reason))
+ self.cl.req_err(self._req, reason)
class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
- def __init__(self, req, resp):
- self._req = req
+ 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 _log(self, dflag, msg, **kwargs):
- log_debug(dflag,'ERROR-RC '+msg, idof=self._req, **kwargs)
-
- def connectionMade(self):
- self._m = b''
-
def dataReceived(self, data):
self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data))
self._m += data
mbody = repr(self._m)
if not reason.check(twisted.web.client.ResponseDone):
mbody += ' || ' + str(reason)
- req_err(self._req,
+ self.cl.req_err(self._req,
"FAILED %d %s | %s"
% (self._resp.code, self._phrase, mbody))
-def req_ok(req, resp):
- log_debug(DBG.HTTP_CTRL,
+class Client():
+ def __init__(cl, c,ss,cs):
+ cl.c = c
+ cl.outstanding = { }
+ cl.desc = '[%s %s] ' % (ss,cs)
+
+ def log(cl, dflag, msg, **kwargs):
+ log_debug(dflag, cl.desc + msg, **kwargs)
+
+ def log_outstanding(cl):
+ cl.log(DBG.CTRL_DUMP, 'OS %s' % 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(req)
- else:
- rc = ErrorResponseConsumer(req, resp)
-
- resp.deliverBody(rc)
-
-def req_err(req, err):
- log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
- if isinstance(err, twisted.python.failure.Failure):
- err = err.getTraceback()
- print(err, file=sys.stderr)
- reactor.callLater(c.http_retry, (lambda: req_fin(req)))
-
-def req_fin(req):
- global outstanding
- outstanding -= 1
- log_debug(DBG.HTTP_CTRL, 'req_fin OS=%d' % outstanding, idof=req)
- check_outbound()
-
-def check_outbound():
- global outstanding
-
- while True:
- if outstanding >= c.max_outstanding : break
- if not queue.nonempty() and outstanding >= c.target_outstanding: break
-
- d = b''
- def moredata(s): nonlocal d; d += s
- queue.process((lambda: len(d)),
- moredata,
- 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(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/ <data.dump.dbg
-
- log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
-
- hh = { 'User-Agent': ['hippotat'],
- '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),
- producer)
-
- outstanding += 1
- log_debug(DBG.HTTP_CTRL, 'request OS=%d' % outstanding, idof=req, d=d)
- req.addTimeout(c.http_timeout, reactor)
- req.addCallback((lambda resp: req_ok(req, resp)))
- req.addErrback((lambda err: req_err(req, err)))
-
-common_startup()
-process_cfg()
-start_client()
-start_ipif(c.ipif_command, outbound)
-check_outbound()
+ 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(outstanding[req], int):
+ raise RuntimeError('[%#x] previously %s' % (id(req), 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(outstanding), idof=req)
+ cl.check_outbound()
+
+ def check_outbound(cl):
+ while True:
+ if len(cl.outstanding) >= cl.c.max_outstanding:
+ break
+
+ if (not queue.nonempty() and
+ len(cl.outstanding) >= cl.c.target_outstanding):
+ break
+
+ d = b''
+ def moredata(s): nonlocal d; d += s
+ 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_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/ <data.dump.dbg
+
+ cl.log(DBG.HTTP_FULL, 'requesting: ' + str(mime))
+
+ hh = { 'User-Agent': ['hippotat'],
+ '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',
+ cl.c.url,
+ twisted.web.client.Headers(hh),
+ producer)
+
+ cl.outstanding[req] = len(d)
+ cl.log(DBG.HTTP_CTRL,
+ 'request OS=%d' % len(cl.outstanding),
+ idof=req, d=d)
+ req.addTimeout(cl.c.http_timeout, reactor)
+ req.addCallback(partial(cl.req_ok, req))
+ req.addErrback(partial(cl.req_err, req))
+
+ cl.log_outstanding()
+
+clients = [ ]
+
+def process_cfg(putative_servers, putative_clients):
+ global clients
+
+ for ss in putative_servers.values():
+ for (ci,cs) in putative_clients.items():
+ c = ConfigResults()
+
+ sections = cfg_process_client_common(c,ss,cs,ci)
+ if not sections: continue
+
+ def srch(getter,key): return cfg_search(getter,key,sections)
+
+ c.http_timeout += srch(cfg.getint, 'http_timeout_grace')
+ c.max_outstanding = srch(cfg.getint, 'max_requests_outstanding')
+ c.max_batch_up = srch(cfg.getint, 'max_batch_up')
+ c.http_retry = srch(cfg.getint, 'http_retry')
+ c.vroutes = srch(cfg.get, 'vroutes')
+
+ try: c.url = srch(cfg.get,'url')
+ except NoOptionError:
+ cfg_process_saddrs(c, ss)
+ c.url = c.saddrs[0].url()
+
+ c.client = ci
+
+ cfg_process_vaddr(c,ss)
+
+ cfg_process_ipif(c,
+ sections,
+ (('local','client'),
+ ('peer', 'vaddr'),
+ ('rnets','vroutes')))
+
+ clients.append(Client(c,ss,cs))
+
+common_startup(process_cfg)
+
+for cl in clients:
+ cl.start()
+ start_ipif(cl.c.ipif_command, cl.outbound)
+ cl.check_outbound()
+
common_run()