ipv6 is buggy; revert for now

server.py

@@ -23,12 +23,6 @@
 PORT = 8499
 KEY = "foobar!"
 
-try:
-    import gevent, gevent.monkey
-    gevent.monkey.patch_all(dns=gevent.version_info[0]>=1)
-except ImportError:
-    gevent = None
-
 import socket
 import select
 import SocketServer
@@ -37,35 +31,6 @@ import string
 import hashlib
 import sys
 
-#disable ThreadingTCPServer dns revsere lookup, sometimes it will be slow
-socket.getfqdn = lambda x:x
-
-def socket_create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-                      source_address=None):
-    """python 2.7 socket.create_connection"""
-    host, port = address
-    err = None
-    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
-        af, socktype, proto, canonname, sa = res
-        sock = None
-        try:
-            sock = socket.socket(af, socktype, proto)
-            if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
-                sock.settimeout(timeout)
-            if source_address:
-                sock.bind(source_address)
-            sock.connect(sa)
-            return sock
-
-        except socket.error as _:
-            err = _
-            if sock is not None:
-                sock.close()
-    if err is not None:
-        raise err
-    else:
-        raise socket.error("getaddrinfo returns an empty list")
-
 def get_table(key):
     m = hashlib.md5()
     m.update(key)
@@ -126,7 +91,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
             reply = "\x05\x00\x00\x01"
             try:
                 if mode == 1:
-                    remote = socket_create_connection((addr, port[0]))
+                    remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                    remote.connect((addr, port[0]))
                     local = remote.getsockname()
                     reply += socket.inet_aton(local[0]) + struct.pack(">H",
                         local[1])
@@ -146,8 +112,6 @@ class Socks5Server(SocketServer.StreamRequestHandler):
 
 
 def main():
-    if '-6' in sys.argv[1:]:
-        ThreadingTCPServer.address_family = socket.AF_INET6
     server = ThreadingTCPServer(('', PORT), Socks5Server)
     server.allow_reuse_address = True
     print "starting server at port %d ..." % PORT