wip

[hippotat.git] / server

diff --git a/server b/server
index b9aa6f26beacdd612905926996d7c4ae05cfc70d..6a71bfd5b8f1452da80e2ad0c7efcb8de553bd7d 100755 (executable)
--- a/server
+++ b/server
@@ -61,7 +61,7 @@ class Client():
       limit = cfg.getint('limits',k)
       self.__dict__[k] = min(req, limit)
 
-    self._pq = PacketQueue(ip, self.max_queue_time)
+    self._pq = PacketQueue(str(ip), self.max_queue_time)
 
     if ip in clients:
       raise ValueError('multiple client cfg sections for %s' % ip)
@@ -73,7 +73,8 @@ 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)
       if saddr != self._ip:
@@ -81,11 +82,11 @@ class Client():
       route(packet, self._ip, saddr, daddr)
 
   def _req_cancel(self, request):
-    self._log(DBG.HTTPCTRL, 'cancel', idof=request)
+    self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
     request.finish()
 
   def _req_error(self, err, request):
-    self._log(DBG.HTTPCTRL, 'error %s' % err, idof=request)
+    self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
     self._req_cancel(request)
 
   def queue_outbound(self, packet):
@@ -100,7 +101,7 @@ class Client():
     self._check_outbound()
 
   def _check_outbound(self):
-    log_debug(DBG.HTTPCTRL, 'CHKO')
+    log_debug(DBG.HTTP_CTRL, 'CHKO')
     while True:
       try: request = self._rq[0]
       except IndexError: request = None
@@ -155,9 +156,9 @@ 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 = ''
+  except KeyError: d = b''
 
   cl.process_arriving_data(d)
   cl.new_request(request)