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

diff --git a/server b/server
index 1f65255..0d75e0b 100755
--- a/server
+++ b/server
@@ -12,6 +12,8 @@ from twisted.web.server import NOT_DONE_YET
 
 import syslog
 
+import traceback
+
 clients = { }
 
 #---------- "router" ----------
@@ -137,9 +139,9 @@ class Client():
 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]
@@ -174,7 +176,7 @@ class IphttpResource(twisted.web.resource.Resource):
     desca = {'d': None}
     try: process_request(request, desca)
     except Exception as e:
-      emsg = repr(e)
+      emsg = traceback.format_exc()
       log_http(desca, 'EXCEPTION ' + emsg)
       request.setHeader('Content-Type','text/plain; charset="utf-8"')
       request.setResponseCode(400)