diff --git a/src/server.py b/src/server.py --- a/src/server.py +++ b/src/server.py @@ -6,6 +6,7 @@ import logging as log from hashtree import hashBlock from netnode import BaseConnection,NetNode import config as conf +import status class Connection(BaseConnection): @@ -40,7 +41,7 @@ class Miniserver: if p and p.is_alive(): with connection as c: c[0].readMsg() - c[1].writeMsg({"command":"deny"}) + c[1].writeMsg({"command":"deny","status":status.locked}) continue p=multiprocessing.Process(target=Server.run,args=(connection,self._filename,self._treeFile)) p.start() @@ -79,9 +80,11 @@ class Server(NetNode): if jsonData["command"]=="init": if jsonData["blockSize"]!=self.BLOCK_SIZE or jsonData["blockCount"]!=self._tree.leafCount: - self._outcoming.writeMsg({"command":"deny"}) + self._outcoming.writeMsg({"command":"deny","status":status.incompatible.parameters}) + if jsonData["version"]