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

fix DNS record parsing

Browse source
This commit is contained in:
clowwindy 2014-06-12 16:21:08 +08:00
parent 4fb6b9df98
commit df836bed77
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shadowsocks/asyncdns.py
View file

@ -70,6 +70,7 @@ QTYPE_ANY = 255
QTYPE_A = 1 QTYPE_A = 1
QTYPE_AAAA = 28 QTYPE_AAAA = 28
QTYPE_CNAME = 5 QTYPE_CNAME = 5
QTYPE_NS = 2
QCLASS_IN = 1 QCLASS_IN = 1
@ -99,10 +100,10 @@ def parse_ip(addrtype, data, length, offset):
return socket.inet_ntop(socket.AF_INET, data[offset:offset + length]) return socket.inet_ntop(socket.AF_INET, data[offset:offset + length])
elif addrtype == QTYPE_AAAA: elif addrtype == QTYPE_AAAA:
return socket.inet_ntop(socket.AF_INET6, data[offset:offset + length]) return socket.inet_ntop(socket.AF_INET6, data[offset:offset + length])
elif addrtype == QTYPE_CNAME: elif addrtype in [QTYPE_CNAME, QTYPE_NS]:
return parse_name(data, offset)[1] return parse_name(data, offset)[1]
else: else:
return data return data[offset:offset + length]
def parse_name(data, offset): def parse_name(data, offset):