From fe9a7f8fe4a6cb874c5e8b39afbe5e7c563d4864 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Tue, 28 Jan 2014 16:55:36 +0100 Subject: [PATCH] Use traceroute{,6} on BSD instead of traceroute -{4,6} --- lg-proxy.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lg-proxy.py b/lg-proxy.py index b40f048..d533d87 100644 --- a/lg-proxy.py +++ b/lg-proxy.py @@ -57,14 +57,21 @@ def check_accesslist(): def traceroute(): check_accesslist() + if sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd') or sys.platform.startswith('openbsd'): + traceroute4 = [ 'traceroute' ] + traceroute6 = [ 'traceroute6' ] + else: # For Linux + traceroute4 = [ 'traceroute', '-4' ] + traceroute6 = [ 'traceroute', '-6' ] + src = [] if request.path == '/traceroute6': - o = "-6" + traceroute = traceroute6 if app.config.get("IPV6_SOURCE",""): src = [ "-s", app.config.get("IPV6_SOURCE") ] else: - o = "-4" + traceroute = traceroute4 if app.config.get("IPV4_SOURCE",""): src = [ "-s", app.config.get("IPV4_SOURCE") ] @@ -77,7 +84,7 @@ def traceroute(): options = [ '-A', '-q1', '-w1', '-m15' ] else: # For Linux options = [ '-A', '-q1', '-N32', '-w1', '-m15' ] - command = [ 'traceroute' , o ] + src + options + [ query ] + command = traceroute + src + options + [ query ] result = subprocess.Popen( command , stdout=subprocess.PIPE).communicate()[0].decode('utf-8', 'ignore').replace("\n","
") return result