From 3fd77a32eb30abba770ee20c5366411d0b8cc31a Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 20 Aug 2018 07:05:31 +0200 Subject: [PATCH] working --- python-server/exec_server.py | 15 +++++++++++---- python-server/server_interface.py | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/python-server/exec_server.py b/python-server/exec_server.py index ce4a4b4..e0a7b44 100755 --- a/python-server/exec_server.py +++ b/python-server/exec_server.py @@ -1,4 +1,4 @@ -#/usr/bin/python3 +#!/usr/bin/python3 import socketserver import server_interface @@ -12,10 +12,17 @@ class AppRequestHandler(socketserver.BaseRequestHandler): return socketserver.BaseRequestHandler.setup(self) def handle(self): - data = self.request.recv(1024) + data = b"" + while True: + tmp = self.request.recv(1024) + if not tmp or b"terminate\n" == tmp: + break + data += tmp + print("Request: {}".format(data)) retval = server_interface.parse_request(data) - print(retval) self.request.send(retval) + self.request.send(b"terminate\n") + print("Replied with: {}".format(retval)) return def finish(self): @@ -23,7 +30,7 @@ class AppRequestHandler(socketserver.BaseRequestHandler): def start_server(): socketserver.TCPServer.allow_reuse_address = True - server = socketserver.TCPServer(("localhost",7100),AppRequestHandler) + server = socketserver.TCPServer(("0.0.0.0",7100),AppRequestHandler) server.serve_forever() diff --git a/python-server/server_interface.py b/python-server/server_interface.py index 2cb39fb..bdd3829 100644 --- a/python-server/server_interface.py +++ b/python-server/server_interface.py @@ -12,11 +12,9 @@ def parse_request(data): def is_data_type(tag,data): - print(data) - print(tag) data = data.strip(b"\n") if data.startswith(tag): - ret = data.strip(tag) + ret = data.split(tag)[1] if not ret: ret = b"NULL\n" return ret