river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-10-28 19:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

typos

Browse Source
This commit is contained in:
Jing Ling
2020-08-24 00:45:03 +08:00
parent 2ae7c0ef05
commit e2384a1f5c
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/resolve.py
+20 -23
View File
@@ -79,12 +79,12 @@ def gen_infos(data, qname, info, infos):
cname = list() cname = list()
ips = list() ips = list()
public = list() public = list()
ttls = list() ttl = list()
cidrs = list() cidr = list()
asns = list() asn = list()
orgs = list() org = list()
addrs = list() addr = list()
isps = list() isp = list()
answers = data.get('answers') answers = data.get('answers')
for answer in answers: for answer in answers:
if answer.get('type') == 'A': if answer.get('type') == 'A':
@@ -92,29 +92,26 @@ def gen_infos(data, qname, info, infos):
cname.append(answer.get('name')[:-1]) # 去除最右边的`.`点号 cname.append(answer.get('name')[:-1]) # 去除最右边的`.`点号
ip = answer.get('data') ip = answer.get('data')
ips.append(ip) ips.append(ip)
ttl = answer.get('ttl') ttl.append(str(answer.get('ttl')))
ttls.append(str(ttl)) public.append(str(utils.ip_is_public(ip)))
is_public = utils.ip_is_public(ip)
public.append(str(is_public))
asn_info = ip_asn.find(ip) asn_info = ip_asn.find(ip)
cidrs.append(asn_info.get('cidr')) cidr.append(asn_info.get('cidr'))
asns.append(asn_info.get('asn')) asn.append(asn_info.get('asn'))
orgs.append(asn_info.get('org')) org.append(asn_info.get('org'))
addr = ip_reg.query(ip).get('addr') ip_info = ip_reg.query(ip)
addrs.append(addr) addr.append(ip_info.get('addr'))
isp = ip_reg.query(ip).get('isp') isp.append(ip_info.get('isp'))
isps.append(isp)
info['resolve'] = 1 info['resolve'] = 1
info['reason'] = 'OK' info['reason'] = 'OK'
info['cname'] = ','.join(cname) info['cname'] = ','.join(cname)
info['content'] = ','.join(ips) info['content'] = ','.join(ips)
info['public'] = ','.join(public) info['public'] = ','.join(public)
info['ttl'] = ','.join(ttls) info['ttl'] = ','.join(ttl)
info['cidr'] = ','.join(cidrs) info['cidr'] = ','.join(cidr)
info['asn'] = ','.join(asns) info['asn'] = ','.join(asn)
info['org'] = ','.join(orgs) info['org'] = ','.join(org)
info['addr'] = ','.join(addrs) info['addr'] = ','.join(addr)
info['isp'] = ','.join(isps) info['isp'] = ','.join(isp)
infos[qname] = info infos[qname] = info
if not flag: if not flag:
info['alive'] = 0 info['alive'] = 0