import syslog
-import traceback
-
clients = { }
#---------- "router" ----------
if dclient is not None:
lt('client')
dclient.queue_outbound(packet)
- elif daddr == c.server or daddr not in c.network:
+ elif daddr == c.vaddr or daddr not in c.vnetwork:
lt('inbound')
queue_inbound(packet)
- elif daddr == relay:
+ elif daddr == c.relay:
lt('discard relay')
log_discard(packet, iface, saddr, daddr, 'relay')
else:
#---------- client ----------
class Client():
- def __init__(self, ip, cs, pw):
+ def __init__(self, ip, cc):
# instance data members
self._ip = ip
- self._cs = cs
- self.pw = pw
+ self.cc = cc
self._rq = collections.deque() # requests
- # self._pq = PacketQueue(...)
- # plus from config:
- # .max_batch_down
- # .max_queue_time
- # .max_request_time
- # .target_requests_outstanding
-
- if ip not in c.network:
- raise ValueError('client %s not in network' % ip)
-
- for k in ('max_batch_down','max_queue_time','max_request_time',
- 'target_requests_outstanding'):
- req = cfg.getint(cs, k)
- limit = cfg.getint('limits',k)
- self.__dict__[k] = min(req, limit)
+ self._pq = PacketQueue(str(ip), self.cc.max_queue_time)
- self._pq = PacketQueue(str(ip), self.max_queue_time)
+ if ip not in c.vnetwork:
+ raise ValueError('client %s not in vnetwork' % ip)
if ip in clients:
raise ValueError('multiple client cfg sections for %s' % ip)
self._pq.append(packet)
self._check_outbound()
+ def _req_fin(self, dummy, request, cl):
+ self._log(DBG.HTTP_CTRL, '_req_fin ' + repr(dummy), idof=request)
+ try: cl.cancel()
+ except twisted.internet.error.AlreadyCalled: pass
+
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)
+ cl = reactor.callLater(self.cc.http_timeout, self._req_cancel, request)
+ nf = request.notifyFinish()
+ nf.addErrback(self._req_error, request)
+ nf.addCallback(self._req_fin, request, cl)
self._rq.append(request)
self._check_outbound()
+ def _req_write(self, req, d):
+ self._log(DBG.HTTP, 'req_write ', idof=req, d=d)
+ req.write(d)
+
def _check_outbound(self):
log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
self._log(DBG.HTTP_CTRL, 'CHKO processing', idof=request)
# request, and also some non-expired packets
self._pq.process((lambda: request.sentLength),
- request.write,
- self.max_batch_down)
+ (lambda d: self._req_write(request, d)),
+ self.cc.max_batch_down)
assert(request.sentLength)
self._rq.popleft()
self._log(DBG.HTTP, 'complete', idof=request)
# round again, looking for more to do
- while len(self._rq) > self.target_requests_outstanding:
+ while len(self._rq) > self.cc.target_requests_outstanding:
request = self._rq.popleft()
self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
request.finish()
# find client, update config, etc.
metadata = request.args[b'm'][0]
metadata = metadata.split(b'\r\n')
- (ci_s, pw, tro) = metadata[0:3]
- desca['m[0,2]'] = [ci_s, tro]
+ (ci_s, pw, tro, cto) = metadata[0:4]
+ desca['m[0,2:3]'] = [ci_s, tro, cto]
ci_s = ci_s.decode('utf-8')
- tro = int(tro)
- desca['tro']= tro
+ tro = int(tro); desca['tro']= tro
+ cto = int(cto); desca['cto']= cto
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
- if pw != cl.pw: raise ValueError('bad password')
+ if pw != cl.cc.password: raise ValueError('bad password')
desca['pwok']=True
- if tro != cl.target_requests_outstanding:
- raise ValueError('tro must be %d' % cl.target_requests_outstanding)
+ if tro != cl.cc.target_requests_outstanding:
+ raise ValueError('tro must be %d' % cl.cc.target_requests_outstanding)
+
+ if cto < cl.cc.http_timeout:
+ raise ValueError('cto must be >= %d' % cl.cc.http_timeout)
try:
d = request.args[b'd'][0]
desca['d'] = d
- except KeyError: d = b''
+ desca['dlen'] = len(d)
+ except KeyError:
+ d = b''
+ desca['dlen'] = None
+
+ log_http(desca, 'processing', idof=id(request), d=d)
+
+ d = mime_translate(d)
cl.process_arriving_data(d)
cl.new_request(request)
-def log_http(desca, msg):
+def log_http(desca, msg, **kwargs):
try:
- d = desca['d']
+ kwargs['d'] = desca['d']
del desca['d']
except KeyError:
- d = None
- log_debug(DBG.HTTP, msg + repr(desca), d=d)
+ pass
+ log_debug(DBG.HTTP, msg + repr(desca), **kwargs)
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
try: process_request(request, desca)
except Exception as e:
emsg = traceback.format_exc()
- log_http(desca, 'EXCEPTION ' + emsg)
+ log_http(desca, 'RETURNING EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
return (emsg + ' # ' + repr(desca) + '\r\n').encode('utf-8')
- log_http(desca, '... [%s]' % id(request))
+ log_debug(DBG.HTTP_CTRL, '...', idof=id(request))
return NOT_DONE_YET
def render_GET(self, request):
#---------- config and setup ----------
-def process_cfg():
- process_cfg_common_always()
- process_cfg_server()
- process_cfg_network()
+def process_cfg(putative_servers, putative_clients):
+ global c
+ c = ConfigResults()
+ c.server = cfg.get('SERVER','server')
+
+ cfg_process_common(c, c.server)
+ cfg_process_saddrs(c, c.server)
+ cfg_process_vnetwork(c, c.server)
+ cfg_process_vaddr(c, c.server)
+
+ for (ci,cs) in putative_clients.items():
+ cc = ConfigResults()
+ sections = cfg_process_client_common(cc,c.server,cs,ci)
+ if not sections: continue
+ cfg_process_client_limited(cc,c.server,sections, 'max_batch_down')
+ cfg_process_client_limited(cc,c.server,sections, 'max_queue_time')
+ Client(ci, cc)
try:
- c.relay = cfg.get('virtual','relay')
+ c.vrelay = cfg.get(c.server, 'vrelay')
except NoOptionError:
- for search in c.network.hosts():
- if search == c.server: continue
- c.relay = search
+ for search in c.vnetwork.hosts():
+ if search == c.vaddr: continue
+ c.vrelay = search
break
- process_cfg_saddrs()
- process_cfg_clients(Client)
-
- process_cfg_ipif('server',
- (('local','server'),
- ('peer', 'relay'),
- ('rnets','network')))
+ cfg_process_ipif(c,
+ [c.server, 'DEFAULT'],
+ (('local','vaddr'),
+ ('peer', 'vrelay'),
+ ('rnets','vnetwork')))
-common_startup()
-process_cfg()
-start_ipif(c.ipif_command, route)
+common_startup(process_cfg)
+start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))
start_http()
common_run()
~ian / hippotat.git / blobdiff