From e1d69d3897b206d0fd4c110a4f0eb4311f72d53f Mon Sep 17 00:00:00 2001 From: Max Amanshauser Date: Thu, 3 Dec 2015 18:16:46 +0100 Subject: [PATCH 1/2] Timeout after 10 seconds to speed up the test on slow routes --- auto-reroute.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-reroute.sh b/auto-reroute.sh index fef074b..2156a04 100755 --- a/auto-reroute.sh +++ b/auto-reroute.sh @@ -121,7 +121,7 @@ fi ((count++)) echo "Testing single segment download speed from ${route_names[$count]}..." ##need sed now because some european versions of curl insert a , in the speed results - messyspeed=$(echo -n "scale=2; " && curl -4 -s -L ${test_files[$count]} -w "%{speed_download}" -o /dev/null | sed "s/\,/\./g") + messyspeed=$(echo -n "scale=2; " && curl -4 -s -L ${test_files[$count]} -w "%{speed_download}" -m 10 -o /dev/null | sed "s/\,/\./g") if [ -z "$(echo $messyspeed | awk -F\; '{print $2}'| sed 's/ //g')" ]; then echo "There was an issue downloading ${test_files[$count]}" speed="0" From b536f5c001237b05fefd9a90c60ec35f329e71e0 Mon Sep 17 00:00:00 2001 From: Max Amanshauser Date: Thu, 17 Dec 2015 20:48:41 +0100 Subject: [PATCH 2/2] small "improvements" --- auto-reroute.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auto-reroute.sh b/auto-reroute.sh index 2156a04..2bd02af 100755 --- a/auto-reroute.sh +++ b/auto-reroute.sh @@ -101,7 +101,7 @@ mkdir -p ~/.auto-reroute if [ $(curl -4 -s https://network.feral.io/reroute | grep checked | grep -c 0.0.0.0) = 0 ]; then echo "Starting off by setting route to default to ensure accurate results." old_route=$(curl -4 -s https://network.feral.io/reroute | grep checked | awk '{print $(NF-1)}' | sed 's|value=||g' | sed 's/"//g') - timeout 10 curl -4 'https://network.feral.io/reroute' --data "nh=0.0.0.0" >/dev/null 2>&1 + curl -m 10 -4 'https://network.feral.io/reroute' --data "nh=0.0.0.0" >/dev/null 2>&1 if [ $? = 124 ]; then echo "there seems to be an issue with the reroute page..." error_exit @@ -111,6 +111,7 @@ if [ $(curl -4 -s https://network.feral.io/reroute | grep checked | grep -c 0.0. route_set=1 while [ $route_set = 1 ]; do route_set=$(curl -4 -s "https://network.feral.io/looking-glass?action=traceroute&host=$ext_IP" | grep -c "$old_route") + sleep 2 done else echo "You are currently using the default route"