from hippotat import *
-import sys
import os
import twisted.internet
#---------- "router" ----------
def route(packet, saddr, daddr):
- print('TRACE ', saddr, daddr, packet)
- try: client = clients[daddr]
+ def lt(dest):
+ log_data(DBG.ROUTE, packet, 'route: %s -> %s: %s' % (saddr,daddr,dest))
+ try: dclient = clients[daddr]
except KeyError: dclient = None
if dclient is not None:
+ lt('client')
dclient.queue_outbound(packet)
elif daddr == c.server or daddr not in c.network:
- print('TRACE INBOUND ', saddr, daddr, packet)
+ lt('inbound')
queue_inbound(packet)
elif daddr == relay:
+ lt('discard relay')
log_discard(packet, saddr, daddr, 'relay')
else:
- log_discard(packet, saddr, daddr, 'no client')
-
-def log_discard(packet, saddr, daddr, why):
- print('DROP ', saddr, daddr, why)
-# syslog.syslog(syslog.LOG_DEBUG,
-# 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
+ lt('discard no-client')
+ log_discard(packet, saddr, daddr, 'no-client')
#---------- client ----------
raise ValueError('multiple client cfg sections for %s' % ip)
clients[ip] = self
+ log_debug('DBG.INIT', 'new client %s' % self)
+
def process_arriving_data(self, d):
+ log_data(DBG.FLOW, d, 'client req data: %s' % saddr=self._ip)
for packet in slip.decode(d):
(saddr, daddr) = packet_addrs(packet)
if saddr != self._ip:
route(packet, saddr, daddr)
def _req_cancel(self, request):
+ log_httpreq(DBG.HTTPCTRL, request, 'cancel')
request.finish()
def _req_error(self, err, request):
+ log_httpreq(DBG.HTTPCTRL, request, 'error %s' % err)
self._req_cancel(request)
def queue_outbound(self, packet):
self._pq.append(packet)
self._check_outbound()
- def http_request(self, request):
+ def new_request(self, request):
request.setHeader('Content-Type','application/octet-stream')
reactor.callLater(self.max_request_time, self._req_cancel, request)
request.notifyFinish().addErrback(self._req_error, request)
self._check_outbound()
def _check_outbound(self):
+ log_httpreq(DBG.HTTPCTRL, None, 'CHKO')
while True:
try: request = self._rq[0]
except IndexError: request = None
if request and request.finished:
+ log_httpreq(DBG.HTTP_CTRL, request, 'CHKO request finished, discard')
self._rq.popleft()
continue
if not self._pq.nonempty():
# no packets, oh well
- continue
+ log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no packets, OUT-DONE')
+ break
if request is None:
# no request
+ log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no request, OUT-DONE')
break
+ log_httpreq(DBG.HTTP_CTRL, request, 'CHKO processing')
# request, and also some non-expired packets
- while True:
- packet = self.pq.popleft()
- if packet is None: break
-
- encoded = slip.encode(packet)
-
- if request.sentLength > 0:
- if (request.sentLength + len(slip.delimiter)
- + len(encoded) > self.max_batch_down):
- break
- request.write(slip.delimiter)
-
- request.write(encoded)
- self._pq.popLeft()
+ self._pq.process((lambda: request.sentLength),
+ request.write,
+ self.max_batch_down)
assert(request.sentLength)
- self._rq.popLeft()
+ self._rq.popleft()
request.finish()
+ log_httpreq(DBG.HTTP, request, 'complete')
# round again, looking for more to do
while len(self._rq) > self.target_requests_outstanding:
request = self._rq.popleft()
+ log_httpreq(DBG.HTTP, request, 'CHKO above target, returning empty')
request.finish()
+def process_request(request, desca):
+ # find client, update config, etc.
+ metadata = request.args['m']
+ metadata = metadata.split(b'\n')
+ (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
+ desca['m'] = [ci_s, tro]
+ ci = ipaddr(ci_s)
+ desca['ci'] = ci
+ cl = clients[ci]
+ if pw != cl.pw: raise ValueError('bad password')
+ desca['pwok'=True]
+
+ if tro != cl.target_requests_outstanding:
+ raise ValueError('tro must be %d' % cl.target_requests_outstanding)
+
+ try:
+ d = request.args['d']
+ desca['d'] = d
+ except KeyError: d = ''
+
+ cl.process_arriving_data(d)
+ cl.new_request(request)
+
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
def render_POST(self, request):
- # find client, update config, etc.
- ci = ipaddr(request.args['i'])
- c = clients[ci]
- pw = request.args['pw']
- if pw != c.pw: raise ValueError('bad password')
-
- # update config
-
- xxx check sanity, do not update
- for r, w in (('mbd', 'max_batch_down'),
- ('mqt', 'max_queue_time'),
- ('mrt', 'max_request_time'),
- ('tro', 'target_requests_outstanding')):
- try: v = request.args[r]
- except KeyError: continue
- v = int(v)
- c.__dict__[w] = v
-
- try: d = request.args['d']
- except KeyError: d = ''
-
- c.process_arriving_data(d)
- c.new_request(request)
+ desca = {'d': None}
+ try: process_request(request, desca)
+ except Exception as e:
+ emsg = str(e).encode('utf-8')
+ log_http(desca, 'EXCEPTION ' + emsg)
+ request.setHeader('Content-Type','text/plain; charset="utf-8"')
+ request.setResponseCode(400)
+ return emsg
+ log_http(desca, '... [%s]' % id(request))
+ return NOT_DONE_YET
def render_GET(self, request):
+ log_debug(DBG.HTTP, 'GET request')
return b'<html><body>hippotat</body></html>'
def start_http():
for sa in c.saddrs:
ep = sa.make_endpoint()
crash_on_defer(ep.listen(site))
+ log_debug(DBG.INIT, 'listening on %s' % sa)
#---------- config and setup ----------
('peer', 'relay'),
('rnets','network')))
-common_startup(defcfg)
+common_startup()
process_cfg()
start_ipif(c.ipif_command, route)
start_http()
~ian / hippotat.git / blobdiff