Use traceroute/traceroute6 as required, added config option to allow disabling traceroute6 for IPv4-only nodes

This commit is contained in:
TimStallard 2019-01-30 18:33:10 +00:00
parent 1f4d9423a9
commit eb91179101
No known key found for this signature in database
GPG Key ID: E18E975C6A734F07

7
lg.py
View File

@ -332,9 +332,16 @@ def traceroute(hosts, proto=app.config.get("PROTO_DEFAULT", "ipv4")):
if app.config.get("UNIFIED_DAEMON", False):
if not ip_is_valid(q):
try:
if app.config.get("UNIFIED_TRACEROUTE_IPV6", True):
q = resolve_any(q)
else:
q = resolve(q, "A")
except:
return error_page("%s is unresolvable" % q)
if ipv6_is_valid(q):
proto = "ipv6"
else:
proto = "ipv4"
else:
if proto == "ipv6" and not ipv6_is_valid(q):
try: