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

fix async DNS

Browse source
This commit is contained in:
破娃酱 2017-06-03 21:47:17 +08:00
parent 7c3d4e01b1
commit 8826f515b6
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/common.py
View file

@ -352,7 +352,7 @@ class UDPAsyncDNSHandler(object):
def resolve(self, dns_resolver, remote_addr, call_back): def resolve(self, dns_resolver, remote_addr, call_back):
if remote_addr in UDPAsyncDNSHandler.dns_cache: if remote_addr in UDPAsyncDNSHandler.dns_cache:
if call_back: if call_back:
call_back(remote_addr, None, UDPAsyncDNSHandler.dns_cache[remote_addr], True, *self.params) call_back(remote_addr, UDPAsyncDNSHandler.dns_cache[remote_addr], self.params)
else: else:
self.call_back = call_back self.call_back = call_back
self.remote_addr = remote_addr self.remote_addr = remote_addr
@ -367,7 +367,7 @@ class UDPAsyncDNSHandler(object):
ip = result[1] ip = result[1]
if ip: if ip:
if self.call_back: if self.call_back:
self.call_back(self.remote_addr, None, ip, True, *self.params) self.call_back(self.remote_addr, ip, self.params)
return return
logging.warning("can't resolve %s" % (self.remote_addr,)) logging.warning("can't resolve %s" % (self.remote_addr,))

6
shadowsocks/tcprelay.py
View file

@ -347,9 +347,9 @@ class TCPRelayHandler(object):
handler = common.UDPAsyncDNSHandler(data[header_length:]) handler = common.UDPAsyncDNSHandler(data[header_length:])
handler.resolve(self._dns_resolver, (dest_addr, dest_port), self._handle_server_dns_resolved) handler.resolve(self._dns_resolver, (dest_addr, dest_port), self._handle_server_dns_resolved)
else: else:
return self._handle_server_dns_resolved(data[header_length:], (dest_addr, dest_port), dest_addr) return self._handle_server_dns_resolved((dest_addr, dest_port), dest_addr, data[header_length:])
else: else:
return self._handle_server_dns_resolved(data[header_length:], (dest_addr, dest_port), dest_addr) return self._handle_server_dns_resolved((dest_addr, dest_port), dest_addr, data[header_length:])
except Exception as e: except Exception as e:
#trace = traceback.format_exc() #trace = traceback.format_exc()
@ -412,7 +412,7 @@ class TCPRelayHandler(object):
logging.error('write_all_to_sock:unknown socket from %s:%d' % (self._client_address[0], self._client_address[1])) logging.error('write_all_to_sock:unknown socket from %s:%d' % (self._client_address[0], self._client_address[1]))
return True return True
def _handle_server_dns_resolved(self, data, remote_addr, server_addr): def _handle_server_dns_resolved(self, remote_addr, server_addr, data):
try: try:
addrs = socket.getaddrinfo(server_addr, remote_addr[1], 0, socket.SOCK_DGRAM, socket.SOL_UDP) addrs = socket.getaddrinfo(server_addr, remote_addr[1], 0, socket.SOCK_DGRAM, socket.SOL_UDP)
if not addrs: # drop if not addrs: # drop

8
shadowsocks/udprelay.py
View file

@ -388,15 +388,15 @@ class UDPRelay(object):
handler = common.UDPAsyncDNSHandler((data, r_addr, uid, header_length)) handler = common.UDPAsyncDNSHandler((data, r_addr, uid, header_length))
handler.resolve(self._dns_resolver, (server_addr, server_port), self._handle_server_dns_resolved) handler.resolve(self._dns_resolver, (server_addr, server_port), self._handle_server_dns_resolved)
else: else:
self._handle_server_dns_resolved((server_addr, server_port), None, server_addr, False, data, r_addr, uid, header_length) self._handle_server_dns_resolved((server_addr, server_port), server_addr, (data, r_addr, uid, header_length))
else: else:
self._handle_server_dns_resolved((server_addr, server_port), None, server_addr, False, data, r_addr, uid, header_length) self._handle_server_dns_resolved((server_addr, server_port), server_addr, (data, r_addr, uid, header_length))
def _handle_server_dns_resolved(self, remote_addr, addrs, server_addr, dns_resolved, data, r_addr, uid, header_length): def _handle_server_dns_resolved(self, remote_addr, server_addr, params):
data, r_addr, uid, header_length = params
user_id = self._listen_port user_id = self._listen_port
try: try:
server_port = remote_addr[1] server_port = remote_addr[1]
if addrs is None:
addrs = socket.getaddrinfo(server_addr, server_port, 0, addrs = socket.getaddrinfo(server_addr, server_port, 0,
socket.SOCK_DGRAM, socket.SOL_UDP) socket.SOCK_DGRAM, socket.SOL_UDP)
if not addrs: # drop if not addrs: # drop