X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=hippotat%2F__init__.py;h=43f4a49b157329312e64e1a0ee5e559190d15aa4;hp=4cc9e70855bfb49f609d6695e85b5a07eb7c51aa;hb=0accf0d39d4758f5f9ccb960101771f8f666d9ff;hpb=7a68893ff08c60d0973b6bebe119c1303d812375

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index 4cc9e70..43f4a49 100644
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -39,6 +39,8 @@ class DBG(twisted.python.constants.Names):
   QUEUE = NamedConstant()
   QUEUE_CTRL = NamedConstant()
   HTTP_FULL = NamedConstant()
+  SLIP_FULL = NamedConstant()
+  CTRL_DUMP = NamedConstant()
 
 _hex_codec = codecs.getencoder('hex_codec')
 
@@ -49,7 +51,7 @@ def log_debug(dflag, msg, idof=None, d=None):
   if idof is not None:
     msg = '[%d] %s' % (id(idof), msg)
   if d is not None:
-    #d = d[0:64]
+    d = d[0:64]
     d = _hex_codec(d)[0].decode('ascii')
     msg += ' ' + d
   log.info('{dflag} {msgcore}', dflag=dflag, msgcore=msg)
@@ -156,32 +158,39 @@ def ipnetwork(input):
 #---------- ipif (SLIP) subprocess ----------
 
 class SlipStreamDecoder():
-  def __init__(self, on_packet):
-    # we will call packet(<packet>)
+  def __init__(self, desc, on_packet):
     self._buffer = b''
     self._on_packet = on_packet
+    self._desc = desc
+    self._log('__init__')
+
+  def _log(self, msg, **kwargs):
+    log_debug(DBG.SLIP_FULL, 'slip %s: %s' % (self._desc, msg), **kwargs)
 
   def inputdata(self, data):
-    #print('SLIP-GOT ', repr(data))
+    self._log('inputdata', d=data)
     data = self._buffer + data
     self._buffer = b''
     packets = slip.decode(data)
     self._buffer = packets.pop()
     for packet in packets:
       self._maybe_packet(packet)
+    self._log('bufremain', d=self._buffer)
 
   def _maybe_packet(self, packet):
-      if len(packet):
-        self._on_packet(packet)
+    self._log('maybepacket', d=packet)
+    if len(packet):
+      self._on_packet(packet)
 
   def flush(self):
+    self._log('flush')
     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)
+    self._decoder = SlipStreamDecoder('ipif', self.slip_on_packet)
   def connectionMade(self): pass
   def outReceived(self, data):
     self._decoder.inputdata(data)