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

DNS request ipv6 first

Browse source
This commit is contained in:
BreakWa11 2015-10-26 16:37:27 +08:00
parent 6ee8035735
commit c8423e360d
4 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server.py
View file

@ -3,7 +3,8 @@ import time
import sys import sys
import threading import threading
import os import os
os.chdir(os.path.split(os.path.realpath(__file__))[0])
os.chdir(os.path.dirname(os.path.realpath(__file__)))
import server_pool import server_pool
import db_transfer import db_transfer

44
shadowsocks/asyncdns.py
View file

@ -24,6 +24,13 @@ import struct
import re import re
import logging import logging
if __name__ == '__main__':
import sys
try:
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
except:
sys.path.insert(0, os.path.join(sys.path[0], '../'))
from shadowsocks import common, lru_cache, eventloop, shell from shadowsocks import common, lru_cache, eventloop, shell
@ -71,6 +78,17 @@ QTYPE_CNAME = 5
QTYPE_NS = 2 QTYPE_NS = 2
QCLASS_IN = 1 QCLASS_IN = 1
def detect_ipv6_supprot():
if 'has_ipv6' in dir(socket):
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
try:
s.connect(('ipv6.google.com', 0))
return True
except:
pass
return False
IPV6_CONNECTION_SUPPORT = detect_ipv6_supprot()
def build_address(address): def build_address(address):
address = address.strip(b'.') address = address.strip(b'.')
@ -338,17 +356,17 @@ class DNSResolver(object):
answer[2] == QCLASS_IN: answer[2] == QCLASS_IN:
ip = answer[0] ip = answer[0]
break break
if not ip and self._hostname_status.get(hostname, STATUS_IPV6) \ if not ip and self._hostname_status.get(hostname, STATUS_IPV4) \
== STATUS_IPV4: == STATUS_IPV6:
self._hostname_status[hostname] = STATUS_IPV6 self._hostname_status[hostname] = STATUS_IPV4
self._send_req(hostname, QTYPE_AAAA) self._send_req(hostname, QTYPE_A)
else: else:
if ip: if ip:
self._cache[hostname] = ip self._cache[hostname] = ip
self._call_callback(hostname, ip) self._call_callback(hostname, ip)
elif self._hostname_status.get(hostname, None) == STATUS_IPV6: elif self._hostname_status.get(hostname, None) == STATUS_IPV4:
for question in response.questions: for question in response.questions:
if question[1] == QTYPE_AAAA: if question[1] == QTYPE_A:
self._call_callback(hostname, None) self._call_callback(hostname, None)
break break
@ -414,14 +432,21 @@ class DNSResolver(object):
return return
arr = self._hostname_to_cb.get(hostname, None) arr = self._hostname_to_cb.get(hostname, None)
if not arr: if not arr:
self._hostname_status[hostname] = STATUS_IPV4 if IPV6_CONNECTION_SUPPORT:
self._send_req(hostname, QTYPE_A) self._hostname_status[hostname] = STATUS_IPV6
self._send_req(hostname, QTYPE_AAAA)
else:
self._hostname_status[hostname] = STATUS_IPV4
self._send_req(hostname, QTYPE_A)
self._hostname_to_cb[hostname] = [callback] self._hostname_to_cb[hostname] = [callback]
self._cb_to_hostname[callback] = hostname self._cb_to_hostname[callback] = hostname
else: else:
arr.append(callback) arr.append(callback)
# TODO send again only if waited too long # TODO send again only if waited too long
self._send_req(hostname, QTYPE_A) if IPV6_CONNECTION_SUPPORT:
self._send_req(hostname, QTYPE_AAAA)
else:
self._send_req(hostname, QTYPE_A)
def close(self): def close(self):
if self._sock: if self._sock:
@ -479,3 +504,4 @@ def test():
if __name__ == '__main__': if __name__ == '__main__':
test() test()

9
shadowsocks/local.py
View file

@ -23,7 +23,14 @@ import os
import logging import logging
import signal import signal
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../')) if __name__ == '__main__':
try:
os.chdir(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
except:
os.chdir(os.path.dirname(sys.path[0]))
sys.path.insert(0, os.path.join(sys.path[0], '../'))
from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns

9
shadowsocks/server.py
View file

@ -23,7 +23,14 @@ import os
import logging import logging
import signal import signal
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../')) if __name__ == '__main__':
try:
os.chdir(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
except:
os.chdir(os.path.dirname(sys.path[0]))
sys.path.insert(0, os.path.join(sys.path[0], '../'))
from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, \ from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, \
asyncdns, manager asyncdns, manager