From 5dd3275bb14a49afe8e2d9571755d22164c59a2f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 1 Apr 2017 21:24:02 +0100 Subject: [PATCH 1/1] wip --- client | 12 +++++++++++- server | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client b/client index c08b5fc..ec28fd0 100755 --- a/client +++ b/client @@ -93,7 +93,17 @@ class ResponseConsumer(twisted.internet.protocol.Protocol): req_err(self._req, reason) def req_ok(req, resp): - log_debug(DBG.HTTP_CTRL, 'req_ok ' + str(resp), idof=req) + log_debug(DBG.HTTP_CTRL, + 'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)), + idof=req) + if resp.code != 200: + try: + phrase = resp.phrase.decode('utf-8') + except UnicodeDecodeError: + phrase = repr(resp.phrase) + req_err(req, "FAILED %d %s" % (resp.code, phrase)) + return + rc = ResponseConsumer(req) resp.deliverBody(rc) req_fin(req) diff --git a/server b/server index 79bd15b..6a71bfd 100755 --- a/server +++ b/server @@ -139,7 +139,7 @@ class Client(): def process_request(request, desca): # find client, update config, etc. - metadata = request.args[b'mX'][0] + metadata = request.args[b'm'][0] metadata = metadata.split(b'\r\n') (ci_s, pw, tro) = metadata[0:3] desca['m[0,2]'] = [ci_s, tro] -- 2.30.2