fix a potential RST problem

clowwindy · clowwindy · commit 6caeabd03de4 · 2014-05-10T01:22:26.000+08:00
diff --git a/shadowsocks/local.py b/shadowsocks/local.py
@@ -100,6 +100,7 @@ def handle_tcp(sock, remote, encryptor, pending_data=None,
             else:
                 fdset = [sock, remote]
             while True:
+                should_break = False
                 r, w, e = select.select(fdset, [], [])
                 if sock in r:
                     if not connected and config_fast_open:
@@ -123,18 +124,25 @@ def handle_tcp(sock, remote, encryptor, pending_data=None,
                             pending_data = None
                         data = encryptor.encrypt(data)
                         if len(data) <= 0:
-                            break
-                        result = send_all(remote, data)
-                        if result < len(data):
-                            raise Exception('failed to send all data')
+                            should_break = True
+                        else:
+                            result = send_all(remote, data)
+                            if result < len(data):
+                                raise Exception('failed to send all data')
 
                 if remote in r:
                     data = encryptor.decrypt(remote.recv(4096))
                     if len(data) <= 0:
-                        break
-                    result = send_all(sock, data)
-                    if result < len(data):
-                        raise Exception('failed to send all data')
+                        should_break = True
+                    else:
+                        result = send_all(sock, data)
+                        if result < len(data):
+                            raise Exception('failed to send all data')
+                if should_break:
+                    # make sure all data are read before we close the sockets
+                    # TODO: we haven't read ALL the data, actually
+                    # http://cs.ecs.baylor.edu/~donahoo/practical/CSockets/TCPRST.pdf
+                    break
         finally:
             sock.close()
             remote.close()
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
@@ -79,21 +79,29 @@ def handle_tcp(self, sock, remote):
         try:
             fdset = [sock, remote]
             while True:
+                should_break = False
                 r, w, e = select.select(fdset, [], [])
                 if sock in r:
                     data = self.decrypt(sock.recv(4096))
                     if len(data) <= 0:
-                        break
-                    result = send_all(remote, data)
-                    if result < len(data):
-                        raise Exception('failed to send all data')
+                        should_break = True
+                    else:
+                        result = send_all(remote, data)
+                        if result < len(data):
+                            raise Exception('failed to send all data')
                 if remote in r:
                     data = self.encrypt(remote.recv(4096))
                     if len(data) <= 0:
-                        break
-                    result = send_all(sock, data)
-                    if result < len(data):
-                        raise Exception('failed to send all data')
+                        should_break = True
+                    else:
+                        result = send_all(sock, data)
+                        if result < len(data):
+                            raise Exception('failed to send all data')
+                if should_break:
+                    # make sure all data are read before we close the sockets
+                    # TODO: we haven't read ALL the data, actually
+                    # http://cs.ecs.baylor.edu/~donahoo/practical/CSockets/TCPRST.pdf
+                    break
 
         finally:
             sock.close()
