...

2 files changed, 12 insertions, 10 deletions

diff --git a/server/piztor/prob.py b/server/piztor/prob.py
index 0ed328f..17e7972 100644
--- a/server/piztor/prob.py
+++ b/server/piztor/prob.py
@@ -6,7 +6,7 @@ def get_hex(data):
     return "".join([hex(ord(c))[2:].zfill(2) for c in data])
 
 host = "localhost"
-port = 9990
+port = 2222
 
 def gen_auth(username, password):
     length = 4 + 1 + len(username) + 1 + len(password) + 1
@@ -56,13 +56,17 @@ def send(data):
 
 from sys import argv
 
-if len(argv) == 2:
-    host = argv[1]
-
 username = "hello"
 password = "world"
 gid = 1
 
+if len(argv) == 2:
+    host = argv[1]
+
+if len(argv) == 3:
+    username = argv[1]
+    password = arv[2]
+
 resp = send(gen_auth(username, password))
 pl, optcode, status, uid, token = unpack("!LBBL32s", resp)
 print "size: " + str((pl, len(resp)))
diff --git a/server/piztor/server.py b/server/piztor/server.py
index 5d2382d..d0cfc34 100644
--- a/server/piztor/server.py
+++ b/server/piztor/server.py
@@ -139,7 +139,7 @@ class UserAuthHandler(RequestHandler):
             logger.info("Logged in sucessfully: {0}".format(username))
             uauth.regen_token()
             session.commit()
-            logger.info("new token generated: " + get_hex(uauth.token))
+            logger.info("New token generated: " + get_hex(uauth.token))
             return struct.pack("!LBBL32s", UserAuthHandler._response_size,
                                            _OptCode.user_auth,
                                            _StatusCode.sucess,
@@ -333,7 +333,7 @@ class PTP(Protocol, TimeoutMixin):
     def dataReceived(self, data):
         self.buff += data
         self.resetTimeout()
-        print len(self.buff)
+        logger.info("Buffer length is now: %d", len(self.buff))
         if len(self.buff) > 4:
             try:
                 self.length, self.optcode = struct.unpack("!LB", self.buff[:5])
@@ -342,9 +342,7 @@ class PTP(Protocol, TimeoutMixin):
             except struct.error:
                 logger.warning("Invalid request header")
                 raise BadReqError("Malformed request header")
-        print self.length
-        if self.length == -1:
-            return
+        if self.length == -1: return
         if len(self.buff) == self.length:
             h = handlers[self.optcode]()
             reply = h.handle(self.buff[5:])
@@ -366,6 +364,6 @@ class PTPFactory(Factory):
     def buildProtocol(self, addr):
         return PTP(self)
 
-endpoint = TCP4ServerEndpoint(reactor, 9990)
+endpoint = TCP4ServerEndpoint(reactor, 2222)
 endpoint.listen(PTPFactory())
 reactor.run()