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

add -4 and -6 to enforce network layer protocol (closes #9)

Browse Source
This commit is contained in:
Babak Farrokhi 2016-05-04 13:05:02 +04:30
parent 850e522bbd
commit 2af22d5535
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dnsping.py
View File

@ -51,6 +51,8 @@ usage: %s [-h] [-q] [-v] [-s server] [-p port] [-P port] [-S address] [-c count]
-s --server DNS server to use (default: 8.8.8.8) -s --server DNS server to use (default: 8.8.8.8)
-p --port DNS server port number (default: 53) -p --port DNS server port number (default: 53)
-T --tcp Use TCP instead of UDP -T --tcp Use TCP instead of UDP
-4 --ipv4 Use IPv4 as default network protocol
-6 --ipv6 Use IPv6 as default network protocol
-P --srcport Query source port number (default: 0) -P --srcport Query source port number (default: 0)
-S --srcip Query source IP address (default: default interface address) -S --srcip Query source IP address (default: default interface address)
-c --count Number of requests to send (default: 10) -c --count Number of requests to send (default: 10)
@ -88,12 +90,13 @@ def main():
src_port = 0 src_port = 0
src_ip = None src_ip = None
use_tcp = False use_tcp = False
af = None
hostname = 'wikipedia.org' hostname = 'wikipedia.org'
try: try:
opts, args = getopt.getopt(sys.argv[1:], "qhc:s:t:w:vp:P:S:T", opts, args = getopt.getopt(sys.argv[1:], "qhc:s:t:w:vp:P:S:T46",
["help", "output=", "count=", "server=", "quiet", "type=", "wait=", "verbose", ["help", "output=", "count=", "server=", "quiet", "type=", "wait=", "verbose",
"port", "dstport=", "srcip=", "tcp"]) "port", "dstport=", "srcip=", "tcp", "ipv4", "ipv6"])
except getopt.GetoptError as err: except getopt.GetoptError as err:
# print help information and exit: # print help information and exit:
print(err) # will print something like "option -a not recognized" print(err) # will print something like "option -a not recognized"
@ -124,6 +127,10 @@ def main():
dnsrecord = a dnsrecord = a
elif o in ("-T", "--tcp"): elif o in ("-T", "--tcp"):
use_tcp = True use_tcp = True
elif o in ("-4", "--ipv4"):
af = socket.AF_INET
elif o in ("-6", "--ipv6"):
af = socket.AF_INET6
elif o in ("-P", "--srcport"): elif o in ("-P", "--srcport"):
src_port = int(a) src_port = int(a)
if src_port < 1024: if src_port < 1024:
@ -160,7 +167,7 @@ def main():
break break
try: try:
stime = time.time() stime = time.time()
answers = resolver.query(hostname, dnsrecord, source_port=src_port, source=src_ip, tcp=use_tcp) answers = resolver.query(hostname, dnsrecord, source_port=src_port, source=src_ip, tcp=use_tcp, af=af)
etime = time.time() etime = time.time()
except dns.resolver.NoNameservers as e: except dns.resolver.NoNameservers as e:
if not quiet: if not quiet:

2
dnspython

@ -1 +1 @@
Subproject commit 4838bae1b75e3a33f3723f1f09eacbaaccd51640 Subproject commit bc7445dcd5fe3917f96cac07c7b1f2f645699204