fix

Author: qwj

pproxy/proto.py

@@ -56,7 +56,7 @@ async def connect(self, reader_remote, writer_remote, rauth, host_name, port, **
     async def channel(self, reader, writer, stat_bytes, stat_conn):
         try:
             stat_conn(1)
-            while True:
+            while not reader.at_eof() and not writer.is_closing():
                 data = await reader.read(65536)
                 if not data:
                     break
@@ -326,7 +326,7 @@ async def connect(self, reader_remote, writer_remote, rauth, host_name, port, my
     async def http_channel(self, reader, writer, stat_bytes, stat_conn):
         try:
             stat_conn(1)
-            while True:
+            while not reader.at_eof() and not writer.is_closing():
                 data = await reader.read(65536)
                 if not data:
                     break
@@ -582,7 +582,7 @@ def abort(self):
     ssl.connection_made(Transport())
     async def channel():
         try:
-            while True:
+            while not reader.at_eof() and not ssl._app_transport.closed:
                 data = await reader.read(65536)
                 if not data:
                     break
@@ -599,6 +599,8 @@ def write(self, data):
             ssl._app_transport.write(data)
         def drain(self):
             return writer.drain()
+        def is_closing(self):
+            return ssl._app_transport.closed
         def close(self):
             ssl._app_transport.close()
     return ssl_reader, Writer()

pproxy/server.py

@@ -9,7 +9,11 @@
 class ProxyReader(asyncio.StreamReader):
     def __init__(self, o=None):
         if o:
-            self.__dict__ = o.__dict__
+            for n in dir(o):
+                if not n.startswith('__'):
+                    setattr(self, n, getattr(o, n))
+        else:
+            super(self).__init__()
     def read_w(self, n):
         return asyncio.wait_for(self.read(n), timeout=SOCKET_TIMEOUT)
     def read_n(self, n):
@@ -321,9 +325,7 @@ async def drain():
         writer.get_extra_info = dict(peername=remote_addr, sockname=remote_addr).get
         writer.drain = drain
         closed = False
-        def is_closing():
-            return closed
-        writer.is_closing = is_closing
+        writer.is_closing = lambda: closed
         def close():
             nonlocal closed
             closed = True
@@ -403,7 +405,7 @@ def logtext(self, host, port):
     def patch_stream(self, ssh_reader, writer, host, port):
         reader = asyncio.StreamReader()
         async def channel():
-            while not writer.is_closing():
+            while not ssh_reader.at_eof() and not writer.is_closing():
                 buf = await ssh_reader.read(65536)
                 if not buf:
                     break