Use traceroute/traceroute6 as required, added config option to allow disabling traceroute6 for IPv4-only nodes
This commit is contained in:
parent
1f4d9423a9
commit
eb91179101
7
lg.py
7
lg.py
@ -332,9 +332,16 @@ def traceroute(hosts, proto=app.config.get("PROTO_DEFAULT", "ipv4")):
|
|||||||
if app.config.get("UNIFIED_DAEMON", False):
|
if app.config.get("UNIFIED_DAEMON", False):
|
||||||
if not ip_is_valid(q):
|
if not ip_is_valid(q):
|
||||||
try:
|
try:
|
||||||
|
if app.config.get("UNIFIED_TRACEROUTE_IPV6", True):
|
||||||
q = resolve_any(q)
|
q = resolve_any(q)
|
||||||
|
else:
|
||||||
|
q = resolve(q, "A")
|
||||||
except:
|
except:
|
||||||
return error_page("%s is unresolvable" % q)
|
return error_page("%s is unresolvable" % q)
|
||||||
|
if ipv6_is_valid(q):
|
||||||
|
proto = "ipv6"
|
||||||
|
else:
|
||||||
|
proto = "ipv4"
|
||||||
else:
|
else:
|
||||||
if proto == "ipv6" and not ipv6_is_valid(q):
|
if proto == "ipv6" and not ipv6_is_valid(q):
|
||||||
try:
|
try:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user