update 2026-10-17 22:50:00

This commit is contained in:
action committed 2026-10-17 22:50:00 +08:00
1 parent 63dbfd1d1b
commit b9c5dc7236
19 files changed
+262 -131

No files matched your search

@@ -2974,8 +2974,8 @@ start_rules() {
esac
}
if [ "$(uci_get_by_type global dports)" = "3" ]; then
custom_ports=$(uci_get_by_name "$GLOBAL_SERVER" custom_ports) # custom_ports 存储了用户自定义的端口
if [ "$(uci_get_by_type global dports 1)" = "3" ]; then
custom_ports=$(uci_get_by_type global custom_ports) # custom_ports 存储了用户自定义的端口
if [ -n "$custom_ports" ]; then
proxyport="-m multiport --dports $custom_ports"
fi
@@ -3017,7 +3017,7 @@ start_rules() {
-G "$(uci_get_by_type access_control lan_gm_ips)" \
-m "$(uci_get_by_type access_control Interface)" \
-D "$proxyport" \
"$(get_arg_out)" "$(gfwmode)" "$ARG_UDP" "$ARG_UDP_RULES" "$ARG_A"
$(get_arg_out) $(gfwmode) $ARG_UDP $ARG_UDP_RULES $ARG_A
return $?
}
+6 -6
View File
@@ -87,7 +87,7 @@ while [ "1" == "1" ]; do #死循环
#redir tcp
if [ "$redir_tcp_process" -gt 0 ]; then
icount=$(redir_tcp_running)
local tcp_expected="$redir_tcp_process"
tcp_expected="$redir_tcp_process"
if [ "$GLOBAL_TYPE" = "socks5" ]; then
tcp_expected="$EXPECTED_THREADS"
fi
@@ -101,7 +101,7 @@ while [ "1" == "1" ]; do #死循环
#redir udp
if [ "$redir_udp_process" -gt 0 ]; then
icount=$(redir_udp_running)
local udp_expected="$redir_udp_process"
udp_expected="$redir_udp_process"
if [ "$GLOBAL_TYPE" = "socks5" ]; then
udp_expected="$EXPECTED_THREADS"
fi
@@ -172,12 +172,12 @@ while [ "1" == "1" ]; do #死循环
echolog "chinadns-ng $dnsserver tunnel error.restart!"
dnsserver=$(uci_get_by_type global chinadns_ng_tunnel_forward 8.8.4.4:53)
kill -9 $(ps_list | grep "chinadns-ng -b 127.0.0.1 -l $tmp_dns_port" | grep -v grep | awk '{print $1}') >/dev/null 2>&1
local chinadns_ng_proto="$(uci_get_by_type global chinadns_ng_proto)"
local chinadns_ng_dns=""
chinadns_ng_proto="$(uci_get_by_type global chinadns_ng_proto)"
chinadns_ng_dns=""
IFS=','
for chinadns_ng_server in $dnsserver; do
local chinadns_ng_ip="${chinadns_ng_server%%:*}"
local chinadns_ng_port="${chinadns_ng_server##*:}"
chinadns_ng_ip="${chinadns_ng_server%%:*}"
chinadns_ng_port="${chinadns_ng_server##*:}"
[ "$chinadns_ng_ip" = "$chinadns_ng_port" ] && chinadns_ng_port="53"
chinadns_ng_tls_port="853"
case "$chinadns_ng_proto" in