X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=server;h=a34cc3cf3082ab6047cf0a6463b8fde2a6528f2d;hp=aa06eb6dad656f3c51cb8770262b4ab9e9b4f057;hb=2d2a54a45c59769081a906418963e5fad2f7a31e;hpb=3a6076b4288cc01264d280d8c7b7f2793445ca90;ds=sidebyside diff --git a/server b/server index aa06eb6..a34cc3c 100755 --- a/server +++ b/server @@ -1,50 +1,28 @@ #!/usr/bin/python3 +from hippotat import * + import sys import os -import twisted import twisted.internet import twisted.internet.endpoints -from twisted.internet import reactor from twisted.web.server import NOT_DONE_YET -from twisted.logger import LogLevel - -import ipaddress -from ipaddress import AddressValueError #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 = { } -def ipaddr(input): - try: - r = ipaddress.IPv4Address(input) - except AddressValueError: - r = ipaddress.IPv6Address(input) - return r - -def ipnetwork(input): - try: - r = ipaddress.IPv4Network(input) - except NetworkValueError: - r = ipaddress.IPv6Network(input) - return r - defcfg = ''' [DEFAULT] max_batch_down = 65536 max_queue_time = 10 max_request_time = 54 +target_requests_outstanding = 3 +ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s [virtual] mtu = 1500 @@ -53,14 +31,14 @@ mtu = 1500 # [relay] [server] -ipif = userv root ipif %(host)s,%(relay)s,%(mtu)s,slip %(network)s addrs = 127.0.0.1 ::1 -port = 80 +port = 8099 [limits] max_batch_down = 262144 max_queue_time = 121 max_request_time = 121 +target_requests_outstanding = 10 ''' #---------- "router" ---------- @@ -73,7 +51,7 @@ def route(packet, saddr, daddr): 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.host or daddr not in c.network: print('TRACE INBOUND ', saddr, daddr, packet) queue_inbound(packet) elif daddr == relay: @@ -86,88 +64,6 @@ def log_discard(packet, saddr, daddr, why): # syslog.syslog(syslog.LOG_DEBUG, # 'discarded packet %s -> %s (%s)' % (saddr, daddr, why)) -#---------- ipif (slip subprocess) ---------- - -class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): - def __init__(self): - self._buffer = b'' - def connectionMade(self): pass - def outReceived(self, data): - #print('RECV ', repr(data)) - self._buffer += data - packets = slip_decode(self._buffer) - self._buffer = packets.pop() - for packet in packets: - if not len(packet): continue - (saddr, daddr) = packet_addrs(packet) - route(packet, saddr, daddr) - def processEnded(self, status): - status.raiseException() - -def start_ipif(): - global ipif - ipif = IpifProcessProtocol() - reactor.spawnProcess(ipif, - '/bin/sh',['sh','-xc', ipif_command], - childFDs={0:'w', 1:'r', 2:2}) - -def queue_inbound(packet): - ipif.transport.write(slip_delimiter) - ipif.transport.write(slip_encode(packet)) - ipif.transport.write(slip_delimiter) - -#---------- SLIP handling ---------- - -slip_end = b'\300' -slip_esc = b'\333' -slip_esc_end = b'\334' -slip_esc_esc = b'\335' -slip_delimiter = slip_end - -def slip_encode(packet): - return (packet - .replace(slip_esc, slip_esc + slip_esc_esc) - .replace(slip_end, slip_esc + slip_esc_end)) - -def slip_decode(data): - print('DECODE ', repr(data)) - out = [] - for packet in data.split(slip_end): - pdata = b'' - while True: - eix = packet.find(slip_esc) - if eix == -1: - pdata += packet - break - #print('ESC ', repr((pdata, packet, eix))) - pdata += packet[0 : eix] - ck = packet[eix+1] - if ck == slip_esc_esc: pdata += slip_esc - elif ck == slip_esc_end: pdata += slip_end - else: raise ValueError('invalid SLIP escape') - packet = packet[eix+2 : ] - out.append(pdata) - print('DECODED ', repr(out)) - return out - -#---------- packet parsing ---------- - -def packet_addrs(packet): - version = packet[0] >> 4 - if version == 4: - addrlen = 4 - saddroff = 3*4 - factory = ipaddress.IPv4Address - elif version == 6: - addrlen = 16 - saddroff = 2*4 - factory = ipaddress.IPv6Address - else: - raise ValueError('unsupported IP version %d' % version) - saddr = factory(packet[ saddroff : saddroff + addrlen ]) - daddr = factory(packet[ saddroff + addrlen : saddroff + addrlen*2 ]) - return (saddr, daddr) - #---------- client ---------- class Client(): @@ -177,18 +73,21 @@ class Client(): self._cs = cs self.pw = cfg.get(cs, 'password') self._rq = collections.deque() # requests - self._pq = collections.deque() # packets + # self._pq = PacketQueue(...) # plus from config: # .max_batch_down # .max_queue_time # .max_request_time - for k in ('max_batch_down','max_queue_time','max_request_time'): + # .target_requests_outstanding + 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): + for packet in slip.decode(d): (saddr, daddr) = packet_addrs(packet) if saddr != self._ip: raise ValueError('wrong source address %s' % saddr) @@ -201,7 +100,7 @@ class Client(): self._req_cancel(request) def queue_outbound(self, packet): - self._pq.append((time.monotonic(), packet)) + self._pq.append(packet) def http_request(self, request): request.setHeader('Content-Type','application/octet-stream') @@ -218,15 +117,8 @@ class Client(): self._rq.popleft() continue - # now request is an unfinished request, or None - try: (queuetime, packet) = self._pq[0] - except IndexError: + if not self._pq.nonempty(): # no packets, oh well - break - - age = time.monotonic() - queuetime - if age > self.max_queue_time: - self._pq.popleft() continue if request is None: @@ -235,16 +127,16 @@ class Client(): # request, and also some non-expired packets while True: - try: (dummy, packet) = self._pq[0] - except IndexError: break + packet = self.pq.popleft() + if packet is None: break - encoded = slip_encode(packet) + encoded = slip.encode(packet) if request.sentLength > 0: - if (request.sentLength + len(slip_delimiter) + if (request.sentLength + len(slip.delimiter) + len(encoded) > self.max_batch_down): break - request.write(slip_delimiter) + request.write(slip.delimiter) request.write(encoded) self._pq.popLeft() @@ -254,7 +146,12 @@ class Client(): request.finish() # round again, looking for more to do + 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']) @@ -265,7 +162,8 @@ class IphttpResource(twisted.web.resource.Resource): # update config for r, w in (('mbd', 'max_batch_down'), ('mqt', 'max_queue_time'), - ('mrt', 'max_request_time')): + ('mrt', 'max_request_time'), + ('tro', 'target_requests_outstanding')): try: v = request.args[r] except KeyError: continue v = int(v) @@ -277,9 +175,12 @@ class IphttpResource(twisted.web.resource.Resource): c.process_arriving_data(d) c.new_request(request) + def render_GET(self, request): + return b'hippotat' + def start_http(): resource = IphttpResource() - sitefactory = twisted.web.server.Site(resource) + site = twisted.web.server.Site(resource) for addrspec in cfg.get('server','addrs').split(): try: addr = ipaddress.IPv4Address(addrspec) @@ -288,78 +189,52 @@ def start_http(): addr = ipaddress.IPv6Address(addrspec) endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint ep = endpointfactory(reactor, cfg.getint('server','port'), addr) - ep.listen(sitefactory) + crash_on_defer(ep.listen(site)) #---------- config and setup ---------- def process_cfg(): - global network - global host - global relay - global ipif_command + process_cfg_common_always() - network = ipnetwork(cfg.get('virtual','network')) - if network.num_addresses < 3 + 2: + c.network = ipnetwork(cfg.get('virtual','network')) + if c.network.num_addresses < 3 + 2: raise ValueError('network needs at least 2^3 addresses') try: - host = cfg.get('virtual','host') + c.host = cfg.get('virtual','host') except NoOptionError: - host = next(network.hosts()) + c.host = next(c.network.hosts()) 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.host: 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: + if ci not in c.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 crash_on_critical(event): - if event.get('log_level') >= LogLevel.critical: - print('crashing: ', twisted.logger.formatEvent(event), file=sys.stderr) - #print('crashing!', file=sys.stderr) - #os._exit(1) - try: reactor.stop() - except twisted.internet.error.ReactorNotRunning: pass - -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) + for d, s in (('local', 'host'), + ('peer','relay'), + ('rnets','network')): + try: v = getattr(c, s) + except KeyError: pass + setattr(c, d, v) - cfg = ConfigParser() - cfg.read_string(defcfg) - cfg.read(opts.configfile) - process_cfg() + print(repr(c)) - start_ipif() - start_http() + c.ipif_command = cfg.get('server','ipif', vars=c.__dict__) -startup() -reactor.run() +common_startup(defcfg) +process_cfg() +start_ipif(c.ipif_command, route) +start_http() +common_run()