xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-04-25 20:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

~DNS服务器中增加了专门用于解析节点域名的改PROXY-SERVER-DNS选项，并移除了对oix的单独适配

Browse Source
This commit is contained in:
juewuy
2026-04-19 10:40:28 +08:00
parent 75b3baa5d9
commit 791b83ab85
7 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scripts/menus/dns.sh
View File

@@ -185,13 +185,17 @@ set_dns_adv() {
"PROXY-DNS：" \
"\033[36m$dns_fallback\033[0m" \
"" \
"DEFAULT-DNS：" \
"RESOLVER-DNS：" \
"\033[33m$dns_resolver\033[0m" \
"" \
"PROXY-SERVER-DNS：" \
"\033[33m$dns_proxy_server\033[0m" \
""
btm_box "1) $DNS_ADV_EDIT_DIRECT" \
"2) $DNS_ADV_EDIT_PROXY" \
"3) $DNS_ADV_EDIT_DEFAULT" \
"4) \033[32m$DNS_ADV_AUTO_ENCRYPT\033[0m" \
"3) $DNS_ADV_EDIT_RESOLVER" \
"4) $DNS_ADV_EDIT_PROXY_SERVER" \
"5) \033[32m$DNS_ADV_AUTO_ENCRYPT\033[0m" \
"9) \033[33m$DNS_ADV_RESET\033[0m" \
"" \
"0) $COMMON_BACK"
@@ -201,9 +205,9 @@ set_dns_adv() {
break
;;
1)
comp_box "$DNS_DIRECT_NOW\033[32m$dns_nameserver\033[0m"
btm_box "\033[36m$DNS_INPUT_DIRECT_NEW\033[0m" \
"$DNS_INPUT_DIRECT_RESET" \
comp_box "$DNS_NOW\033[32m$dns_nameserver\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
read -r -p "$DNS_INPUT> " res
case "$res" in
@@ -227,9 +231,9 @@ set_dns_adv() {
esac
;;
2)
comp_box "$DNS_PROXY_NOW\033[32m$dns_fallback\033[0m"
btm_box "\033[36m$DNS_INPUT_PROXY_NEW\033[0m" \
"$DNS_INPUT_PROXY_RESET" \
comp_box "$DNS_NOW\033[32m$dns_fallback\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
read -r -p "$DNS_INPUT> " res
case "$res" in
@@ -253,9 +257,9 @@ set_dns_adv() {
esac
;;
3)
comp_box "$DNS_DEFAULT_NOW\033[32m$dns_resolver\033[0m"
btm_box "\033[36m$DNS_INPUT_DEFAULT_NEW\033[0m" \
"$DNS_INPUT_DEFAULT_RESET" \
comp_box "$DNS_NOW\033[32m$dns_resolver\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
separator_line "="
read -r -p "$DNS_INPUT> " res
@@ -266,7 +270,7 @@ set_dns_adv() {
"r")
dns_resolver="223.5.5.5, 2400:3200::1"
setconfig dns_resolver "'$dns_resolver'"
common_failed
common_success
;;
*)
if echo "$res" | grep -qE '://.*::'; then
@@ -280,6 +284,33 @@ set_dns_adv() {
esac
;;
4)
comp_box "$DNS_NOW\033[32m$dns_proxy_server\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
separator_line "="
read -r -p "$DNS_INPUT> " res
case "$res" in
0)
continue
;;
"r")
dns_proxy_server="$dns_resolver"
setconfig dns_proxy_server "'$dns_proxy_server'"
common_success
;;
*)
if echo "$res" | grep -qE '://.*::'; then
msg_alert "\033[31m$DNS_IPV6_NOT_SUPPORT\033[0m"
else
dns_proxy_server=$(echo "$res" | sed 's#|#,\ #g')
setconfig dns_proxy_server "'$dns_proxy_server'"
msg_alert "\033[32m$COMMON_SUCCESS\033[0m"
fi
;;
esac
;;
5)
line_break
separator_line "="
if echo "$crashcore" | grep -qE 'meta|singbox'; then

3
scripts/menus/providers_singbox.sh
View File

@@ -117,7 +117,6 @@ EOF
fi
# 通用部分生成
[ "$skip_cert" != "OFF" ] && override_tls='true' || override_tls='false'
[ -n "$(echo "$2" | grep 'oics.net')" ] && domain_resolver='dns_oix' || domain_resolver='dns_resolver'
cat >>"$TMPDIR"/providers/providers.json <<EOF
"health_check": {
"enabled": true,
@@ -126,7 +125,7 @@ EOF
"timeout": "3s"
},
"override_dialer": {
"domain_resolver": "$domain_resolver"
"domain_resolver": "$dns_proxy_server"
},
"override_tls": {
"enabled": true,