slip fix

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index cc77cf6f91e1c3c1bfee3fb038fa1b7a3d6c21de..654a5c5f52fe2bccfd9d043d2acb3185e68a81cd 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -206,8 +206,9 @@ class SlipStreamDecoder():
 
   def inputdata(self, data):
     self._log('inputdata', d=data)
 
   def inputdata(self, data):
     self._log('inputdata', d=data)

-    packets = slip.decode(data)
-    packets[0] = self._buffer + packets[0]
+    data = self._buffer + data
+    self._buffer = b''
+    packets = slip.decode(data, True)

     self._buffer = packets.pop()
     for packet in packets:
       self._maybe_packet(packet)
     self._buffer = packets.pop()
     for packet in packets:
       self._maybe_packet(packet)


@@ -220,8 +221,11 @@ class SlipStreamDecoder():
 
   def flush(self):
     self._log('flush')
 
   def flush(self):
     self._log('flush')

-    self._maybe_packet(self._buffer)
+    data = self._buffer

     self._buffer = b''
     self._buffer = b''

+    packets = slip.decode(data)
+    assert(len(packets) == 1)
+    self._maybe_packet(packets[0])

 
 class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
   def __init__(self, router):
 
 class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
   def __init__(self, router):

diff --git a/hippotat/slip.py b/hippotat/slip.py
index f13513787857ce7339f91b9dea9d94051fd200fc..d7c44630ac40001834630809e22e93f052df313c 100644 (file)
--- a/hippotat/slip.py
+++ b/hippotat/slip.py
@@ -11,10 +11,14 @@ def encode(packet):
           .replace(esc, esc + esc_esc)
           .replace(end, esc + esc_end))
 
           .replace(esc, esc + esc_esc)
           .replace(end, esc + esc_end))
 

-def decode(data):
+def decode(data, keep_tail=False):

   #print('DECODE ', repr(data))
   out = []
   #print('DECODE ', repr(data))
   out = []

-  for packet in data.split(end):
+  inp = data.split(end)
+  tail = []
+  if keep_tail:
+    tail.append(inp.pop())
+  for packet in inp:

     pdata = b''
     while True:
       eix = packet.find(esc)
     pdata = b''
     while True:
       eix = packet.find(esc)


@@ -31,6 +35,7 @@ def decode(data):
       packet = packet[eix+2 : ]
     out.append(pdata)
   #print('DECODED ', repr(out))
       packet = packet[eix+2 : ]
     out.append(pdata)
   #print('DECODED ', repr(out))

+  out += tail

   return out
 # -*- python -*-
 
   return out
 # -*- python -*-
 

diff --git a/test.cfg b/test.cfg
index 9f5f182231df991e710066520226f2820d58493a..d3bdb48208408b72f8b5019b7f4286b81d508acc 100644 (file)
--- a/test.cfg
+++ b/test.cfg
@@ -18,3 +18,5 @@ ipif = PATH=/usr/local/sbin:/sbin:/usr/sbin:$PATH really ./fake-userv /home/ian/
 
 [192.0.2.4]
 #password = zorkmids
 
 [192.0.2.4]
 #password = zorkmids

+
+# dd if=/dev/zero bs=1024 count=1024 | nc -n -v 192.0.2.1 8100