From 7d8005891ad9e2b1b587085281bb8dbcca113b56 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Thu, 10 May 2012 15:19:24 +0800 Subject: [PATCH] ipv6 version --- local.py | 8 ++++---- server.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/local.py b/local.py index 9753915..2941468 100755 --- a/local.py +++ b/local.py @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -SERVER = 'myserver_ip_or_hostname' +SERVER = '::1' REMOTE_PORT = 8499 PORT = 1080 KEY = "foobar!" @@ -95,11 +95,11 @@ class Socks5Server(SocketServer.StreamRequestHandler): def handle(self): try: sock = self.connection - remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + remote = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) remote.connect((SERVER, REMOTE_PORT)) self.handle_tcp(sock, remote) - except socket.error: - lock_print('socket error') + except socket.error as e: + lock_print('socket error: ' + str(e)) def main(): diff --git a/server.py b/server.py index 6a6043f..94f776c 100755 --- a/server.py +++ b/server.py @@ -42,7 +42,7 @@ def get_table(key): class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): - pass + address_family = socket.AF_INET6 class Socks5Server(SocketServer.StreamRequestHandler):