This commit is contained in:
Yannik Schmidt
2018-08-20 07:05:31 +02:00
parent 7ba9b7d016
commit 3fd77a32eb
2 changed files with 12 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
#/usr/bin/python3 #!/usr/bin/python3
import socketserver import socketserver
import server_interface import server_interface
@@ -12,10 +12,17 @@ class AppRequestHandler(socketserver.BaseRequestHandler):
return socketserver.BaseRequestHandler.setup(self) return socketserver.BaseRequestHandler.setup(self)
def handle(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) retval = server_interface.parse_request(data)
print(retval)
self.request.send(retval) self.request.send(retval)
self.request.send(b"terminate\n")
print("Replied with: {}".format(retval))
return return
def finish(self): def finish(self):
@@ -23,7 +30,7 @@ class AppRequestHandler(socketserver.BaseRequestHandler):
def start_server(): def start_server():
socketserver.TCPServer.allow_reuse_address = True socketserver.TCPServer.allow_reuse_address = True
server = socketserver.TCPServer(("localhost",7100),AppRequestHandler) server = socketserver.TCPServer(("0.0.0.0",7100),AppRequestHandler)
server.serve_forever() server.serve_forever()

View File

@@ -12,11 +12,9 @@ def parse_request(data):
def is_data_type(tag,data): def is_data_type(tag,data):
print(data)
print(tag)
data = data.strip(b"\n") data = data.strip(b"\n")
if data.startswith(tag): if data.startswith(tag):
ret = data.strip(tag) ret = data.split(tag)[1]
if not ret: if not ret:
ret = b"NULL\n" ret = b"NULL\n"
return ret return ret