Add token field to connection. Send connection to protocol parser.

Add new constants for the results (non-boolean) so later™ score can be smart.

1 files changed, 4 insertions, 3 deletions

diff --git a/server.py b/server.py
index 3d61e11..9a068da 100755
--- a/server.py
+++ b/server.py
@@ -9,7 +9,7 @@ from websock import WebSocketServer, WebSocket
 
 ## Local Modules
 from utils import stdout, now
-from consts import MAX_CLIENTS
+from consts import MAX_CLIENTS, PACKET_ACK
 import protocol, security, traceback
 
 ###############################################################
@@ -37,13 +37,14 @@ class WebSocketConn(WebSocket):
         """
         print("Message received from %s - %s" % (self.address[0], self.data))
         try:
-            r=protocol.parse(self.data)
+            r=protocol.parse(self.data, self)
             print("Status: %s" % str(r[0]))
             print("Reply: %s" % r[1])
-            if r[0] is not True:
+            if r[0] < PACKET_ACK:
                 stdout("%s - %s" % (self.address[0], r[1]))
                 syslog.syslog(LOG_AUTH, "%s - %s" % (self.address[0], r[1]))
                 self.send_message("NACK\n")
+                # FIXME: Parse the packet error score
                 security.score(self, 5)
             else:
                 self.send_message(r[1])