farrokhi/dnsdiag
1
0
Fork 0
Code Issues Pull Requests Releases Activity

show dns flags in fixed columns (fix #18)

Browse Source
This commit is contained in:
Babak Farrokhi 2016-05-25 20:36:14 +04:30
parent 24adbab4aa
commit db90716837
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A
1 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dnseval.py
View File

@ -34,7 +34,6 @@ import sys
import time import time
from statistics import stdev from statistics import stdev
import dns.flags
import dns.rdatatype import dns.rdatatype
import dns.resolver import dns.resolver
@ -70,13 +69,59 @@ def maxlen(names):
return len(sn[-1]) return len(sn[-1])
def _order_flags(table):
return sorted(table.items(), reverse=True)
def flags_to_text(flags):
# Standard DNS flags
QR = 0x8000
AA = 0x0400
TC = 0x0200
RD = 0x0100
RA = 0x0080
AD = 0x0020
CD = 0x0010
# EDNS flags
DO = 0x8000
_by_text = {
'QR': QR,
'AA': AA,
'TC': TC,
'RD': RD,
'RA': RA,
'AD': AD,
'CD': CD
}
_by_value = dict([(y, x) for x, y in _by_text.items()])
_flags_order = _order_flags(_by_value)
_by_value = dict([(y, x) for x, y in _by_text.items()])
order = sorted(_by_value.items(), reverse=True)
text_flags = []
for k, v in order:
if flags & k != 0:
text_flags.append(v)
else:
text_flags.append('--')
return (' '.join(text_flags))
def dnsping(host, server, dnsrecord, timeout, count): def dnsping(host, server, dnsrecord, timeout, count):
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
resolver.nameservers = [server] resolver.nameservers = [server]
resolver.timeout = timeout resolver.timeout = timeout
resolver.lifetime = timeout resolver.lifetime = timeout
resolver.retry_servfail = 0 resolver.retry_servfail = 0
flags = "" flags = 0
answers = None
response_time = [] response_time = []
i = 0 i = 0
@ -95,7 +140,6 @@ def dnsping(host, server, dnsrecord, timeout, count):
else: else:
elapsed = (etime - stime) * 1000 # convert to milliseconds elapsed = (etime - stime) * 1000 # convert to milliseconds
response_time.append(elapsed) response_time.append(elapsed)
flags = dns.flags.to_text(answers.response.flags)
r_sent = i + 1 r_sent = i + 1
r_received = len(response_time) r_received = len(response_time)
@ -115,6 +159,9 @@ def dnsping(host, server, dnsrecord, timeout, count):
r_avg = 0 r_avg = 0
r_stddev = 0 r_stddev = 0
if answers:
flags = answers.response.flags
return (server, r_avg, r_min, r_max, r_stddev, r_lost_percent, flags) return (server, r_avg, r_min, r_max, r_stddev, r_lost_percent, flags)
@ -176,7 +223,7 @@ def main():
width = maxlen(f) width = maxlen(f)
blanks = (width - 5) * ' ' blanks = (width - 5) * ' '
print('server ', blanks, ' avg(ms) min(ms) max(ms) stddev(ms) lost(%) flags') print('server ', blanks, ' avg(ms) min(ms) max(ms) stddev(ms) lost(%) flags')
print((70 + width) * '-') print((82 + width) * '-')
for server in f: for server in f:
# check if we have a valid dns server address # check if we have a valid dns server address
if server.lstrip() == '': # deal with empty lines if server.lstrip() == '': # deal with empty lines
@ -201,8 +248,9 @@ def main():
count) count)
s = server.ljust(width + 1) s = server.ljust(width + 1)
print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d %13s" % ( text_flags = flags_to_text(flags)
s, r_avg, r_min, r_max, r_stddev, r_lost_percent, flags), flush=True) print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d %25s" % (
s, r_avg, r_min, r_max, r_stddev, r_lost_percent, text_flags), flush=True)
except Exception as e: except Exception as e:
print('error: %s' % e) print('error: %s' % e)