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

let py2 works

Browse source
This commit is contained in:
破娃酱 2017-05-12 18:52:22 +08:00
parent abe4ac3b90
commit c1f1281b83
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/udprelay.py
View file

@ -142,7 +142,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.params, self.remote_addr, None, ip, True) self.call_back(self.remote_addr, None, ip, True, *self.params)
return return
logging.warning("can't resolve %s" % (self.remote_addr,)) logging.warning("can't resolve %s" % (self.remote_addr,))
@ -409,9 +409,9 @@ class UDPRelay(object):
handler = UDPAsyncDNSHandler((data, r_addr, uid, header_length)) handler = 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(data, r_addr, uid, header_length, (server_addr, server_port), None, server_addr, False) self._handle_server_dns_resolved((server_addr, server_port), None, server_addr, False, data, r_addr, uid, header_length)
def _handle_server_dns_resolved(self, data, r_addr, uid, header_length, remote_addr, addrs, server_addr, dns_resolved): def _handle_server_dns_resolved(self, remote_addr, addrs, server_addr, dns_resolved, data, r_addr, uid, header_length):
try: try:
server_port = remote_addr[1] server_port = remote_addr[1]
if addrs is None: if addrs is None: