Getting line reading from the server.

tcp-proxy.py

@@ -8,7 +8,6 @@ from twisted.internet import protocol
 from twisted.internet import reactor
 from twisted.python import log
 from twisted.enterprise import adbapi
-from twisted.protocols.basic import LineReceiver
 
 # Connect to:
 HOST = "127.0.0.1"
@@ -18,32 +17,18 @@ LISTEN_PORT = 9999
 LISTEN_ON = "127.0.0.1"
 
 
-class LineRecv(LineReceiver):
-    def __init__(self, notify):
-        self.delimiter = b"\n"  # \r"
-        self.notify = notify
-
-    def lineReceived(self, line):
-        log.msg("LR:", line)
-        self.notify.gotLine(line)
-
-
 class PlayerProtocol(protocol.Protocol):
     def __init__(self):
         self.user = None
         self.dbinit = False
         self.db = None
         self.buffer = ""
-        self.linereader = LineRecv(self)
-        self.linereader.connectionMade()
 
     def connectionMade(self):
         log.msg("Client: connected to peer")
         self.queue_twgs = self.factory.queue_twgs
         self.queue_twgs.get().addCallback(self.serverDataReceived)
 
-    def gotLine(self, line):
-        log.msg(">>> [{0}]".format(line.decode("utf-8", "ignore")))
 
     def serverDataReceived(self, chunk):
         # rlogin looks like this:  \x00 password \x00 username \x00 terminal/speed \x00
@@ -56,8 +41,10 @@ class PlayerProtocol(protocol.Protocol):
             self.factory.continueTrying = False
             self.transport.loseConnection()
         else:
-            self.buffer += chunk.decode("utf-8")
+            # self.buffer += chunk.decode("utf-8", 'ignore')
             if self.user is None:
+                self.buffer += chunk.decode("utf-8", 'ignore')
+
                 # Ok, process this
                 # self.buffer += chunk.decode('utf-8')
                 # We don't have the username yet
@@ -71,12 +58,11 @@ class PlayerProtocol(protocol.Protocol):
                     self.buffer = self.buffer[zpos + 1 :]
                     self.buffer = ""
                     # init sqlite db using the username
-            else:
+            # else:
                 # process the buffer
                 # Handle backspaces by deleting previous character.
 
                 # Send the received data into the linereader for "automatic" line processing.
-                self.linereader.dataReceived(chunk)
 
                 #
                 #
@@ -103,7 +89,7 @@ class PlayerProtocol(protocol.Protocol):
         # clean, strip ANSI, etc.
 
         # log.msg("<<", chunk.decode("utf-8", "ignore"))
-        log.msg("<<", repr(chunk))
+        # log.msg("<<", repr(chunk))
         self.factory.queue_client.put(chunk)
 
     def connectionLost(self, why):
@@ -116,8 +102,8 @@ class PlayerProtocol(protocol.Protocol):
         self.transport.loseConnection()
 
 
-# class GlueFactory(protocol.ClientFactory):
-class GlueFactory(protocol.Factory):
+class GlueFactory(protocol.ClientFactory):
+# class GlueFactory(protocol.Factory):
     maxDelay = 10
     protocol = PlayerProtocol
 
@@ -130,9 +116,9 @@ class GlueFactory(protocol.Factory):
         self.queue_client.put(False)
 
     # This was needed when I replaced ClientFactory with Factory.
-    def clientConnectionLost(self, connector, why):
-        log.msg("clientconnectionlost: %s" % why)
-        self.queue_client.put(False)
+    # def clientConnectionLost(self, connector, why):
+    #     log.msg("clientconnectionlost: %s" % why)
+    #     self.queue_client.put(False)
 
     def clientConnectionFailed(self, connector, why):
         log.msg("connectionFailed: %s" % why)
@@ -146,6 +132,9 @@ class GlueFactory(protocol.Factory):
 
 
 class TWGSServer(protocol.Protocol):
+    def __init__(self):
+        self.buffer = ""
+
     def connectionMade(self):
         self.queue_twgs = defer.DeferredQueue()
         self.queue_client = defer.DeferredQueue()
@@ -154,10 +143,22 @@ class TWGSServer(protocol.Protocol):
         factory = GlueFactory(self.queue_client, self.queue_twgs)
         reactor.connectTCP(HOST, PORT, factory, 5)
 
+    def gotLine(self, line):
+        # log.msg(">>> [{0}]".format(line.decode("utf-8", "ignore")))
+        log.msg(">>> [{0}]".format(line))
+
     def clientDataReceived(self, chunk):
         if chunk is False:
             self.transport.loseConnection()
         else:
+            self.buffer += chunk.decode('utf-8', 'ignore')
+
+            while '\n' in self.buffer:
+                part = self.buffer.partition('\n')
+                line = part[0].replace('\r', '')
+                self.gotLine(line)
+                self.buffer = part[2]
+
             # log.msg("Server: writing %d bytes to original client" % len(chunk))
             self.transport.write(chunk)
             self.queue_client.get().addCallback(self.clientDataReceived)