fix(run.sh): fix script exiting on command failure
This commit is contained in:
@@ -51,6 +51,7 @@ func cleanServerName(server string) string {
|
|||||||
"149.112.112.112": "quad9",
|
"149.112.112.112": "quad9",
|
||||||
"dns.quad9.net": "quad9",
|
"dns.quad9.net": "quad9",
|
||||||
"dns10.quad9.net": "quad9",
|
"dns10.quad9.net": "quad9",
|
||||||
|
"AQMAAAAAAAAAFDE0OS4xMTIuMTEyLjExMjo4NDQzIGfIR7jIdYzRICRVQ751Z0bfNN8dhMALjEcDaN-CHYY-GTIuZG5zY3J5cHQtY2VydC5xdWFkOS5uZXQ": "quad9",
|
||||||
"208.67.222.222": "opendns",
|
"208.67.222.222": "opendns",
|
||||||
"208.67.220.220": "opendns",
|
"208.67.220.220": "opendns",
|
||||||
"resolver1.opendns.com": "opendns",
|
"resolver1.opendns.com": "opendns",
|
||||||
|
|||||||
44
run.sh
44
run.sh
@@ -70,30 +70,36 @@ echo ""
|
|||||||
|
|
||||||
# Connection-based protocols that benefit from keep-alive (TCP-based)
|
# Connection-based protocols that benefit from keep-alive (TCP-based)
|
||||||
CONN_SERVERS=(
|
CONN_SERVERS=(
|
||||||
-s "tls://8.8.8.8:853"
|
-s "dotcp://8.8.8.8:53"
|
||||||
-s "tls://1.1.1.1:853"
|
-s "dotcp://1.1.1.1:53"
|
||||||
-s "tls://9.9.9.9:853"
|
-s "dotcp://9.9.9.9:53"
|
||||||
-s "tls://dns.adguard-dns.com:853"
|
-s "dotcp://dns.adguard-dns.com:53"
|
||||||
-s "https://dns.google/dns-query"
|
#-s "tls://8.8.8.8:853"
|
||||||
-s "https://cloudflare-dns.com/dns-query"
|
#-s "tls://1.1.1.1:853"
|
||||||
-s "https://dns10.quad9.net/dns-query"
|
#-s "tls://9.9.9.9:853"
|
||||||
-s "https://dns.adguard-dns.com/dns-query"
|
#-s "tls://dns.adguard-dns.com:853"
|
||||||
|
#-s "https://dns.google/dns-query"
|
||||||
|
#-s "https://cloudflare-dns.com/dns-query"
|
||||||
|
#-s "https://dns10.quad9.net/dns-query"
|
||||||
|
#-s "https://dns.adguard-dns.com/dns-query"
|
||||||
)
|
)
|
||||||
|
|
||||||
# QUIC-based protocols (have built-in 0-RTT, keep-alive doesn't add value)
|
# QUIC-based protocols (have built-in 0-RTT, keep-alive doesn't add value)
|
||||||
QUIC_SERVERS=(
|
QUIC_SERVERS=(
|
||||||
-s "doh3://dns.google/dns-query"
|
#-s "doh3://dns.google/dns-query"
|
||||||
-s "doh3://cloudflare-dns.com/dns-query"
|
#-s "doh3://cloudflare-dns.com/dns-query"
|
||||||
-s "doh3://dns.adguard-dns.com/dns-query"
|
#-s "doh3://dns.adguard-dns.com/dns-query"
|
||||||
-s "doq://dns.adguard-dns.com:853"
|
#-s "doq://dns.adguard-dns.com:853"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Connectionless protocols (no keep-alive)
|
# Connectionless protocols (no keep-alive)
|
||||||
CONNLESS_SERVERS=(
|
CONNLESS_SERVERS=(
|
||||||
-s "udp://8.8.8.8:53"
|
# -s "udp://8.8.8.8:53"
|
||||||
-s "udp://1.1.1.1:53"
|
# -s "udp://1.1.1.1:53"
|
||||||
-s "udp://9.9.9.9:53"
|
# -s "udp://9.9.9.9:53"
|
||||||
-s "udp://dns.adguard-dns.com:53"
|
# -s "udp://dns.adguard-dns.com:53"
|
||||||
|
-s "sdns://AQMAAAAAAAAAETk0LjE0MC4xNC4xNDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20"
|
||||||
|
-s "sdns://AQMAAAAAAAAAFDE0OS4xMTIuMTEyLjExMjo4NDQzIGfIR7jIdYzRICRVQ751Z0bfNN8dhMALjEcDaN-CHYY-GTIuZG5zY3J5cHQtY2VydC5xdWFkOS5uZXQ"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Common args
|
# Common args
|
||||||
@@ -140,7 +146,7 @@ for FLAGS in "${CONN_COMBINATIONS[@]}"; do
|
|||||||
--output-dir "$OUTPUT_DIR" \
|
--output-dir "$OUTPUT_DIR" \
|
||||||
"${COMMON_ARGS[@]}" \
|
"${COMMON_ARGS[@]}" \
|
||||||
"${CONN_SERVERS[@]}" \
|
"${CONN_SERVERS[@]}" \
|
||||||
"${FLAGS_ARRAY[@]}"
|
"${FLAGS_ARRAY[@]}" || true
|
||||||
|
|
||||||
sleep "$SLEEP_TIME"
|
sleep "$SLEEP_TIME"
|
||||||
done
|
done
|
||||||
@@ -156,7 +162,7 @@ for FLAGS in "${NO_KEEPALIVE_COMBINATIONS[@]}"; do
|
|||||||
--output-dir "$OUTPUT_DIR" \
|
--output-dir "$OUTPUT_DIR" \
|
||||||
"${COMMON_ARGS[@]}" \
|
"${COMMON_ARGS[@]}" \
|
||||||
"${QUIC_SERVERS[@]}" \
|
"${QUIC_SERVERS[@]}" \
|
||||||
"${FLAGS_ARRAY[@]}"
|
"${FLAGS_ARRAY[@]}" || true
|
||||||
|
|
||||||
sleep "$SLEEP_TIME"
|
sleep "$SLEEP_TIME"
|
||||||
done
|
done
|
||||||
@@ -172,7 +178,7 @@ for FLAGS in "${NO_KEEPALIVE_COMBINATIONS[@]}"; do
|
|||||||
--output-dir "$OUTPUT_DIR" \
|
--output-dir "$OUTPUT_DIR" \
|
||||||
"${COMMON_ARGS[@]}" \
|
"${COMMON_ARGS[@]}" \
|
||||||
"${CONNLESS_SERVERS[@]}" \
|
"${CONNLESS_SERVERS[@]}" \
|
||||||
"${FLAGS_ARRAY[@]}"
|
"${FLAGS_ARRAY[@]}" || true
|
||||||
|
|
||||||
sleep "$SLEEP_TIME"
|
sleep "$SLEEP_TIME"
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user