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

using '#' to split multi-user setting

Browse source
This commit is contained in:
破娃酱 2017-01-07 01:23:42 +08:00
parent 0ca45be89d
commit b367ad0560
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/obfsplugin/auth.py
View file

@ -1131,7 +1131,7 @@ class auth_aes128_sha1(auth_base):
def set_server_info(self, server_info): def set_server_info(self, server_info):
self.server_info = server_info self.server_info = server_info
try: try:
max_client = int(server_info.protocol_param) max_client = int(server_info.protocol_param.split('#')[0])
except: except:
max_client = 64 max_client = 64
self.server_info.data.set_max_client(max_client) self.server_info.data.set_max_client(max_client)

18
shadowsocks/tcprelay.py
View file

@ -1020,14 +1020,16 @@ class TCPRelay(object):
self._listen_port = listen_port self._listen_port = listen_port
if config['protocol'] in ["auth_aes128_md5", "auth_aes128_sha1"]: if config['protocol'] in ["auth_aes128_md5", "auth_aes128_sha1"]:
user_list = config['protocol_param'].split(',') param = config['protocol_param'].split('#')
if user_list: if len(param) == 2:
for user in user_list: user_list = param[1].split(',')
items = user.split(':') if user_list:
if len(items) == 2: for user in user_list:
uid = struct.pack('<I', int(items[0])) items = user.split(':')
passwd = items[1] if len(items) == 2:
self.add_user(uid, passwd) uid = struct.pack('<I', int(items[0]))
passwd = items[1]
self.add_user(uid, passwd)
addrs = socket.getaddrinfo(listen_addr, listen_port, 0, addrs = socket.getaddrinfo(listen_addr, listen_port, 0,
socket.SOCK_STREAM, socket.SOL_TCP) socket.SOCK_STREAM, socket.SOL_TCP)

18
shadowsocks/udprelay.py
View file

@ -902,14 +902,16 @@ class UDPRelay(object):
self.server_user_transfer_dl = {} self.server_user_transfer_dl = {}
if config['protocol'] in ["auth_aes128_md5", "auth_aes128_sha1"]: if config['protocol'] in ["auth_aes128_md5", "auth_aes128_sha1"]:
user_list = config['protocol_param'].split(',') param = config['protocol_param'].split('#')
if user_list: if len(param) == 2:
for user in user_list: user_list = param[1].split(',')
items = user.split(':') if user_list:
if len(items) == 2: for user in user_list:
uid = struct.pack('<I', int(items[0])) items = user.split(':')
passwd = items[1] if len(items) == 2:
self.add_user(uid, passwd) uid = struct.pack('<I', int(items[0]))
passwd = items[1]
self.add_user(uid, passwd)
self.protocol_data = obfs.obfs(config['protocol']).init_data() self.protocol_data = obfs.obfs(config['protocol']).init_data()
self._protocol = obfs.obfs(config['protocol']) self._protocol = obfs.obfs(config['protocol'])