chiark
/
gitweb
/
~ian
/
hippotat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3dbadad
)
reorg SlipStreamDecoder again
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 22 Mar 2017 23:49:53 +0000
(23:49 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 22 Mar 2017 23:49:53 +0000
(23:49 +0000)
hippotat/__init__.py
patch
|
blob
|
history
diff --git
a/hippotat/__init__.py
b/hippotat/__init__.py
index 3f62113b90f439f64aa4708002908c2d1bedca52..e48083a3ae85f8cec7c7c8d1e64f6b84a134b99d 100644
(file)
--- a/
hippotat/__init__.py
+++ b/
hippotat/__init__.py
@@
-123,29
+123,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(SlipProtocol):
def __init__(self, router):
self._router = router
class _IpifProcessProtocol(SlipProtocol):
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')