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

client_key change

Browse source
This commit is contained in:
breakwa11 2015-07-02 15:21:05 +08:00
parent 298e8a06c9
commit f78f5b56e3
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shadowsocks/udprelay.py
View file

@ -159,6 +159,8 @@ class UDPRelay(object):
if not data: if not data:
logging.debug('UDP handle_server: data is empty after decrypt') logging.debug('UDP handle_server: data is empty after decrypt')
return return
if not self._is_local:
data = pre_parse_header(data) data = pre_parse_header(data)
if data is None: if data is None:
return return
@ -170,10 +172,16 @@ class UDPRelay(object):
if self._is_local: if self._is_local:
server_addr, server_port = self._get_a_server() server_addr, server_port = self._get_a_server()
key = client_key(r_addr[0], r_addr[1], dest_addr, dest_port)
else: else:
server_addr, server_port = dest_addr, dest_port server_addr, server_port = dest_addr, dest_port
addrs = socket.getaddrinfo(dest_addr, dest_port, 0, socket.SOCK_DGRAM, socket.SOL_UDP)
if addrs:
af, socktype, proto, canonname, sa = addrs[0]
key = client_key(r_addr[0], r_addr[1], af, 0)
else:
key = None
key = client_key(r_addr[0], r_addr[1], dest_addr, dest_port)
client = self._cache.get(key, None) client = self._cache.get(key, None)
if not client: if not client:
# TODO async getaddrinfo # TODO async getaddrinfo