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

fix host_list type

Browse source
This commit is contained in:
BreakWa11 2016-07-28 23:18:18 +08:00
parent f0d6a5b41e
commit 82df4524d1
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
shadowsocks/tcprelay.py
View file

@ -354,19 +354,20 @@ class TCPRelayHandler(object):
host_port = []
match_port = False
if type(host_list) == list:
for host in host_list:
items = common.to_str(host).rsplit(':', 1)
if len(items) > 1:
try:
port = int(items[1])
if port == self._server._listen_port:
match_port = True
host_port.append((items[0], port))
except:
pass
else:
host_port.append((host, 80))
if type(host_list) != list:
host_list = [host_list]
for host in host_list:
items = common.to_str(host).rsplit(':', 1)
if len(items) > 1:
try:
port = int(items[1])
if port == self._server._listen_port:
match_port = True
host_port.append((items[0], port))
except:
pass
else:
host_port.append((host, 80))
if match_port:
last_host_port = host_port