vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

support IPv6 address

Browse source
This commit is contained in:
clowwindy 2013-05-16 11:12:40 +08:00
parent e040b54370
commit db0fc87a22
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
local.py
View file

@ -122,6 +122,10 @@ class Socks5Server(SocketServer.StreamRequestHandler):
addr_len = self.rfile.read(1) addr_len = self.rfile.read(1)
addr = self.rfile.read(ord(addr_len)) addr = self.rfile.read(ord(addr_len))
addr_to_send += addr_len + addr addr_to_send += addr_len + addr
elif addrtype == 4:
addr_ip = self.rfile.read(16)
addr = socket.inet_ntop(socket.AF_INET6, addr_ip)
addr_to_send += addr_ip
else: else:
logging.warn('addr_type not support') logging.warn('addr_type not support')
# not support # not support
@ -155,7 +159,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
if __name__ == '__main__': if __name__ == '__main__':
os.chdir(os.path.dirname(__file__) or '.') os.chdir(os.path.dirname(__file__) or '.')
print 'shadowsocks v1.0' print 'shadowsocks v1.1'
with open('config.json', 'rb') as f: with open('config.json', 'rb') as f:
config = json.load(f) config = json.load(f)

4
server.py
View file

@ -108,6 +108,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
elif addrtype == 3: elif addrtype == 3:
addr = self.decrypt( addr = self.decrypt(
self.rfile.read(ord(self.decrypt(sock.recv(1))))) self.rfile.read(ord(self.decrypt(sock.recv(1)))))
elif addrtype == 4:
addr = socket.inet_ntop(socket.AF_INET6, self.decrypt(self.rfile.read(16)))
else: else:
# not support # not support
logging.warn('addr_type not support') logging.warn('addr_type not support')
@ -129,7 +131,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
if __name__ == '__main__': if __name__ == '__main__':
os.chdir(os.path.dirname(__file__) or '.') os.chdir(os.path.dirname(__file__) or '.')
print 'shadowsocks v1.0' print 'shadowsocks v1.1'
with open('config.json', 'rb') as f: with open('config.json', 'rb') as f:
config = json.load(f) config = json.load(f)