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

compatible with py2exe; lint code

Browse source
This commit is contained in:
clowwindy 2013-06-13 01:01:33 +08:00
parent cb26bb96ca
commit f18d6cd2f8
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server.py
View file

@ -105,7 +105,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
addr = self.decrypt(
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)))
addr = socket.inet_ntop(socket.AF_INET6,
self.decrypt(self.rfile.read(16)))
else:
# not support
logging.warn('addr_type not support')
@ -147,7 +148,8 @@ if __name__ == '__main__':
elif key == '-6':
IPv6 = True
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s',
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)-8s %(message)s',
datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
encrypt.init_table(KEY, METHOD)