From f661e878c4acb1f9dafd1745016377b9fa37d2da Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sat, 1 Aug 2020 22:23:09 +0800 Subject: [PATCH] proxy: improve linux fallback logic --- proxy/traceroute.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/proxy/traceroute.go b/proxy/traceroute.go index cb206b6..8122277 100644 --- a/proxy/traceroute.go +++ b/proxy/traceroute.go @@ -94,14 +94,15 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http. []string{ "traceroute", "traceroute", - "busybox", - "busybox", + "traceroute", + "traceroute", }, [][]string{ {"-6", "-q1", "-N32", "-w1", query}, {"-4", "-q1", "-N32", "-w1", query}, - {"traceroute", "-6", "-q1", "-w1", query}, - {"traceroute", "-4", "-q1", "-w1", query}, + // For Busybox traceroute which doesn't support simultaneous requests + {"-6", "-q1", "-w1", query}, + {"-4", "-q1", "-w1", query}, }, ) } else { @@ -109,14 +110,15 @@ func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http. []string{ "traceroute", "traceroute", - "busybox", - "busybox", + "traceroute", + "traceroute", }, [][]string{ {"-4", "-q1", "-N32", "-w1", query}, {"-6", "-q1", "-N32", "-w1", query}, - {"traceroute", "-4", "-q1", "-w1", query}, - {"traceroute", "-6", "-q1", "-w1", query}, + // For Busybox traceroute which doesn't support simultaneous requests + {"-4", "-q1", "-w1", query}, + {"-6", "-q1", "-w1", query}, }, ) }