fixes

[hippotat.git] / hippotat / __init__.py

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index 8f8a4479a1619727b3b633cf55a5c1889f16bef7..8694e978a436efc06effbbb5b4e3b81c5868d06f 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -68,7 +68,7 @@ target_requests_outstanding = 10  # used by server
 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 `--'
@@ -123,23 +123,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(<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()
 
@@ -206,7 +224,7 @@ def crash(err):
 def crash_on_defer(defer):
   defer.addErrback(lambda err: crash(err))
 
-vdef crash_on_critical(event):
+def crash_on_critical(event):
   if event.get('log_level') >= LogLevel.critical:
     crash(twisted.logger.formatEvent(event))