fix EINPROGESS

clowwindy · clowwindy · commit 33f7ad9e8f3a · 2014-05-03T08:41:56.000+08:00
diff --git a/shadowsocks/local.py b/shadowsocks/local.py
@@ -37,6 +37,8 @@
     print >>sys.stderr, 'warning: gevent not found, using threading instead'
 
 import socket
+import eventloop
+import errno
 import select
 import SocketServer
 import struct
@@ -105,7 +107,13 @@ def handle_tcp(sock, remote, encryptor, pending_data=None,
                         data = encryptor.encrypt(pending_data + data)
                         pending_data = None
                         logging.info('fast open %s:%d' % (server, port))
-                        remote.sendto(data, MSG_FASTOPEN, (server, port))
+                        try:
+                            remote.sendto(data, MSG_FASTOPEN, (server, port))
+                        except (OSError, IOError) as e:
+                            if eventloop.errno_from_exception(e) == errno.EINPROGRESS:
+                                pass
+                            else:
+                                raise e
                         connected = True
                         fdset = [sock, remote]
                     else:
@@ -232,17 +240,12 @@ def handle(self):
                                           socket.TCP_NODELAY, 1)
                         Socks5Server.handle_tcp(sock, remote, encryptor,
                                                 addr_to_send)
-            finally:
-                pass
-            # except socket.error, e:
-            #     raise e
-                # logging.warn(e)
-                # return
-        finally:
-            pass
-        # except socket.error, e:
-        #     raise e
-        #     logging.warn(e)
+            except (OSError, IOError) as e:
+                logging.warn(e)
+                return
+        except (OSError, IOError) as e:
+            raise e
+            logging.warn(e)
 
 
 def main():
