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'),
def __init__(self):
self._ssd = SlipStreamDecoder(queue_inbound)
def dataReceived(self, data):
- self._ssd.inputdata(mime_translate(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):
- self._ssd.flush()
+ try: self._ssd.flush()
+ except Exception as e: asyncfailure(e)
else:
- print(reason, file=sys.stderr)
+ asyncfailure(reason)
def req_ok(resp):
resp.deliverBody(ResponseConsumer())
+ req_fin()
def req_err(err):
print(err, file=sys.stderr)
+ reactor.callLater(c.http_retry, req_fin)
def req_fin(*args):
global outstanding
outstanding -= 1
+ 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
mime_translate(d) + crlf +
b'--b--' + crlf)
+ print('REQUESTING ', mime, file=sys.stderr)
+
hh = { 'User-Agent': ['hippotat'],
'Content-Type': ['multipart/form-data; boundary="b"'] }
req = agent.request(b'POST',
twisted.web.client.Headers(hh))
req.addTimeout(c.http_timeout, reactor)
req.addCallbacks(req_ok, req_err)
- req.addBoth(req_fin)
outstanding += 1
common_startup()
process_cfg()
start_client()
start_ipif(c.ipif_command, outbound)
+check_outbound()
common_run()
max_requests_outstanding = 4 # used by client
max_batch_up = 4000 # used by client
http_timeout = 30 # used by client
+http_retry = 5 # used by client
#[server] or [<client>] overrides
ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s