X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=hippotat%2F__init__.py;h=abc2a9fd687129eecd9732e258ac68168ed24711;hp=f51caf555bb0bc844be37d89d5757e3cd4e34c47;hb=d579a04817c1a141e715481a18fe7d71568c451d;hpb=ca732796fd94e7bc50750c11377da63880e4beff;ds=sidebyside diff --git a/hippotat/__init__.py b/hippotat/__init__.py index f51caf5..abc2a9f 100644 --- a/hippotat/__init__.py +++ b/hippotat/__init__.py @@ -3,6 +3,8 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) +import sys + import twisted from twisted.internet import reactor from twisted.logger import LogLevel @@ -11,13 +13,27 @@ import twisted.internet.endpoints import ipaddress from ipaddress import AddressValueError -import hippotat.slip as slip - from optparse import OptionParser from configparser import ConfigParser from configparser import NoOptionError import collections +import time + +import re as regexp + +from twisted.python.constants import NamedConstant + +import hippotat.slip as slip + +class DBG(twisted.python.constants.Names): + ROUTE = NamedConstant() + FLOW = NamedConstant() + HTTP = NamedConstant() + HTTP_CTRL = NamedConstant() + INIT = NamedConstant() + QUEUE = NamedConstant() + QUEUE_CTRL = NamedConstant() defcfg = ''' [DEFAULT] @@ -28,6 +44,8 @@ max_request_time = 54 # used by server, subject to [limits] target_requests_outstanding = 3 # must match; subject to [limits] on server max_requests_outstanding = 4 # used by client max_batch_up = 4000 # used by client +http_timeout = 30 # used by client +http_retry = 5 # used by client #[server] or [] overrides ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s @@ -63,6 +81,12 @@ target_requests_outstanding = 10 # used by server cfg = ConfigParser() optparser = OptionParser() +_mimetrans = bytes.maketrans(b'-'+slip.esc, slip.esc+b'-') +def mime_translate(s): + # SLIP-encoded packets cannot contain ESC ESC. + # Swap `-' and ESC. The result cannot contain `--' + return s.translate(_mimetrans) + class ConfigResults: def __init__(self, d = { }): self.__dict__ = d @@ -71,6 +95,11 @@ class ConfigResults: c = ConfigResults() +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)) + #---------- packet parsing ---------- def packet_addrs(packet): @@ -107,23 +136,41 @@ def ipnetwork(input): #---------- ipif (SLIP) subprocess ---------- -class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): - def __init__(self, router): +class SlipStreamDecoder(): + def __init__(self, on_packet): + # we will call packet() self._buffer = b'' - self._router = router - def connectionMade(self): pass - def outReceived(self, data): - #print('IPIF-GOT ', repr(data)) + self._on_packet = on_packet + + def inputdata(self, data): + #print('SLIP-GOT ', 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) - if saddr.is_link_local or daddr.is_link_local: - log_discard(packet, saddr, daddr, 'link-local') - continue - self._router(packet, saddr, daddr) + self._maybe_packet(packet) + + def _maybe_packet(self, packet): + if len(packet): + self._on_packet(packet) + + def flush(self): + self._maybe_packet(self._buffer) + self._buffer = b'' + +class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): + def __init__(self, router): + self._router = router + self._decoder = SlipStreamDecoder(self.slip_on_packet) + def connectionMade(self): pass + def outReceived(self, data): + self._decoder.inputdata(data) + def slip_on_packet(self, packet): + (saddr, daddr) = packet_addrs(packet) + if saddr.is_link_local or daddr.is_link_local: + log_discard(packet, saddr, daddr, 'link-local') + return + self._router(packet, saddr, daddr) def processEnded(self, status): status.raiseException() @@ -132,7 +179,8 @@ def start_ipif(command, router): ipif = _IpifProcessProtocol(router) reactor.spawnProcess(ipif, '/bin/sh',['sh','-xc', command], - childFDs={0:'w', 1:'r', 2:2}) + childFDs={0:'w', 1:'r', 2:2}, + env=None) def queue_inbound(packet): ipif.transport.write(slip.delimiter) @@ -142,31 +190,49 @@ def queue_inbound(packet): #---------- packet queue ---------- class PacketQueue(): - def __init__(self, max_queue_time): + def __init__(self, desc, max_queue_time): + self._desc = desc self._max_queue_time = max_queue_time self._pq = collections.deque() # packets + def _log_debug(self, fn, pri, msg) + log_debug(pri, + def append(self, packet): + log_data(DBG.QUEUE, packet, 'pq %s: append' % self._desc) self._pq.append((time.monotonic(), packet)) def nonempty(self): + log_debug(DBG.QUEUE, 'pq %s: nonempty ?' % self._desc) while True: try: (queuetime, packet) = self._pq[0] except IndexError: return False age = time.monotonic() - queuetime - if age > self.max_queue_time: + if age > self._max_queue_time: # strip old packets off the front self._pq.popleft() continue return True - def popleft(self): - # caller must have checked nonempty - try: (dummy, packet) = self._pq[0] - except IndexError: return None - return packet + def process(self, sizequery, moredata, max_batch): + # sizequery() should return size of batch so far + # moredata(s) should add s to batch + while True: + try: (dummy, packet) = self._pq[0] + except IndexError: break + + encoded = slip.encode(packet) + sofar = sizequery() + + if sofar > 0: + if sofar + len(slip.delimiter) + len(encoded) > max_batch: + break + moredata(slip.delimiter) + + moredata(encoded) + self._pq.popleft() #---------- error handling ---------- @@ -217,17 +283,17 @@ class ServerAddr(): try: self.addr = ipaddress.IPv4Address(addrspec) self._endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint - self._inurl = '%s' + self._inurl = b'%s' except AddressValueError: self.addr = ipaddress.IPv6Address(addrspec) self._endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint - self._inurl = '[%s]' + self._inurl = b'[%s]' def make_endpoint(self): return self._endpointfactory(reactor, self.port, self.addr) def url(self): - url = 'http://' + (self._inurl % self.addr) - if self.port != 80: url += ':%d' % self.port - url += '/' + url = b'http://' + (self._inurl % str(self.addr).encode('ascii')) + if self.port != 80: url += b':%d' % self.port + url += b'/' return url def process_cfg_saddrs(): @@ -245,11 +311,12 @@ def process_cfg_clients(constructor): if not (':' in cs or '.' in cs): continue ci = ipaddr(cs) pw = cfg.get(cs, 'password') + pw = pw.encode('utf-8') constructor(ci,cs,pw) #---------- startup ---------- -def common_startup(defcfg): +def common_startup(): twisted.logger.globalLogPublisher.addObserver(crash_on_critical) optparser.add_option('-c', '--config', dest='configfile', @@ -257,7 +324,8 @@ def common_startup(defcfg): (opts, args) = optparser.parse_args() if len(args): optparser.error('no non-option arguments please') - cfg.read_string(defcfg) + re = regexp.compile('#.*') + cfg.read_string(re.sub('', defcfg)) cfg.read(opts.configfile) def common_run():