From af78f35770d783d9807dc93051a4c95d3defbc3e Mon Sep 17 00:00:00 2001 From: Su Haris Date: Sun, 3 Sep 2023 21:23:25 +0530 Subject: [PATCH 1/2] Improve Network Information (#70) * Add Asian Location: Biznet ID * Improve the Network Information Sometimes from ip-api, either ISP or ASN is available, but it would not show since the condition is not satisfied. Fix to show if either value is present * Fix spacing issue --- yabs.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yabs.sh b/yabs.sh index f16e656..bfa18fe 100644 --- a/yabs.sh +++ b/yabs.sh @@ -12,7 +12,7 @@ # performance via fio. The script is designed to not require any dependencies # - either compiled or installed - nor admin privileges to run. -YABS_VERSION="v2023-04-23" +YABS_VERSION="v2023-07-08" echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# Yet-Another-Bench-Script #' @@ -298,9 +298,15 @@ function ip_info() { echo "$net_type Network Information:" echo "---------------------------------" - if [[ -n "$isp" && -n "$as" ]]; then + if [[ -n "$isp" ]]; then echo "ISP : $isp" + else + echo "ISP : Unknown" + fi + if [[ -n "$as" ]]; then echo "ASN : $as" + else + echo "ASN : Unknown" fi if [[ -n "$org" ]]; then echo "Host : $org" @@ -818,6 +824,7 @@ if [ -z "$SKIP_IPERF" ]; then "nyc.speedtest.clouvider.net" "5200-5209" "Clouvider" "NYC, NY, US (10G)" "IPv4|IPv6" \ "dal.speedtest.clouvider.net" "5200-5209" "Clouvider" "Dallas, TX, US (10G)" "IPv4|IPv6" \ "la.speedtest.clouvider.net" "5200-5209" "Clouvider" "Los Angeles, CA, US (10G)" "IPv4|IPv6" \ + "iperf.biznetnetworks.com" "5201-5203" "Biznet" "Jakarta, ID (10G)" "IPv4|IPv6" ) # if the "REDUCE_NET" flag is activated, then do a shorter iperf test with only three locations From b0a8c299051903e16bf928c4f5056f78a43ac71f Mon Sep 17 00:00:00 2001 From: Mason Rowe Date: Wed, 6 Sep 2023 10:30:41 -0400 Subject: [PATCH 2/2] Remove unstable iperf3 server --- yabs.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yabs.sh b/yabs.sh index bfa18fe..b4d3e66 100644 --- a/yabs.sh +++ b/yabs.sh @@ -1,7 +1,7 @@ #!/bin/bash # Yet Another Bench Script by Mason Rowe -# Initial Oct 2019; Last update Apr 2023 +# Initial Oct 2019; Last update Sep 2023 # Disclaimer: This project is a work in progress. Any errors or suggestions should be # relayed to me via the GitHub project page linked below. @@ -12,7 +12,7 @@ # performance via fio. The script is designed to not require any dependencies # - either compiled or installed - nor admin privileges to run. -YABS_VERSION="v2023-07-08" +YABS_VERSION="v2023-09-06" echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# Yet-Another-Bench-Script #' @@ -823,8 +823,7 @@ if [ -z "$SKIP_IPERF" ]; then "speedtest.uztelecom.uz" "5200-5207" "Uztelecom" "Tashkent, UZ (10G)" "IPv4|IPv6" \ "nyc.speedtest.clouvider.net" "5200-5209" "Clouvider" "NYC, NY, US (10G)" "IPv4|IPv6" \ "dal.speedtest.clouvider.net" "5200-5209" "Clouvider" "Dallas, TX, US (10G)" "IPv4|IPv6" \ - "la.speedtest.clouvider.net" "5200-5209" "Clouvider" "Los Angeles, CA, US (10G)" "IPv4|IPv6" \ - "iperf.biznetnetworks.com" "5201-5203" "Biznet" "Jakarta, ID (10G)" "IPv4|IPv6" + "la.speedtest.clouvider.net" "5200-5209" "Clouvider" "Los Angeles, CA, US (10G)" "IPv4|IPv6" ) # if the "REDUCE_NET" flag is activated, then do a shorter iperf test with only three locations