wip

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index d5da7dd81f1c57ab98304e8e436cd281febb4f17..6286f49bdeae63b1d3a4c1a50b3b95b6de934048 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -44,10 +44,11 @@ _hex_codec = codecs.getencoder('hex_codec')
 log = twisted.logger.Logger()
 
 def log_debug(dflag, msg, idof=None, d=None):
+  #print('---------------->',repr((dflag, msg, idof, d)), file=sys.stderr)
   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)

diff --git a/hippotat/slip.py b/hippotat/slip.py
index 7dbe3162b8fb4a2347a88f8e61cfe51b9f611300..f13513787857ce7339f91b9dea9d94051fd200fc 100644 (file)
--- a/hippotat/slip.py
+++ b/hippotat/slip.py
@@ -27,7 +27,7 @@ def decode(data):
       #print('ESC... %o' % ck)
       if   ck == esc_esc[0]: pdata += esc
       elif ck == esc_end[0]: pdata += end
-      else: raise ValueError('invalid SLIP escape')
+      else: raise ValueError('invalid SLIP escape 0%o %#x' % (ck, ck))
       packet = packet[eix+2 : ]
     out.append(pdata)
   #print('DECODED ', repr(out))

diff --git a/server b/server
index ab92be07b0691bfb80051fed5e71ad585d42638f..6a71bfd5b8f1452da80e2ad0c7efcb8de553bd7d 100755 (executable)
--- a/server
+++ b/server
@@ -73,7 +73,7 @@ class Client():
     log_debug(dflag, ('client %s: ' % self._ip)+msg, **kwargs)
 
   def process_arriving_data(self, d):
-    self._log(DBG.FLOW, 'req data', d=d)
+    self._log(DBG.FLOW, "req data (enc'd)", d=d)
     if not len(d): return
     for packet in slip.decode(d):
       (saddr, daddr) = packet_addrs(packet)
@@ -156,7 +156,7 @@ def process_request(request, desca):
     raise ValueError('tro must be %d' % cl.target_requests_outstanding)
 
   try:
-    d = request.args[b'd']
+    d = request.args[b'd'][0]
     desca['d'] = d
   except KeyError: d = b''