X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=server;h=0d75e0b8b1f78cac850c70bf405b8cc50be07c6a;hp=68a3ebd0c26a0189de9b67fe056c16a26db92746;hb=68afd97b014f134e9681ab90b374a6b44e6eb2b3;hpb=d579a04817c1a141e715481a18fe7d71568c451d

diff --git a/server b/server
index 68a3ebd..0d75e0b 100755
--- a/server
+++ b/server
@@ -12,13 +12,15 @@ from twisted.web.server import NOT_DONE_YET
 
 import syslog
 
+import traceback
+
 clients = { }
 
 #---------- "router" ----------
 
-def route(packet, saddr, daddr):
+def route(packet, iface, saddr, daddr):
   def lt(dest):
-    log_data(DBG.ROUTE, packet, 'route: %s -> %s: %s' % (saddr,daddr,dest))
+    log_debug(DBG.ROUTE, 'route: %s -> %s: %s' % (saddr,daddr,dest), d=packet)
   try: dclient = clients[daddr]
   except KeyError: dclient = None
   if dclient is not None:
@@ -29,10 +31,10 @@ def route(packet, saddr, daddr):
     queue_inbound(packet)
   elif daddr == relay:
     lt('discard relay')
-    log_discard(packet, saddr, daddr, 'relay')
+    log_discard(packet, iface, saddr, daddr, 'relay')
   else:
     lt('discard no-client')
-    log_discard(packet, saddr, daddr, 'no-client')
+    log_discard(packet, iface, saddr, daddr, 'no-client')
 
 #---------- client ----------
 
@@ -59,28 +61,31 @@ class Client():
       limit = cfg.getint('limits',k)
       self.__dict__[k] = min(req, limit)
 
-    self._pq = PacketQueue(self.max_queue_time)
+    self._pq = PacketQueue(ip, self.max_queue_time)
 
     if ip in clients:
       raise ValueError('multiple client cfg sections for %s' % ip)
     clients[ip] = self
 
-    log_debug('DBG.INIT', 'new client %s' % self)
+    self._log(DBG.INIT, 'new')
+
+  def _log(self, dflag, msg, **kwargs):
+    log_debug(dflag, ('client %s: ' % self._ip)+msg, **kwargs)
 
   def process_arriving_data(self, d):
-    log_data(DBG.FLOW, d, 'client req data: %s' % saddr=self._ip)
+    self._log(DBG.FLOW, 'req data', d=d)
     for packet in slip.decode(d):
       (saddr, daddr) = packet_addrs(packet)
       if saddr != self._ip:
         raise ValueError('wrong source address %s' % saddr)
-      route(packet, saddr, daddr)
+      route(packet, self._ip, saddr, daddr)
 
   def _req_cancel(self, request):
-    log_httpreq(DBG.HTTPCTRL, request, 'cancel')
+    self._log(DBG.HTTPCTRL, 'cancel', idof=request)
     request.finish()
 
   def _req_error(self, err, request):
-    log_httpreq(DBG.HTTPCTRL, request, 'error %s' % err)
+    self._log(DBG.HTTPCTRL, 'error %s' % err, idof=request)
     self._req_cancel(request)
 
   def queue_outbound(self, packet):
@@ -95,26 +100,26 @@ class Client():
     self._check_outbound()
 
   def _check_outbound(self):
-    log_httpreq(DBG.HTTPCTRL, None, 'CHKO')
+    log_debug(DBG.HTTPCTRL, 'CHKO')
     while True:
       try: request = self._rq[0]
       except IndexError: request = None
       if request and request.finished:
-        log_httpreq(DBG.HTTP_CTRL, request, 'CHKO request finished, discard')
+        self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
         self._rq.popleft()
         continue
 
       if not self._pq.nonempty():
         # no packets, oh well
-        log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no packets, OUT-DONE')
+        self._log(DBG.HTTP_CTRL, 'CHKO no packets, OUT-DONE', idof=request)
         break
 
       if request is None:
         # no request
-        log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no request, OUT-DONE')
+        self._log(DBG.HTTP_CTRL, 'CHKO no request, OUT-DONE', idof=request)
         break
 
-      log_httpreq(DBG.HTTP_CTRL, request, 'CHKO processing')
+      self._log(DBG.HTTP_CTRL, 'CHKO processing', idof=request)
       # request, and also some non-expired packets
       self._pq.process((lambda: request.sentLength),
                        request.write,
@@ -123,25 +128,25 @@ class Client():
       assert(request.sentLength)
       self._rq.popleft()
       request.finish()
-      log_httpreq(DBG.HTTP, request, 'complete')
+      self._log(DBG.HTTP, 'complete', idof=request)
       # round again, looking for more to do
 
     while len(self._rq) > self.target_requests_outstanding:
       request = self._rq.popleft()
-      log_httpreq(DBG.HTTP, request, 'CHKO above target, returning empty')
+      self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
       request.finish()
 
 def process_request(request, desca):
   # find client, update config, etc.
   metadata = request.args['m']
-  metadata = metadata.split(b'\n')
-  (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
-  desca['m'] = [ci_s, tro]
+  metadata = metadata.split(b'\r\n')
+  (ci_s, pw, tro) = metadata[0:3]
+  desca['m[0,2]'] = [ci_s, tro]
   ci = ipaddr(ci_s)
   desca['ci'] = ci
   cl = clients[ci]
   if pw != cl.pw: raise ValueError('bad password')
-  desca['pwok'=True]
+  desca['pwok']=True
 
   if tro != cl.target_requests_outstanding:
     raise ValueError('tro must be %d' % cl.target_requests_outstanding)
@@ -154,17 +159,28 @@ def process_request(request, desca):
   cl.process_arriving_data(d)
   cl.new_request(request)
 
+def log_http(desca, msg):
+  try:
+    d = desca['d']
+    del desca['d']
+  except KeyError:
+    d = None
+  log_debug(DBG.HTTP, msg + repr(desca), d=d)
+
 class IphttpResource(twisted.web.resource.Resource):
   isLeaf = True
   def render_POST(self, request):
+    log_debug(DBG.HTTP_FULL,
+              'req recv: ' + repr(request) + ' ' + repr(request.args),
+              idof=id(request))
     desca = {'d': None}
     try: process_request(request, desca)
     except Exception as e:
-      emsg = str(e).encode('utf-8')
+      emsg = traceback.format_exc()
       log_http(desca, 'EXCEPTION ' + emsg)
       request.setHeader('Content-Type','text/plain; charset="utf-8"')
       request.setResponseCode(400)
-      return emsg
+      return emsg.encode('utf-8')
     log_http(desca, '... [%s]' % id(request))
     return NOT_DONE_YET