QUEUE = NamedConstant()
QUEUE_CTRL = NamedConstant()
HTTP_FULL = NamedConstant()
+ SLIP_FULL = NamedConstant()
+ CTRL_DUMP = NamedConstant()
_hex_codec = codecs.getencoder('hex_codec')
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)
#---------- 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)