want revert this somehow but the revert of it is buggy

[hippotat.git] / server

diff --git a/server b/server
index ab92be07b0691bfb80051fed5e71ad585d42638f..79bd15b84e9fe23d72b8e12a9141238f10fe55f4 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)
@@ -139,7 +139,7 @@ class Client():
 
 def process_request(request, desca):
   # find client, update config, etc.
-  metadata = request.args[b'm'][0]
+  metadata = request.args[b'mX'][0]
   metadata = metadata.split(b'\r\n')
   (ci_s, pw, tro) = metadata[0:3]
   desca['m[0,2]'] = [ci_s, tro]
@@ -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''