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

refine redirect (#147)

Browse source 
refine redirect, forbidden list will not work when redirect rule work
This commit is contained in:
glzjin 2016-12-27 02:20:38 -06:00 • committed by 破娃酱
parent c7815a0ee8
commit 5bd61e1bfb
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/tcprelay.py
View file

@ -152,6 +152,7 @@ class TCPRelayHandler(object):
self._protocol.set_server_info(server_info) self._protocol.set_server_info(server_info)
self._redir_list = config.get('redirect', ["*#0.0.0.0:0"]) self._redir_list = config.get('redirect', ["*#0.0.0.0:0"])
self._is_redirect = False
self._bind = config.get('out_bind', '') self._bind = config.get('out_bind', '')
self._bindv6 = config.get('out_bindv6', '') self._bindv6 = config.get('out_bindv6', '')
self._ignore_bind_list = config.get('ignore_bind', []) self._ignore_bind_list = config.get('ignore_bind', [])
@ -427,6 +428,7 @@ class TCPRelayHandler(object):
if port == 0: if port == 0:
raise Exception('can not parse header') raise Exception('can not parse header')
data = b"\x03" + common.to_bytes(common.chr(len(host))) + common.to_bytes(host) + struct.pack('>H', port) data = b"\x03" + common.to_bytes(common.chr(len(host))) + common.to_bytes(host) + struct.pack('>H', port)
self._is_redirect = True
logging.warn("TCP data redir %s:%d %s" % (host, port, binascii.hexlify(data))) logging.warn("TCP data redir %s:%d %s" % (host, port, binascii.hexlify(data)))
return data + ogn_data return data + ogn_data
@ -596,7 +598,7 @@ class TCPRelayHandler(object):
if len(addrs) == 0: if len(addrs) == 0:
raise Exception("getaddrinfo failed for %s:%d" % (ip, port)) raise Exception("getaddrinfo failed for %s:%d" % (ip, port))
af, socktype, proto, canonname, sa = addrs[0] af, socktype, proto, canonname, sa = addrs[0]
if not self._remote_udp: if not self._remote_udp and not self._is_redirect:
if self._forbidden_iplist: if self._forbidden_iplist:
if common.to_str(sa[0]) in self._forbidden_iplist: if common.to_str(sa[0]) in self._forbidden_iplist:
if self._remote_address: if self._remote_address: