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

diff --git a/server b/server
index e3fef89..0d75e0b 100755
--- a/server
+++ b/server
@@ -12,23 +12,29 @@ from twisted.web.server import NOT_DONE_YET
 
 import syslog
 
+import traceback
+
 clients = { }
 
 #---------- "router" ----------
 
-def route(packet, saddr, daddr):
-  print('TRACE ', saddr, daddr, packet)
+def route(packet, iface, saddr, daddr):
+  def lt(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:
+    lt('client')
     dclient.queue_outbound(packet)
   elif daddr == c.server or daddr not in c.network:
-    print('TRACE INBOUND ', saddr, daddr, packet)
+    lt('inbound')
     queue_inbound(packet)
   elif daddr == relay:
-    log_discard(packet, saddr, daddr, 'relay')
+    lt('discard relay')
+    log_discard(packet, iface, saddr, daddr, 'relay')
   else:
-    log_discard(packet, saddr, daddr, 'no client')
+    lt('discard no-client')
+    log_discard(packet, iface, saddr, daddr, 'no-client')
 
 #---------- client ----------
 
@@ -55,30 +61,38 @@ 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
 
+    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):
+    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):
+    self._log(DBG.HTTPCTRL, 'cancel', idof=request)
     request.finish()
 
   def _req_error(self, err, request):
+    self._log(DBG.HTTPCTRL, 'error %s' % err, idof=request)
     self._req_cancel(request)
 
   def queue_outbound(self, packet):
     self._pq.append(packet)
     self._check_outbound()
 
-  def http_request(self, request):
+  def new_request(self, request):
     request.setHeader('Content-Type','application/octet-stream')
     reactor.callLater(self.max_request_time, self._req_cancel, request)
     request.notifyFinish().addErrback(self._req_error, request)
@@ -86,21 +100,26 @@ class Client():
     self._check_outbound()
 
   def _check_outbound(self):
+    log_debug(DBG.HTTPCTRL, 'CHKO')
     while True:
       try: request = self._rq[0]
       except IndexError: request = None
       if request and request.finished:
+        self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
         self._rq.popleft()
         continue
 
       if not self._pq.nonempty():
         # no packets, oh well
-        continue
+        self._log(DBG.HTTP_CTRL, 'CHKO no packets, OUT-DONE', idof=request)
+        break
 
       if request is None:
         # no request
+        self._log(DBG.HTTP_CTRL, 'CHKO no request, OUT-DONE', idof=request)
         break
 
+      self._log(DBG.HTTP_CTRL, 'CHKO processing', idof=request)
       # request, and also some non-expired packets
       self._pq.process((lambda: request.sentLength),
                        request.write,
@@ -109,34 +128,64 @@ class Client():
       assert(request.sentLength)
       self._rq.popleft()
       request.finish()
+      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()
+      self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
       request.finish()
 
-def process_request(request):
+def process_request(request, desca):
   # find client, update config, etc.
   metadata = request.args['m']
-  (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
+  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
 
-  if pw != cl.target_requests_outstanding:
-    raise ...
+  if tro != cl.target_requests_outstanding:
+    raise ValueError('tro must be %d' % cl.target_requests_outstanding)
 
-  try: d = request.args['d']
+  try:
+    d = request.args['d']
+    desca['d'] = d
   except KeyError: d = ''
 
   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):
-    process_request(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 = traceback.format_exc()
+      log_http(desca, 'EXCEPTION ' + emsg)
+      request.setHeader('Content-Type','text/plain; charset="utf-8"')
+      request.setResponseCode(400)
+      return emsg.encode('utf-8')
+    log_http(desca, '... [%s]' % id(request))
+    return NOT_DONE_YET
+
   def render_GET(self, request):
+    log_debug(DBG.HTTP, 'GET request')
     return b'<html><body>hippotat</body></html>'
 
 def start_http():
@@ -145,6 +194,7 @@ def start_http():
   for sa in c.saddrs:
     ep = sa.make_endpoint()
     crash_on_defer(ep.listen(site))
+    log_debug(DBG.INIT, 'listening on %s' % sa)
 
 #---------- config and setup ----------