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

compatible python3

Browse source
This commit is contained in:
BreakWa11 2016-06-21 22:42:55 +08:00
parent 44598a070d
commit acb3eb2910
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server_pool.py
View file

@ -123,6 +123,7 @@ class ServerPool(object):
a_config['server'] = a_config['server_ipv6']
a_config['server_port'] = port
a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method'])
try:
logging.info("starting server at [%s]:%d" % (common.to_str(a_config['server']), port))
@ -148,8 +149,9 @@ class ServerPool(object):
a_config.update(user_config)
a_config['server_port'] = port
a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method'])
try:
logging.info("starting server at %s:%d" % (a_config['server'], port))
logging.info("starting server at %s:%d" % (common.to_str(a_config['server']), port))
tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False)
tcp_server.add_to_loop(self.loop)

1
shadowsocks/encrypt.py
View file

@ -75,7 +75,6 @@ def EVP_BytesToKey(password, key_len, iv_len):
class Encryptor(object):
def __init__(self, key, method):
self.key = key
method = common.to_str(method)
self.method = method
self.iv = None
self.iv_sent = False