from hippotat import *
+import twisted.web
+import twisted.web.client
+
client_cs = None
def set_client(ci,cs,pw):
c.url = cfg.get('server','url')
except NoOptionError:
process_cfg_saddrs()
- sa = c.saddrs[0].url()
+ 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'),
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):
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, >>sys.stderr)
+ print(err, file=sys.stderr)
+ reactor.callLater(c.http_retry, req_fin)
+
+def req_fin(*args):
+ global outstanding
+ outstanding -= 1
+ check_outbound()
-def req_fin(*args):
- outstanding--
+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() && outstanding >= c.target_outstanding: break
+ 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)),
- (lambda s: d += s),
+ moredata,
c.max_batch_up)
- assert(len(d))
crlf = b'\r\n'
+ lf = b'\n'
mime = (b'--b' + crlf +
- b'Content-Disposition: form-data; name="m"' + crlf +
+ b'Content-Disposition: form-data; name="m"' + crlf + crlf +
password + crlf +
- c.client + crlf +
- c.target_outstanding + 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'Content-Disposition: form-data; name="d"' + crlf + crlf +
+ mime_translate(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"'] }
req = agent.request(b'POST',
c.url,
twisted.web.client.Headers(hh))
- req.addTimeout(c.http_timeout,
+ req.addTimeout(c.http_timeout, reactor)
req.addCallbacks(req_ok, req_err)
- req.addBoth(req_fin)
- outstanding++
+ outstanding += 1
common_startup()
process_cfg()
start_client()
start_ipif(c.ipif_command, outbound)
+check_outbound()
common_run()