X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=server;h=b746bc26e543433e78e0f08ef0065d99a2b9ac19;hp=29321e9435bab3f8deff72824246a0ff849f24de;hb=1672ded0fa4c22a2c13cbe9f80baaf3f939bd5fa;hpb=37ab4cdc9ad97c3d1b2e85483bd0d9e8ed1d78c2 diff --git a/server b/server index 29321e9..b746bc2 100755 --- a/server +++ b/server @@ -6,62 +6,15 @@ import sys import os import twisted.internet -import twisted.internet.endpoints from twisted.web.server import NOT_DONE_YET -from twisted.logger import LogLevel #import twisted.web.server import Site #from twisted.web.resource import Resource -from optparse import OptionParser -from configparser import ConfigParser -from configparser import NoOptionError - -import collections - import syslog clients = { } -defcfg = ''' -[DEFAULT] -max_batch_down = 65536 -max_queue_time = 10 -max_request_time = 54 -target_requests_outstanding = 3 - -[virtual] -mtu = 1500 -# network -# [host] -# [relay] - -[server] -ipif = userv root ipif %(host)s,%(relay)s,%(mtu)s,slip %(network)s -addrs = 127.0.0.1 ::1 -port = 8099 - -[limits] -max_batch_down = 262144 -max_queue_time = 121 -max_request_time = 121 -target_requests_outstanding = 10 -''' - -#---------- error handling ---------- - -def crash(err): - print('CRASH ', err, file=sys.stderr) - try: reactor.stop() - except twisted.internet.error.ReactorNotRunning: pass - -def crash_on_defer(defer): - defer.addErrback(lambda err: crash(err)) - -def crash_on_critical(event): - if event.get('log_level') >= LogLevel.critical: - crash(twisted.logger.formatEvent(event)) - #---------- "router" ---------- def route(packet, saddr, daddr): @@ -70,9 +23,7 @@ def route(packet, saddr, daddr): except KeyError: dclient = None if dclient is not None: dclient.queue_outbound(packet) - elif saddr.is_link_local or daddr.is_link_local: - log_discard(packet, saddr, daddr, 'link-local') - elif daddr == host or daddr not in network: + elif daddr == c.server or daddr not in c.network: print('TRACE INBOUND ', saddr, daddr, packet) queue_inbound(packet) elif daddr == relay: @@ -88,11 +39,11 @@ def log_discard(packet, saddr, daddr, why): #---------- client ---------- class Client(): - def __init__(self, ip, cs): + def __init__(self, ip, cs, pw): # instance data members self._ip = ip self._cs = cs - self.pw = cfg.get(cs, 'password') + self.pw = pw self._rq = collections.deque() # requests # self._pq = PacketQueue(...) # plus from config: @@ -100,101 +51,105 @@ class Client(): # .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(self.max_queue_time) - def process_arriving_data(self, d): - for packet in slip.decode(d): - (saddr, daddr) = packet_addrs(packet) - if saddr != self._ip: - raise ValueError('wrong source address %s' % saddr) - route(packet, saddr, daddr) + self._pq = PacketQueue(self.max_queue_time) - def _req_cancel(self, request): - request.finish() + if ip in clients: + raise ValueError('multiple client cfg sections for %s' % ip) + clients[ip] = self + + def process_arriving_data(self, d): + for packet in slip.decode(d): + (saddr, daddr) = packet_addrs(packet) + if saddr != self._ip: + raise ValueError('wrong source address %s' % saddr) + route(packet, saddr, daddr) + + def _req_cancel(self, request): + request.finish() + + def _req_error(self, err, request): + self._req_cancel(request) + + def queue_outbound(self, packet): + self._pq.append(packet) + self._check_outbound() + + def http_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._rq.append(request) + self._check_outbound() + + def _check_outbound(self): + while True: + try: request = self._rq[0] + except IndexError: request = None + if request and request.finished: + self._rq.popleft() + continue + + if not self._pq.nonempty(): + # no packets, oh well + continue + + if request is None: + # no request + break + + # request, and also some non-expired packets + while True: + packet = self.pq.popleft() + if packet is None: break - def _req_error(self, err, request): - self._req_cancel(request) + 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) - def queue_outbound(self, packet): - self._pq.append(packet) + request.write(encoded) + self._pq.popLeft() - def http_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._rq.append(request) - self._check_outbound() + assert(request.sentLength) + self._rq.popLeft() + request.finish() + # round again, looking for more to do - def _check_outbound(self): - while True: - try: request = self._rq[0] - except IndexError: request = None - if request and request.finished: - self._rq.popleft() - continue - - if not self._pq.nonempty(): - # no packets, oh well - continue - - if request is None: - # no request - break - - # 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() - - assert(request.sentLength) - self._rq.popLeft() - request.finish() - # round again, looking for more to do - - while len(self._rq) > self.target_requests_outstanding: - request = self._rq.popleft() - request.finish() + while len(self._rq) > self.target_requests_outstanding: + request = self._rq.popleft() + request.finish() 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 - 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 + metadata = request.args['m'] + (ci_s, pw, tro) = metadata.split(b'\n')[0:3] + ci = ipaddr(ci_s]) + cl = clients[ci] + if pw != cl.pw: raise ValueError('bad password') + + if pw != cl.target_requests_outstanding: + raise ... try: d = request.args['d'] except KeyError: d = '' - c.process_arriving_data(d) - c.new_request(request) + cl.process_arriving_data(d) + cl.new_request(request) def render_GET(self, request): return b'hippotat' @@ -202,79 +157,35 @@ class IphttpResource(twisted.web.resource.Resource): def start_http(): resource = IphttpResource() site = twisted.web.server.Site(resource) - for addrspec in cfg.get('server','addrs').split(): - try: - addr = ipaddress.IPv4Address(addrspec) - endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint - except AddressValueError: - addr = ipaddress.IPv6Address(addrspec) - endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint - ep = endpointfactory(reactor, cfg.getint('server','port'), addr) + for sa in c.saddrs: + ep = sa.make_endpoint() crash_on_defer(ep.listen(site)) #---------- config and setup ---------- def process_cfg(): - global network - global host - global relay - global ipif_command - - network = ipnetwork(cfg.get('virtual','network')) - if network.num_addresses < 3 + 2: - raise ValueError('network needs at least 2^3 addresses') - - try: - host = cfg.get('virtual','host') - except NoOptionError: - host = next(network.hosts()) + process_cfg_common_always() + process_cfg_server() + process_cfg_network() try: - relay = cfg.get('virtual','relay') + c.relay = cfg.get('virtual','relay') except NoOptionError: - for search in network.hosts(): - if search == host: continue - relay = search + for search in c.network.hosts(): + if search == c.server: continue + c.relay = search break - for cs in cfg.sections(): - if not (':' in cs or '.' in cs): continue - ci = ipaddr(cs) - if ci not in network: - raise ValueError('client %s not in network' % ci) - if ci in clients: - raise ValueError('multiple client cfg sections for %s' % ci) - clients[ci] = Client(ci, cs) - - global mtu - mtu = cfg.get('virtual','mtu') - - iic_vars = { } - for k in ('host','relay','mtu','network'): - iic_vars[k] = globals()[k] - - ipif_command = cfg.get('server','ipif', vars=iic_vars) - -def startup(): - global cfg - - op = OptionParser() - op.add_option('-c', '--config', dest='configfile', - default='/etc/hippottd/server.conf') - global opts - (opts, args) = op.parse_args() - if len(args): op.error('no non-option arguments please') - - twisted.logger.globalLogPublisher.addObserver(crash_on_critical) - - cfg = ConfigParser() - cfg.read_string(defcfg) - cfg.read(opts.configfile) - process_cfg() + process_cfg_saddrs() + process_cfg_clients(Client) - start_ipif(ipif_command, route) - start_http() + process_cfg_ipif('server', + (('local','server'), + ('peer', 'relay'), + ('rnets','network'))) -startup() -reactor.run() -print('CRASHED (end)', file=sys.stderr) +common_startup(defcfg) +process_cfg() +start_ipif(c.ipif_command, route) +start_http() +common_run()