mii/sindan-client
1
0
Fork 0
mirror of https://github.com/mii443/sindan-client.git synced 2025-08-23 00:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed measurement group from IPv46 to Dualstack.

Browse Source
This commit is contained in:
Yoshiaki KITAGUCHI
2020-07-28 20:15:12 +09:00
parent bf739ae99f
commit e08e1628f7
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
linux/sindan.sh
View File

@ -1539,12 +1539,11 @@ cmdset_speedindex() {
fi fi
local layer=$1 local layer=$1
local ver=$2 local ver=$2
local ipv=IPv${ver}
local type=$3 local type=$3
local target=$4 local target=$4
local count=$5 local count=$5
local result=$FAIL local result=$FAIL
local string=" speedindex to extarnal server: $target by $ipv" local string=" speedindex to extarnal server: $target by $ver"
local speedindex_ans local speedindex_ans
if speedindex_ans=$(do_speedindex ${target}); then if speedindex_ans=$(do_speedindex ${target}); then
@ -1552,7 +1551,7 @@ cmdset_speedindex() {
else else
stat=$? stat=$?
fi fi
write_json "$layer" "$ipv" "v${ver}speedindex" "$result" "$target" \ write_json "$layer" "$ver" speedindex "$result" "$target" \
"$speedindex_ans" "$count" "$speedindex_ans" "$count"
if [ "$result" = "$SUCCESS" ]; then if [ "$result" = "$SUCCESS" ]; then
string="$string\n status: ok, speed index value: $speedindex_ans" string="$string\n status: ok, speed index value: $speedindex_ans"
@ -1640,12 +1639,11 @@ cmdset_speedtest() {
fi fi
local layer=$1 local layer=$1
local ver=$2 local ver=$2
local ipv=IPv${ver}
local type=$3 local type=$3
local target=$4 local target=$4
local count=$5 local count=$5
local result=$FAIL local result=$FAIL
local string=" speedtest to extarnal server: $target by $ipv" local string=" speedtest to extarnal server: $target by $ver"
local speedtest_ans local speedtest_ans
local ipv4_rtt; local ipv4_jit; local ipv4_dl; local ipv4_ul local ipv4_rtt; local ipv4_jit; local ipv4_dl; local ipv4_ul
local ipv6_rtt; local ipv6_jit; local ipv6_dl; local ipv6_ul local ipv6_rtt; local ipv6_jit; local ipv6_dl; local ipv6_ul
@ -1657,43 +1655,45 @@ cmdset_speedtest() {
fi fi
if [ "$result" = "$SUCCESS" ]; then if [ "$result" = "$SUCCESS" ]; then
string="$string\n status: ok" string="$string\n status: ok"
write_json "$layer" "$ver" speedtest "$result" "$target" \
"$speedtest_ans" "$count"
if ipv4_rtt=$(echo "$speedtest_ans" | get_speedtest_ipv4_rtt); then if ipv4_rtt=$(echo "$speedtest_ans" | get_speedtest_ipv4_rtt); then
write_json "$layer" "ipv4" "v4speedtest_rtt" "$result" "$target" \ write_json "$layer" IPv4 v4speedtest_rtt "$INFO" "$target" \
"$ipv4_rtt" "$count" "$ipv4_rtt" "$count"
string="$string\n IPv4 RTT: $ipv4_rtt ms" string="$string\n IPv4 RTT: $ipv4_rtt ms"
fi fi
if ipv4_jit=$(echo "$speedtest_ans" | get_speedtest_ipv4_jit); then if ipv4_jit=$(echo "$speedtest_ans" | get_speedtest_ipv4_jit); then
write_json "$layer" "ipv4" "v4speedtest_jit" "$result" "$target" \ write_json "$layer" IPv4 v4speedtest_jitter "$INFO" "$target" \
"$ipv4_jit" "$count" "$ipv4_jit" "$count"
string="$string\n IPv4 Jitter: $ipv4_jit ms" string="$string\n IPv4 Jitter: $ipv4_jit ms"
fi fi
if ipv4_dl=$(echo "$speedtest_ans" | get_speedtest_ipv4_dl); then if ipv4_dl=$(echo "$speedtest_ans" | get_speedtest_ipv4_dl); then
write_json "$layer" "ipv4" "v4speedtest_dl" "$result" "$target" \ write_json "$layer" IPv4 v4speedtest_download "$INFO" "$target" \
"$ipv4_dl" "$count" "$ipv4_dl" "$count"
string="$string\n IPv4 Download Speed: $ipv4_dl Mbps" string="$string\n IPv4 Download Speed: $ipv4_dl Mbps"
fi fi
if ipv4_ul=$(echo "$speedtest_ans" | get_speedtest_ipv4_ul); then if ipv4_ul=$(echo "$speedtest_ans" | get_speedtest_ipv4_ul); then
write_json "$layer" "ipv4" "v4speedtest_ul" "$result" "$target" \ write_json "$layer" IPv4 v4speedtest_upload "$INFO" "$target" \
"$ipv4_ul" "$count" "$ipv4_ul" "$count"
string="$string\n IPv4 Upload Speed: $ipv4_ul Mbps" string="$string\n IPv4 Upload Speed: $ipv4_ul Mbps"
fi fi
if ipv6_rtt=$(echo "$speedtest_ans" | get_speedtest_ipv6_rtt); then if ipv6_rtt=$(echo "$speedtest_ans" | get_speedtest_ipv6_rtt); then
write_json "$layer" "ipv6" "v6speedtest_rtt" "$result" "$target" \ write_json "$layer" IPv6 v6speedtest_rtt "$INFO" "$target" \
"$ipv6_rtt" "$count" "$ipv6_rtt" "$count"
string="$string\n IPv6 RTT: $ipv6_rtt ms" string="$string\n IPv6 RTT: $ipv6_rtt ms"
fi fi
if ipv6_jit=$(echo "$speedtest_ans" | get_speedtest_ipv6_jit); then if ipv6_jit=$(echo "$speedtest_ans" | get_speedtest_ipv6_jit); then
write_json "$layer" "ipv6" "v6speedtest_jit" "$result" "$target" \ write_json "$layer" IPv6 v6speedtest_jitter "$INFO" "$target" \
"$ipv6_jit" "$count" "$ipv6_jit" "$count"
string="$string\n IPv6 Jitter: $ipv6_jit ms" string="$string\n IPv6 Jitter: $ipv6_jit ms"
fi fi
if ipv6_dl=$(echo "$speedtest_ans" | get_speedtest_ipv6_dl); then if ipv6_dl=$(echo "$speedtest_ans" | get_speedtest_ipv6_dl); then
write_json "$layer" "ipv6" "v6speedtest_dl" "$result" "$target" \ write_json "$layer" IPv6 v6speedtest_download "$INFO" "$target" \
"$ipv6_dl" "$count" "$ipv6_dl" "$count"
string="$string\n IPv6 Download Speed: $ipv6_dl Mbps" string="$string\n IPv6 Download Speed: $ipv6_dl Mbps"
fi fi
if ipv6_ul=$(echo "$speedtest_ans" | get_speedtest_ipv6_ul); then if ipv6_ul=$(echo "$speedtest_ans" | get_speedtest_ipv6_ul); then
write_json "$layer" "ipv6" "v6speedtest_ul" "$result" "$target" \ write_json "$layer" IPv6 v6speedtest_upload "$INFO" "$target" \
"$ipv6_ul" "$count" "$ipv6_ul" "$count"
string="$string\n IPv6 Upload Speed: $ipv6_ul Mbps" string="$string\n IPv6 Upload Speed: $ipv6_ul Mbps"
fi fi
@ -2591,7 +2591,7 @@ if [ "$v4addr_type" = "private" ] || [ "$v4addr_type" = "grobal" ] || \
for target in $(echo "$SI_SRVS" | sed 's/,/ /g'); do for target in $(echo "$SI_SRVS" | sed 's/,/ /g'); do
# Do speedindex # Do speedindex
cmdset_speedindex "$layer" 46 speedidsrv "$target" "$count" cmdset_speedindex "$layer" Dualstack speedidsrv "$target" "$count"
count=$(( count + 1 )) count=$(( count + 1 ))
done done
@ -2604,7 +2604,7 @@ if [ "$v4addr_type" = "private" ] || [ "$v4addr_type" = "grobal" ] || \
for target in $(echo "$ST_SRVS" | sed 's/,/ /g'); do for target in $(echo "$ST_SRVS" | sed 's/,/ /g'); do
# Do speedtest # Do speedtest
cmdset_speedtest "$layer" 46 speedtssrv "$target" "$count" cmdset_speedtest "$layer" Dualstack speedtssrv "$target" "$count"
count=$(( count + 1 )) count=$(( count + 1 ))
done done