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

deal with empty lines in input file (fix #15)

Browse Source
This commit is contained in:
Babak Farrokhi 2016-05-16 14:17:39 +04:30
parent d0db0c62aa
commit c7a602ae4e
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dnseval.py
View File

@ -34,9 +34,9 @@ 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
import dns.flags
__VERSION__ = 1.0 __VERSION__ = 1.0
__PROGNAME__ = os.path.basename(sys.argv[0]) __PROGNAME__ = os.path.basename(sys.argv[0])
@ -179,6 +179,9 @@ def main():
print((70 + width) * '-') print((70 + 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
continue
try: try:
ipaddress.ip_address(server) ipaddress.ip_address(server)
except ValueError: # so it is not a valid IPv4 or IPv6 address, so try to resolve host name except ValueError: # so it is not a valid IPv4 or IPv6 address, so try to resolve host name
@ -193,7 +196,7 @@ def main():
if not s: if not s:
continue continue
(s, r_avg, r_min, r_max, r_stddev, r_lost_percent, flags) = dnsping(hostname, s, dnsrecord, waittime, (s, r_avg, r_min, r_max, r_stddev, r_lost_percent, flags) = dnsping(hostname, s, dnsrecord, waittime,
count) count)
s = server.ljust(width + 1) s = server.ljust(width + 1)
print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d %13s" % ( print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d %13s" % (