Merge branch 'masonr:master' into master

This commit is contained in:
Sherlock Zhang 2023-09-20 18:55:08 +08:00 committed by GitHub
commit 4f29c5002e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

14
yabs.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Yet Another Bench Script by Mason Rowe # 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 # Disclaimer: This project is a work in progress. Any errors or suggestions should be
# relayed to me via the GitHub project page linked below. # 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 # performance via fio. The script is designed to not require any dependencies
# - either compiled or installed - nor admin privileges to run. # - either compiled or installed - nor admin privileges to run.
YABS_VERSION="v2023-04-23" YABS_VERSION="v2023-09-06"
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e '# Yet-Another-Bench-Script #' echo -e '# Yet-Another-Bench-Script #'
@ -298,9 +298,15 @@ function ip_info() {
echo "$net_type Network Information:" echo "$net_type Network Information:"
echo "---------------------------------" echo "---------------------------------"
if [[ -n "$isp" && -n "$as" ]]; then if [[ -n "$isp" ]]; then
echo "ISP : $isp" echo "ISP : $isp"
else
echo "ISP : Unknown"
fi
if [[ -n "$as" ]]; then
echo "ASN : $as" echo "ASN : $as"
else
echo "ASN : Unknown"
fi fi
if [[ -n "$org" ]]; then if [[ -n "$org" ]]; then
echo "Host : $org" echo "Host : $org"
@ -817,7 +823,7 @@ if [ -z "$SKIP_IPERF" ]; then
"speedtest.uztelecom.uz" "5200-5207" "Uztelecom" "Tashkent, UZ (10G)" "IPv4|IPv6" \ "speedtest.uztelecom.uz" "5200-5207" "Uztelecom" "Tashkent, UZ (10G)" "IPv4|IPv6" \
"nyc.speedtest.clouvider.net" "5200-5209" "Clouvider" "NYC, NY, US (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" \ "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" \ "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 # if the "REDUCE_NET" flag is activated, then do a shorter iperf test with only three locations