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

accept hostname as dns server in file (closes #12)

Browse Source
This commit is contained in:
Babak Farrokhi 2016-05-07 15:08:15 +04:30
parent 30d2adbb10
commit 6b246a71d3
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dnseval.py
View File

@ -26,8 +26,10 @@
import getopt import getopt
import ipaddress
import os import os
import signal import signal
import socket
import sys import sys
import time import time
from statistics import stdev from statistics import stdev
@ -173,14 +175,26 @@ def main():
print('server ', blanks, ' avg(ms) min(ms) max(ms) stddev(ms) lost(%)') print('server ', blanks, ' avg(ms) min(ms) max(ms) stddev(ms) lost(%)')
print((60 + width) * '-') print((60 + width) * '-')
for server in f: for server in f:
if not server: # check if we have a valid dns server address
try:
ipaddress.ip_address(server)
except ValueError: # so it is not a valid IPv4 or IPv6 address, so try to resolve host name
try:
s = socket.getaddrinfo(server, port=None)[1][4][0]
except OSError:
print('Error: cannot resolve hostname:', server)
s = None
else:
s = server
if not s:
continue continue
(server, r_avg, r_min, r_max, r_stddev, r_lost_percent) = dnsping(hostname, server, dnsrecord, waittime, (s, r_avg, r_min, r_max, r_stddev, r_lost_percent) = dnsping(hostname, s, dnsrecord, waittime,
count) count)
server = server.ljust(width + 1) s = server.ljust(width + 1)
print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d" % ( print("%s %-8.3f %-8.3f %-8.3f %-8.3f %%%d" % (
server, r_avg, r_min, r_max, r_stddev, r_lost_percent), flush=True) s, r_avg, r_min, r_max, r_stddev, r_lost_percent), flush=True)
except Exception as e: except Exception as e:
print('error: %s' % e) print('error: %s' % e)