chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip, before optional args log_xxx
[hippotat.git]
/
hippotat
/
__init__.py
diff --git
a/hippotat/__init__.py
b/hippotat/__init__.py
index 3f62113b90f439f64aa4708002908c2d1bedca52..abc2a9fd687129eecd9732e258ac68168ed24711 100644
(file)
--- a/
hippotat/__init__.py
+++ b/
hippotat/__init__.py
@@
-18,11
+18,23
@@
from configparser import ConfigParser
from configparser import NoOptionError
import collections
from configparser import NoOptionError
import collections
+import time
import re as regexp
import re as regexp
+from twisted.python.constants import NamedConstant
+
import hippotat.slip as slip
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]
#[<client>] overrides
defcfg = '''
[DEFAULT]
#[<client>] overrides
@@
-33,6
+45,7
@@
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
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 [<client>] overrides
ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
#[server] or [<client>] overrides
ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
@@
-68,7
+81,7
@@
target_requests_outstanding = 10 # used by server
cfg = ConfigParser()
optparser = OptionParser()
cfg = ConfigParser()
optparser = OptionParser()
-_mimetrans =
str.maketrans(b'-'+slip.esc, slip.esc+
'-')
+_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 `--'
def mime_translate(s):
# SLIP-encoded packets cannot contain ESC ESC.
# Swap `-' and ESC. The result cannot contain `--'
@@
-123,29
+136,36
@@
def ipnetwork(input):
#---------- ipif (SLIP) subprocess ----------
#---------- ipif (SLIP) subprocess ----------
-class Slip
Protocol(twisted.internet.protocol.ProcessProtocol
):
- # caller must define method receivedPacket(packet)
- def __init__(self):
+class Slip
StreamDecoder(
):
+ def __init__(self, on_packet):
+ # we will call packet(<packet>)
self._buffer = b''
self._buffer = b''
- def connectionMade(self): pass
- def outReceived(self, 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:
#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
- self.receivedPacket(packet)
+ self._maybe_packet(packet)
+
+ def _maybe_packet(self, packet):
+ if len(packet):
+ self._on_packet(packet)
+
def flush(self):
def flush(self):
- if len(self._buffer):
- self.receivedPacket(self._buffer)
- self._buffer = ''
+ self._maybe_packet(self._buffer)
+ self._buffer = b''
-class _IpifProcessProtocol(
Slip
Protocol):
+class _IpifProcessProtocol(
twisted.internet.protocol.Process
Protocol):
def __init__(self, router):
self._router = router
def __init__(self, router):
self._router = router
- super.__init__()
- def receivedPacket(self, packet):
+ 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')
(saddr, daddr) = packet_addrs(packet)
if saddr.is_link_local or daddr.is_link_local:
log_discard(packet, saddr, daddr, 'link-local')
@@
-159,7
+179,8
@@
def start_ipif(command, router):
ipif = _IpifProcessProtocol(router)
reactor.spawnProcess(ipif,
'/bin/sh',['sh','-xc', command],
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)
def queue_inbound(packet):
ipif.transport.write(slip.delimiter)
@@
-169,20
+190,26
@@
def queue_inbound(packet):
#---------- packet queue ----------
class PacketQueue():
#---------- 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
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):
def append(self, packet):
+ log_data(DBG.QUEUE, packet, 'pq %s: append' % self._desc)
self._pq.append((time.monotonic(), packet))
def nonempty(self):
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
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
# strip old packets off the front
self._pq.popleft()
continue
@@
-205,7
+232,7
@@
class PacketQueue():
moredata(slip.delimiter)
moredata(encoded)
moredata(slip.delimiter)
moredata(encoded)
- self._pq.pop
L
eft()
+ self._pq.pop
l
eft()
#---------- error handling ----------
#---------- error handling ----------
@@
-217,7
+244,7
@@
def crash(err):
def crash_on_defer(defer):
defer.addErrback(lambda err: crash(err))
def crash_on_defer(defer):
defer.addErrback(lambda err: crash(err))
-
v
def crash_on_critical(event):
+def crash_on_critical(event):
if event.get('log_level') >= LogLevel.critical:
crash(twisted.logger.formatEvent(event))
if event.get('log_level') >= LogLevel.critical:
crash(twisted.logger.formatEvent(event))
@@
-256,17
+283,17
@@
class ServerAddr():
try:
self.addr = ipaddress.IPv4Address(addrspec)
self._endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint
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
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):
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():
return url
def process_cfg_saddrs():
@@
-284,6
+311,7
@@
def process_cfg_clients(constructor):
if not (':' in cs or '.' in cs): continue
ci = ipaddr(cs)
pw = cfg.get(cs, 'password')
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 ----------
constructor(ci,cs,pw)
#---------- startup ----------