" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>" style="display: none !important">
+ " />
+
diff --git a/luci-app-passwall/luasrc/view/passwall/global/footer.htm b/luci-app-passwall/luasrc/view/passwall/global/footer.htm
index 5a7a518f0..82a381f67 100644
--- a/luci-app-passwall/luasrc/view/passwall/global/footer.htm
+++ b/luci-app-passwall/luasrc/view/passwall/global/footer.htm
@@ -53,13 +53,13 @@ local api = require "luci.passwall.api"
var dom_id = dom.id.split(cbi_id).join(cbi_id.split("-").join(".")).split("cbi.").join("cbid.")
var node_select = document.getElementsByName(dom_id)[0];
var node_select_value = node_select.value;
- if (node_select_value && node_select_value != "nil" && node_select_value.indexOf("_default") != 0 && node_select_value.indexOf("_direct") != 0 && node_select_value.indexOf("_blackhole") != 0) {
+ if (node_select_value && node_select_value != "" && node_select_value.indexOf("_default") != 0 && node_select_value.indexOf("_direct") != 0 && node_select_value.indexOf("_blackhole") != 0) {
if (global_id != null && node_select_value.indexOf("tcp") == 0) {
var d = global_id + "-tcp_node";
d = d.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
var dom = document.getElementsByName(d)[0];
var _node_select_value = dom.value;
- if (_node_select_value && _node_select_value != "nil") {
+ if (_node_select_value && _node_select_value != "") {
node_select_value = _node_select_value;
}
}
@@ -117,7 +117,7 @@ local api = require "luci.passwall.api"
var dom_id = dom_id.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
var node_select = document.getElementsByName(dom_id)[0];
var node_select_value = node_select.value;
- if (node_select_value && node_select_value != "nil") {
+ if (node_select_value && node_select_value != "") {
var v = document.getElementById(dom_id + "-" + node_select_value);
if (v) {
node_select.title = v.text;
diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po
index c8a0ec1d8..a845a9a0d 100644
--- a/luci-app-passwall/po/zh-cn/passwall.po
+++ b/luci-app-passwall/po/zh-cn/passwall.po
@@ -673,17 +673,32 @@ msgstr "单位：秒"
msgid "Units:minutes"
msgstr "单位：分钟"
-msgid "Open and close automatically"
-msgstr "定时自动开关"
+msgid "stop automatically mode"
+msgstr "定时关闭模式"
-msgid "Automatically turn off time"
-msgstr "自动关闭时间"
+msgid "stop Time(Every day)"
+msgstr "关闭时间(每天)"
-msgid "Automatically turn on time"
-msgstr "自动开启时间"
+msgid "stop Interval(Hour)"
+msgstr "关闭间隔(小时)"
-msgid "Automatically restart time"
-msgstr "自动重启时间"
+msgid "start automatically mode"
+msgstr "定时开启模式"
+
+msgid "start Time(Every day)"
+msgstr "开启时间(每天)"
+
+msgid "start Interval(Hour)"
+msgstr "开启间隔(小时)"
+
+msgid "restart automatically mode"
+msgstr "定时重启模式"
+
+msgid "restart Time(Every day)"
+msgstr "重启时间(每天)"
+
+msgid "restart Interval(Hour)"
+msgstr "重启间隔(小时)"
msgid "Forwarding Settings"
msgstr "转发配置"
@@ -925,6 +940,9 @@ msgstr "每周日"
msgid "hour"
msgstr "小时"
+msgid "Hour"
+msgstr "小时"
+
msgid "Location of V2ray/Xray asset"
msgstr "V2ray/Xray 资源文件目录"
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
index 19b16b7a6..2a6a814bc 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@@ -2,8 +2,6 @@
config global
option enabled '0'
option socks_enabled '0'
- option tcp_node 'nil'
- option udp_node 'nil'
option tcp_node_socks_port '1070'
option filter_proxy_ipv6 '1'
option dns_shunt 'chinadns-ng'
@@ -32,7 +30,6 @@ config global_haproxy
option balancing_enable '0'
config global_delay
- option auto_on '0'
option start_daemon '1'
option start_delay '15'
@@ -102,7 +99,7 @@ config nodes 'myshunt'
option Streaming '_default'
option Proxy '_default'
option Direct '_direct'
- option default_node 'nil'
+ option default_node '_direct'
option domainStrategy 'IPOnDemand'
config shunt_rules 'DirectGame'
diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh
index 40b657cd6..14aa4e445 100755
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -707,7 +707,7 @@ run_socks() {
;;
esac
- eval node_${node}_socks_port=$socks_port
+ set_cache_var "node_${node}_socks_port" "${socks_port}"
# http to socks
[ -z "$http_flag" ] && [ "$http_port" != "0" ] && [ -n "$http_config_file" ] && [ "$type" != "sing-box" ] && [ "$type" != "xray" ] && [ "$type" != "socks" ] && {
@@ -755,7 +755,7 @@ run_redir() {
}
}
[ "$bind" != "127.0.0.1" ] && echolog "${PROTO}节点：[$remarks]，监听端口：$local_port"
- eval ${PROTO}_NODE_PORT=$port
+ set_cache_var "${PROTO}_NODE_PORT" "${port}"
case "$PROTO" in
UDP)
@@ -856,7 +856,7 @@ run_redir() {
}
[ "$TCP_UDP" = "1" ] && {
UDP_REDIR_PORT=$local_port
- UDP_NODE="nil"
+ unset UDP_NODE
_flag="TCP_UDP"
_args="${_args} udp_redir_port=${UDP_REDIR_PORT}"
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
@@ -932,7 +932,7 @@ run_redir() {
}
[ "$TCP_UDP" = "1" ] && {
UDP_REDIR_PORT=$local_port
- UDP_NODE="nil"
+ unset UDP_NODE
_flag="TCP_UDP"
_args="${_args} udp_redir_port=${UDP_REDIR_PORT}"
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
@@ -974,7 +974,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
}
local loglevel=$(config_t_get global trojan_loglevel "2")
lua $UTIL_TROJAN gen_config -node $node -run_type nat -local_addr "0.0.0.0" -local_port $local_port -loglevel $loglevel $lua_tproxy_arg > $config_file
@@ -989,7 +989,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
_extra_param="-u"
}
lua $UTIL_SS gen_config -node $node -local_addr "0.0.0.0" -local_port $local_port $lua_tproxy_arg > $config_file
@@ -1001,7 +1001,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
lua_mode_arg="-mode tcp_and_udp"
}
lua $UTIL_SS gen_config -node $node -local_addr "0.0.0.0" -local_port $local_port $lua_mode_arg $lua_tproxy_arg > $config_file
@@ -1023,7 +1023,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
_extra_param="${_extra_param} -local_udp_redir_port $local_port"
}
lua $UTIL_SS gen_config -node $node ${_extra_param} > $config_file
@@ -1044,7 +1044,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
config_file=$(echo $config_file | sed "s/TCP/TCP_UDP/g")
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
_extra_param="${_extra_param} -local_udp_redir_port $local_port"
}
_extra_param="${_extra_param} -tcp_proxy_way $tcp_proxy_way"
@@ -1057,7 +1057,7 @@ run_redir() {
[ "$TCP_UDP" = "1" ] && {
_flag="TCP_UDP"
UDP_REDIR_PORT=$TCP_REDIR_PORT
- UDP_NODE="nil"
+ unset UDP_NODE
}
local _socks_tproxy=""
[ "$tcp_proxy_way" = "tproxy" ] && _socks_tproxy="1"
@@ -1085,13 +1085,13 @@ run_redir() {
esac
unset tcp_node_socks_flag tcp_node_http_flag
[ "$type" != "sing-box" ] && [ "$type" != "xray" ] && echo "${node}" >> $TMP_PATH/direct_node_list
- return 0
+ [ -n "${redir_port}" ] && set_cache_var "node_${node}_${PROTO}_redir_port" "${local_port}"
}
start_redir() {
local proto=${1}
eval node=\$${proto}_NODE
- if [ "$node" != "nil" ]; then
+ if [ -n "$node" ]; then
TYPE=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z')
local config_file="${proto}.json"
local log_file="${proto}.log"
@@ -1099,7 +1099,12 @@ start_redir() {
local port=$(echo $(get_new_port $current_port $proto))
eval ${proto}_REDIR=$port
run_redir node=$node proto=${proto} bind=0.0.0.0 local_port=$port config_file=$config_file log_file=$log_file
- set_cache_var "GLOBAL_${proto}_node" "$node"
+ set_cache_var "ACL_GLOBAL_${proto}_node" "${node}"
+ set_cache_var "ACL_GLOBAL_${proto}_redir_port" "${port}"
+ [ "$TCP_UDP" = "1" ] && {
+ set_cache_var "ACL_GLOBAL_UDP_node" "${node}"
+ set_cache_var "ACL_GLOBAL_UDP_redir_port" "${port}"
+ }
else
[ "${proto}" = "UDP" ] && [ "$TCP_UDP" = "1" ] && return
echolog "${proto}节点没有选择或为空，不代理${proto}。"
@@ -1114,8 +1119,8 @@ start_socks() {
for id in $ids; do
local enabled=$(config_n_get $id enabled 0)
[ "$enabled" == "0" ] && continue
- local node=$(config_n_get $id node nil)
- [ "$node" == "nil" ] && continue
+ local node=$(config_n_get $id node)
+ [ -z "$node" ] && continue
local bind_local=$(config_n_get $id bind_local 0)
local bind="0.0.0.0"
[ "$bind_local" = "1" ] && bind="127.0.0.1"
@@ -1206,23 +1211,41 @@ start_crontab() {
return
}
- auto_on=$(config_t_get global_delay auto_on 0)
- if [ "$auto_on" = "1" ]; then
- time_off=$(config_t_get global_delay time_off)
- time_on=$(config_t_get global_delay time_on)
- time_restart=$(config_t_get global_delay time_restart)
- [ -z "$time_off" -o "$time_off" != "nil" ] && {
- echo "0 $time_off * * * /etc/init.d/$CONFIG stop" >>/etc/crontabs/root
- echolog "配置定时任务：每天 $time_off 点关闭服务。"
- }
- [ -z "$time_on" -o "$time_on" != "nil" ] && {
- echo "0 $time_on * * * /etc/init.d/$CONFIG start" >>/etc/crontabs/root
- echolog "配置定时任务：每天 $time_on 点开启服务。"
- }
- [ -z "$time_restart" -o "$time_restart" != "nil" ] && {
- echo "0 $time_restart * * * /etc/init.d/$CONFIG restart" >>/etc/crontabs/root
- echolog "配置定时任务：每天 $time_restart 点重启服务。"
- }
+ stop_week_mode=$(config_t_get global_delay stop_week_mode)
+ stop_time_mode=$(config_t_get global_delay stop_time_mode)
+ if [ -n "$stop_week_mode" ]; then
+ local t="0 $stop_time_mode * * $stop_week_mode"
+ [ "$stop_week_mode" = "7" ] && t="0 $stop_time_mode * * *"
+ if [ "$stop_week_mode" = "8" ]; then
+ update_loop=1
+ else
+ echo "$t /etc/init.d/$CONFIG stop > /dev/null 2>&1 &" >>/etc/crontabs/root
+ fi
+ echolog "配置定时任务：自动关闭服务。"
+ fi
+ start_week_mode=$(config_t_get global_delay start_week_mode)
+ start_time_mode=$(config_t_get global_delay start_time_mode)
+ if [ -n "$start_week_mode" ]; then
+ local t="0 $start_time_mode * * $start_week_mode"
+ [ "$start_week_mode" = "7" ] && t="0 $start_time_mode * * *"
+ if [ "$start_week_mode" = "8" ]; then
+ update_loop=1
+ else
+ echo "$t /etc/init.d/$CONFIG start > /dev/null 2>&1 &" >>/etc/crontabs/root
+ fi
+ echolog "配置定时任务：自动开启服务。"
+ fi
+ restart_week_mode=$(config_t_get global_delay restart_week_mode)
+ restart_time_mode=$(config_t_get global_delay restart_time_mode)
+ if [ -n "$restart_week_mode" ]; then
+ local t="0 $restart_time_mode * * $restart_week_mode"
+ [ "$restart_week_mode" = "7" ] && t="0 $restart_time_mode * * *"
+ if [ "$restart_week_mode" = "8" ]; then
+ update_loop=1
+ else
+ echo "$t /etc/init.d/$CONFIG restart > /dev/null 2>&1 &" >>/etc/crontabs/root
+ fi
+ echolog "配置定时任务：自动重启服务。"
fi
autoupdate=$(config_t_get global_rules auto_update)
@@ -1695,198 +1718,221 @@ acl_app() {
[ ! -z "${source_list}" ] && echo -e "${source_list}" | sed '/^$/d' > ${acl_path}/source_list
use_global_config=${use_global_config:-0}
- tcp_node=${tcp_node:-nil}
- udp_node=${udp_node:-nil}
- use_direct_list=${use_direct_list:-1}
- use_proxy_list=${use_proxy_list:-1}
- use_block_list=${use_block_list:-1}
- use_gfw_list=${use_gfw_list:-1}
- chn_list=${chn_list:-direct}
- tcp_proxy_mode=${tcp_proxy_mode:-proxy}
- udp_proxy_mode=${udp_proxy_mode:-proxy}
- filter_proxy_ipv6=${filter_proxy_ipv6:-0}
- dnsmasq_filter_proxy_ipv6=${filter_proxy_ipv6}
- dns_shunt=${dns_shunt:-dnsmasq}
- dns_mode=${dns_mode:-dns2socks}
- remote_dns=${remote_dns:-1.1.1.1}
- use_default_dns=${use_default_dns:-direct}
- [ "$dns_mode" = "sing-box" ] && {
- [ "$v2ray_dns_mode" = "doh" ] && remote_dns=${remote_dns_doh:-https://1.1.1.1/dns-query}
- }
-
[ "${use_global_config}" = "1" ] && {
tcp_node="default"
udp_node="default"
}
+ tcp_no_redir_ports=${tcp_no_redir_ports:-${TCP_NO_REDIR_PORTS}}
+ udp_no_redir_ports=${udp_no_redir_ports:-${UDP_NO_REDIR_PORTS}}
+ if [ "$tcp_no_redir_ports" == "1:65535" ] && [ "$udp_no_redir_ports" == "1:65535" ]; then
+ unset use_global_config
+ unset tcp_node
+ unset udp_node
+ else
+ use_direct_list=${use_direct_list:-1}
+ use_proxy_list=${use_proxy_list:-1}
+ use_block_list=${use_block_list:-1}
+ use_gfw_list=${use_gfw_list:-1}
+ chn_list=${chn_list:-direct}
+ tcp_proxy_mode=${tcp_proxy_mode:-proxy}
+ udp_proxy_mode=${udp_proxy_mode:-proxy}
+ filter_proxy_ipv6=${filter_proxy_ipv6:-0}
+ dnsmasq_filter_proxy_ipv6=${filter_proxy_ipv6}
+ dns_shunt=${dns_shunt:-dnsmasq}
+ dns_mode=${dns_mode:-dns2socks}
+ remote_dns=${remote_dns:-1.1.1.1}
+ use_default_dns=${use_default_dns:-direct}
+ [ "$dns_mode" = "sing-box" ] && {
+ [ "$v2ray_dns_mode" = "doh" ] && remote_dns=${remote_dns_doh:-https://1.1.1.1/dns-query}
+ }
+ fi
- [ "$tcp_node" != "nil" ] && {
+ [ -n "$tcp_node" ] && {
+ local GLOBAL_TCP_NODE=$(get_cache_var "ACL_GLOBAL_TCP_node")
+ echolog "${GLOBAL_TCP_NODE}"
+ [ -n "${GLOBAL_TCP_NODE}" ] && GLOBAL_TCP_redir_port=$(get_cache_var "ACL_GLOBAL_TCP_redir_port")
if [ "$tcp_node" = "default" ]; then
- tcp_node=$TCP_NODE
- tcp_port=$TCP_REDIR_PORT
+ if [ -n "${GLOBAL_TCP_NODE}" ]; then
+ set_cache_var "ACL_${sid}_tcp_node" "${GLOBAL_TCP_NODE}"
+ set_cache_var "ACL_${sid}_tcp_redir_port" "${GLOBAL_TCP_redir_port}"
+ set_cache_var "ACL_${sid}_dns_port" "${GLOBAL_DNSMASQ_PORT}"
+ set_cache_var "ACL_${sid}_tcp_default" "1"
+ else
+ echolog " - 全局节点未启用，跳过【${remarks}】"
+ fi
else
- [ "$(config_get_type $tcp_node nil)" = "nodes" ] && {
- run_dns() {
- local _dns_port
- [ -n $1 ] && _dns_port=$1
- [ -z ${_dns_port} ] && {
- dns_port=$(get_new_port $(expr $dns_port + 1))
- _dns_port=$dns_port
- if [ "$dns_mode" = "dns2socks" ]; then
- run_dns2socks flag=acl_${sid} socks_address=127.0.0.1 socks_port=$socks_port listen_address=0.0.0.0 listen_port=${_dns_port} dns=$remote_dns cache=1
- elif [ "$dns_mode" = "sing-box" -o "$dns_mode" = "xray" ]; then
- config_file=$TMP_ACL_PATH/${tcp_node}_SOCKS_${socks_port}_DNS.json
- [ "$dns_mode" = "xray" ] && [ "$v2ray_dns_mode" = "tcp+doh" ] && remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
- local type=${dns_mode}
- [ "${dns_mode}" = "sing-box" ] && type="singbox"
- dnsmasq_filter_proxy_ipv6=0
- run_${type} flag=acl_${sid} type=$dns_mode dns_socks_address=127.0.0.1 dns_socks_port=$socks_port dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_tcp_server=${remote_dns} remote_dns_doh="${remote_dns_doh}" remote_dns_query_strategy=${DNS_QUERY_STRATEGY} dns_client_ip=${dns_client_ip} dns_query_strategy=${DNS_QUERY_STRATEGY} config_file=$config_file
- fi
- eval node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)=${_dns_port}
- }
-
- [ "$dns_shunt" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && {
- chinadns_ng_min=2024.04.13
- chinadns_ng_now=$(chinadns-ng -V | grep -i "ChinaDNS-NG " | awk '{print $2}')
- if [ $(check_ver "$chinadns_ng_now" "$chinadns_ng_min") = 1 ]; then
- echolog " * 注意：当前 ChinaDNS-NG 版本为[ $chinadns_ng_now ]，请更新到[ $chinadns_ng_min ]或以上版本，否则 DNS 有可能无法正常工作！"
- fi
-
- [ "$filter_proxy_ipv6" = "1" ] && dnsmasq_filter_proxy_ipv6=0
- chinadns_port=$(expr $chinadns_port + 1)
- _china_ng_listen="127.0.0.1#${chinadns_port}"
-
- _chinadns_local_dns=$(IFS=','; set -- $LOCAL_DNS; [ "${1%%[#:]*}" = "127.0.0.1" ] && echo "$1" || ([ -n "$2" ] && echo "$1,$2" || echo "$1"))
- _direct_dns_mode=$(config_t_get global direct_dns_mode "auto")
- case "${_direct_dns_mode}" in
- udp)
- _chinadns_local_dns=$(config_t_get global direct_dns_udp 223.5.5.5 | sed 's/:/#/g')
- ;;
- tcp)
- _chinadns_local_dns="tcp://$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g')"
- ;;
- dot)
- if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then
- _chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12")
- fi
- ;;
- esac
-
- run_chinadns_ng \
- _flag="$sid" \
- _listen_port=${chinadns_port} \
- _dns_local=${_chinadns_local_dns} \
- _dns_trust=127.0.0.1#${_dns_port} \
- _no_ipv6_trust=${filter_proxy_ipv6} \
- _use_direct_list=${use_direct_list} \
- _use_proxy_list=${use_proxy_list} \
- _use_block_list=${use_block_list} \
- _gfwlist=${use_gfw_list} \
- _chnlist=${chn_list} \
- _default_mode=${tcp_proxy_mode} \
- _default_tag=${chinadns_ng_default_tag:-smart} \
- _no_logic_log=1 \
- _tcp_node=${tcp_node}
-
- use_default_dns="chinadns_ng"
- }
-
- dnsmasq_port=$(get_new_port $(expr $dnsmasq_port + 1))
- local dnsmasq_conf=${acl_path}/dnsmasq.conf
- local dnsmasq_conf_path=${acl_path}/dnsmasq.d
- lua $APP_PATH/helper_dnsmasq.lua add_rule -FLAG ${sid} -TMP_DNSMASQ_PATH ${dnsmasq_conf_path} -DNSMASQ_CONF_FILE ${dnsmasq_conf} \
- -LISTEN_PORT ${dnsmasq_port} -DEFAULT_DNS $DEFAULT_DNS -LOCAL_DNS $LOCAL_DNS \
- -USE_DIRECT_LIST "${use_direct_list}" -USE_PROXY_LIST "${use_proxy_list}" -USE_BLOCK_LIST "${use_block_list}" -USE_GFW_LIST "${use_gfw_list}" -CHN_LIST "${chn_list}" \
- -TUN_DNS "127.0.0.1#${_dns_port}" -REMOTE_FAKEDNS 0 -USE_DEFAULT_DNS "${use_default_dns:-direct}" -CHINADNS_DNS ${_china_ng_listen:-0} \
- -TCP_NODE $tcp_node -DEFAULT_PROXY_MODE ${tcp_proxy_mode} -NO_PROXY_IPV6 ${dnsmasq_filter_proxy_ipv6:-0} -NFTFLAG ${nftflag:-0} \
- -NO_LOGIC_LOG 1
- ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C ${dnsmasq_conf} -x ${acl_path}/dnsmasq.pid
- set_cache_var "ACL_${sid}_dns_port" "${dnsmasq_port}"
- eval node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)=${dnsmasq_port}
- }
- _redir_port=$(eval echo \${node_${tcp_node}_redir_port})
- _socks_port=$(eval echo \${node_${tcp_node}_socks_port})
- if [ -n "${_socks_port}" ] && [ -n "${_redir_port}" ]; then
- socks_port=${_socks_port}
- tcp_port=${_redir_port}
- _dnsmasq_port=$(eval echo \${node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)})
- if [ -z "${_dnsmasq_port}" ]; then
- _dns_port=$(eval echo \${node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)})
- run_dns ${_dns_port}
- else
- [ -n "${_dnsmasq_port}" ] && set_cache_var "ACL_${sid}_dns_port" "${_dnsmasq_port}"
- fi
+ [ "$(config_get_type $tcp_node)" = "nodes" ] && {
+ if [ -n "${GLOBAL_TCP_NODE}" ] && [ "$tcp_node" = "${GLOBAL_TCP_NODE}" ]; then
+ set_cache_var "ACL_${sid}_tcp_node" "${GLOBAL_TCP_NODE}"
+ set_cache_var "ACL_${sid}_tcp_redir_port" "${GLOBAL_TCP_redir_port}"
+ set_cache_var "ACL_${sid}_dns_port" "${GLOBAL_DNSMASQ_PORT}"
+ set_cache_var "ACL_${sid}_tcp_default" "1"
else
- socks_port=$(get_new_port $(expr $socks_port + 1))
- eval node_${tcp_node}_socks_port=$socks_port
- redir_port=$(get_new_port $(expr $redir_port + 1))
- eval node_${tcp_node}_redir_port=$redir_port
- tcp_port=$redir_port
-
- local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
- if [ -n "${type}" ] && ([ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]); then
- config_file="acl/${tcp_node}_TCP_${redir_port}.json"
- _extra_param="socks_address=127.0.0.1 socks_port=$socks_port"
- if [ "$dns_mode" = "sing-box" ] || [ "$dns_mode" = "xray" ]; then
+ run_dns() {
+ local _dns_port
+ [ -n $1 ] && _dns_port=$1
+ [ -z ${_dns_port} ] && {
dns_port=$(get_new_port $(expr $dns_port + 1))
_dns_port=$dns_port
- config_file=$(echo $config_file | sed "s/TCP_/DNS_${_dns_port}_TCP_/g")
- remote_dns_doh=${remote_dns}
- dnsmasq_filter_proxy_ipv6=0
- [ "$dns_mode" = "xray" ] && [ "$v2ray_dns_mode" = "tcp+doh" ] && remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
- _extra_param="dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_tcp_server=${remote_dns} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${DNS_QUERY_STRATEGY} dns_client_ip=${dns_client_ip} dns_query_strategy=${DNS_QUERY_STRATEGY}"
- fi
- [ "$udp_node" != "nil" ] && ([ "$udp_node" = "tcp" ] || [ "$udp_node" = "$tcp_node" ]) && {
- config_file=$(echo $config_file | sed "s/TCP_/TCP_UDP_/g")
- _extra_param="${_extra_param} udp_redir_port=$redir_port"
+ if [ "$dns_mode" = "dns2socks" ]; then
+ run_dns2socks flag=acl_${sid} socks_address=127.0.0.1 socks_port=$socks_port listen_address=0.0.0.0 listen_port=${_dns_port} dns=$remote_dns cache=1
+ elif [ "$dns_mode" = "sing-box" -o "$dns_mode" = "xray" ]; then
+ config_file=$TMP_ACL_PATH/${tcp_node}_SOCKS_${socks_port}_DNS.json
+ [ "$dns_mode" = "xray" ] && [ "$v2ray_dns_mode" = "tcp+doh" ] && remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
+ local type=${dns_mode}
+ [ "${dns_mode}" = "sing-box" ] && type="singbox"
+ dnsmasq_filter_proxy_ipv6=0
+ run_${type} flag=acl_${sid} type=$dns_mode dns_socks_address=127.0.0.1 dns_socks_port=$socks_port dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_tcp_server=${remote_dns} remote_dns_doh="${remote_dns_doh}" remote_dns_query_strategy=${DNS_QUERY_STRATEGY} dns_client_ip=${dns_client_ip} dns_query_strategy=${DNS_QUERY_STRATEGY} config_file=$config_file
+ fi
+ set_cache_var "node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)" "${_dns_port}"
}
- config_file="$TMP_PATH/$config_file"
- [ "${type}" = "sing-box" ] && type="singbox"
- run_${type} flag=$tcp_node node=$tcp_node tcp_redir_port=$redir_port ${_extra_param} config_file=$config_file
+
+ [ "$dns_shunt" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ] && {
+ chinadns_ng_min=2024.04.13
+ chinadns_ng_now=$(chinadns-ng -V | grep -i "ChinaDNS-NG " | awk '{print $2}')
+ if [ $(check_ver "$chinadns_ng_now" "$chinadns_ng_min") = 1 ]; then
+ echolog " * 注意：当前 ChinaDNS-NG 版本为[ $chinadns_ng_now ]，请更新到[ $chinadns_ng_min ]或以上版本，否则 DNS 有可能无法正常工作！"
+ fi
+
+ [ "$filter_proxy_ipv6" = "1" ] && dnsmasq_filter_proxy_ipv6=0
+ chinadns_port=$(expr $chinadns_port + 1)
+ _china_ng_listen="127.0.0.1#${chinadns_port}"
+
+ _chinadns_local_dns=$(IFS=','; set -- $LOCAL_DNS; [ "${1%%[#:]*}" = "127.0.0.1" ] && echo "$1" || ([ -n "$2" ] && echo "$1,$2" || echo "$1"))
+ _direct_dns_mode=$(config_t_get global direct_dns_mode "auto")
+ case "${_direct_dns_mode}" in
+ udp)
+ _chinadns_local_dns=$(config_t_get global direct_dns_udp 223.5.5.5 | sed 's/:/#/g')
+ ;;
+ tcp)
+ _chinadns_local_dns="tcp://$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g')"
+ ;;
+ dot)
+ if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then
+ _chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12")
+ fi
+ ;;
+ esac
+
+ run_chinadns_ng \
+ _flag="$sid" \
+ _listen_port=${chinadns_port} \
+ _dns_local=${_chinadns_local_dns} \
+ _dns_trust=127.0.0.1#${_dns_port} \
+ _no_ipv6_trust=${filter_proxy_ipv6} \
+ _use_direct_list=${use_direct_list} \
+ _use_proxy_list=${use_proxy_list} \
+ _use_block_list=${use_block_list} \
+ _gfwlist=${use_gfw_list} \
+ _chnlist=${chn_list} \
+ _default_mode=${tcp_proxy_mode} \
+ _default_tag=${chinadns_ng_default_tag:-smart} \
+ _no_logic_log=1 \
+ _tcp_node=${tcp_node}
+
+ use_default_dns="chinadns_ng"
+ }
+
+ dnsmasq_port=$(get_new_port $(expr $dnsmasq_port + 1))
+ local dnsmasq_conf=${acl_path}/dnsmasq.conf
+ local dnsmasq_conf_path=${acl_path}/dnsmasq.d
+ lua $APP_PATH/helper_dnsmasq.lua add_rule -FLAG ${sid} -TMP_DNSMASQ_PATH ${dnsmasq_conf_path} -DNSMASQ_CONF_FILE ${dnsmasq_conf} \
+ -LISTEN_PORT ${dnsmasq_port} -DEFAULT_DNS $DEFAULT_DNS -LOCAL_DNS $LOCAL_DNS \
+ -USE_DIRECT_LIST "${use_direct_list}" -USE_PROXY_LIST "${use_proxy_list}" -USE_BLOCK_LIST "${use_block_list}" -USE_GFW_LIST "${use_gfw_list}" -CHN_LIST "${chn_list}" \
+ -TUN_DNS "127.0.0.1#${_dns_port}" -REMOTE_FAKEDNS 0 -USE_DEFAULT_DNS "${use_default_dns:-direct}" -CHINADNS_DNS ${_china_ng_listen:-0} \
+ -TCP_NODE $tcp_node -DEFAULT_PROXY_MODE ${tcp_proxy_mode} -NO_PROXY_IPV6 ${dnsmasq_filter_proxy_ipv6:-0} -NFTFLAG ${nftflag:-0} \
+ -NO_LOGIC_LOG 1
+ ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C ${dnsmasq_conf} -x ${acl_path}/dnsmasq.pid
+ set_cache_var "ACL_${sid}_dns_port" "${dnsmasq_port}"
+ set_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)" "${dnsmasq_port}"
+ }
+ _redir_port=$(get_cache_var "node_${tcp_node}_redir_port")
+ _socks_port=$(get_cache_var "node_${tcp_node}_socks_port")
+ if [ -n "${_socks_port}" ] && [ -n "${_redir_port}" ]; then
+ socks_port=${_socks_port}
+ tcp_port=${_redir_port}
+ _dnsmasq_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${tcp_proxy_mode}${remote_dns}" | md5sum | cut -d " " -f1)")
+ if [ -z "${_dnsmasq_port}" ]; then
+ _dns_port=$(get_cache_var "node_${tcp_node}_$(echo -n "${remote_dns}" | md5sum | cut -d " " -f1)")
+ run_dns ${_dns_port}
+ else
+ [ -n "${_dnsmasq_port}" ] && set_cache_var "ACL_${sid}_dns_port" "${_dnsmasq_port}"
+ fi
else
- config_file="acl/${tcp_node}_SOCKS_${socks_port}.json"
- run_socks flag=$tcp_node node=$tcp_node bind=127.0.0.1 socks_port=$socks_port config_file=$config_file
- local log_file=$TMP_ACL_PATH/ipt2socks_${tcp_node}_${redir_port}.log
- log_file="/dev/null"
- run_ipt2socks flag=acl_${tcp_node} tcp_tproxy=${is_tproxy} local_port=$redir_port socks_address=127.0.0.1 socks_port=$socks_port log_file=$log_file
+ socks_port=$(get_new_port $(expr $socks_port + 1))
+ set_cache_var "node_${tcp_node}_socks_port" "${socks_port}"
+ redir_port=$(get_new_port $(expr $redir_port + 1))
+ set_cache_var "node_${tcp_node}_redir_port" "${redir_port}"
+ tcp_port=$redir_port
+
+ local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
+ if [ -n "${type}" ] && ([ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]); then
+ config_file="acl/${tcp_node}_TCP_${redir_port}.json"
+ _extra_param="socks_address=127.0.0.1 socks_port=$socks_port"
+ if [ "$dns_mode" = "sing-box" ] || [ "$dns_mode" = "xray" ]; then
+ dns_port=$(get_new_port $(expr $dns_port + 1))
+ _dns_port=$dns_port
+ config_file=$(echo $config_file | sed "s/TCP_/DNS_${_dns_port}_TCP_/g")
+ remote_dns_doh=${remote_dns}
+ dnsmasq_filter_proxy_ipv6=0
+ [ "$dns_mode" = "xray" ] && [ "$v2ray_dns_mode" = "tcp+doh" ] && remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
+ _extra_param="dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_tcp_server=${remote_dns} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${DNS_QUERY_STRATEGY} dns_client_ip=${dns_client_ip} dns_query_strategy=${DNS_QUERY_STRATEGY}"
+ fi
+ [ -n "$udp_node" ] && ([ "$udp_node" = "tcp" ] || [ "$udp_node" = "$tcp_node" ]) && {
+ config_file=$(echo $config_file | sed "s/TCP_/TCP_UDP_/g")
+ _extra_param="${_extra_param} udp_redir_port=$redir_port"
+ }
+ config_file="$TMP_PATH/$config_file"
+ [ "${type}" = "sing-box" ] && type="singbox"
+ run_${type} flag=$tcp_node node=$tcp_node tcp_redir_port=$redir_port ${_extra_param} config_file=$config_file
+ else
+ config_file="acl/${tcp_node}_SOCKS_${socks_port}.json"
+ run_socks flag=$tcp_node node=$tcp_node bind=127.0.0.1 socks_port=$socks_port config_file=$config_file
+ local log_file=$TMP_ACL_PATH/ipt2socks_${tcp_node}_${redir_port}.log
+ log_file="/dev/null"
+ run_ipt2socks flag=acl_${tcp_node} tcp_tproxy=${is_tproxy} local_port=$redir_port socks_address=127.0.0.1 socks_port=$socks_port log_file=$log_file
+ fi
+ run_dns ${_dns_port}
fi
- run_dns ${_dns_port}
+ set_cache_var "ACL_${sid}_tcp_node" "${tcp_node}"
+ set_cache_var "ACL_${sid}_tcp_redir_port" "${redir_port}"
fi
- set_cache_var "ACL_${sid}_tcp_node" "${tcp_node}"
}
fi
- set_cache_var "ACL_${sid}_tcp_port" "${tcp_port}"
}
- [ "$udp_node" != "nil" ] && {
- [ "$udp_node" = "tcp" ] && udp_node=$tcp_node
+ [ -n "$udp_node" ] && {
if [ "$udp_node" = "default" ]; then
- if [ "$TCP_UDP" = "0" ] && [ "$UDP_NODE" = "nil" ]; then
- udp_node="nil"
- unset udp_port
- elif [ "$TCP_UDP" = "1" ] && [ "$udp_node" = "nil" ]; then
- udp_node=$TCP_NODE
- udp_port=$TCP_REDIR_PORT
+ local GLOBAL_UDP_NODE=$(get_cache_var "ACL_GLOBAL_UDP_node")
+ [ -n "${GLOBAL_UDP_NODE}" ] && GLOBAL_UDP_redir_port=$(get_cache_var "ACL_GLOBAL_UDP_redir_port")
+ if [ -n "${GLOBAL_UDP_NODE}" ]; then
+ set_cache_var "ACL_${sid}_udp_node" "${GLOBAL_UDP_NODE}"
+ set_cache_var "ACL_${sid}_udp_redir_port" "${GLOBAL_UDP_redir_port}"
+ set_cache_var "ACL_${sid}_udp_default" "1"
else
- udp_node=$UDP_NODE
- udp_port=$UDP_REDIR_PORT
+ echolog " - 全局节点未启用，跳过【${remarks}】"
fi
- elif [ "$udp_node" = "$tcp_node" ]; then
- udp_node=$tcp_node
- udp_port=$tcp_port
+ elif [ "$udp_node" = "tcp" ]; then
+ udp_node=$(get_cache_var "ACL_${sid}_tcp_node")
+ udp_port=$(get_cache_var "ACL_${sid}_tcp_port")
+ set_cache_var "ACL_${sid}_udp_node" "${udp_node}"
+ set_cache_var "ACL_${sid}_udp_redir_port" "${udp_port}"
else
- [ "$(config_get_type $udp_node nil)" = "nodes" ] && {
- if [ "$udp_node" = "$UDP_NODE" ]; then
- udp_port=$UDP_REDIR_PORT
+ [ "$(config_get_type $udp_node)" = "nodes" ] && {
+ if [ -n "${GLOBAL_UDP_NODE}" ] && [ "$udp_node" = "${GLOBAL_UDP_NODE}" ]; then
+ set_cache_var "ACL_${sid}_udp_node" "${GLOBAL_UDP_NODE}"
+ set_cache_var "ACL_${sid}_udp_redir_port" "${GLOBAL_UDP_redir_port}"
+ set_cache_var "ACL_${sid}_udp_default" "1"
else
- _redir_port=$(eval echo \${node_${udp_node}_redir_port})
- _socks_port=$(eval echo \${node_${udp_node}_socks_port})
+ _redir_port=$(get_cache_var "node_${udp_node}_redir_port")
+ _socks_port=$(get_cache_var "node_${udp_node}_socks_port")
if [ -n "${_socks_port}" ] && [ -n "${_redir_port}" ]; then
socks_port=${_socks_port}
udp_port=${_redir_port}
else
socks_port=$(get_new_port $(expr $socks_port + 1))
- eval node_${udp_node}_socks_port=$socks_port
+ set_cache_var "node_${udp_node}_socks_port" "${socks_port}"
redir_port=$(get_new_port $(expr $redir_port + 1))
- eval node_${udp_node}_redir_port=$redir_port
+ set_cache_var "node_${udp_node}_redir_port" "${redir_port}"
udp_port=$redir_port
local type=$(echo $(config_n_get $udp_node type) | tr 'A-Z' 'a-z')
@@ -1904,12 +1950,12 @@ acl_app() {
fi
fi
set_cache_var "ACL_${sid}_udp_node" "${udp_node}"
+ set_cache_var "ACL_${sid}_udp_redir_port" "${redir_port}"
fi
}
fi
- set_cache_var "ACL_${sid}_udp_port" "${udp_port}"
}
- unset enabled sid remarks sources interface use_global_config tcp_node udp_node use_direct_list use_proxy_list use_block_list use_gfw_list chn_list tcp_proxy_mode udp_proxy_mode filter_proxy_ipv6 dns_mode remote_dns v2ray_dns_mode remote_dns_doh dns_client_ip
+ unset enabled sid remarks sources interface tcp_no_redir_ports udp_no_redir_ports use_global_config tcp_node udp_node use_direct_list use_proxy_list use_block_list use_gfw_list chn_list tcp_proxy_mode udp_proxy_mode filter_proxy_ipv6 dns_mode remote_dns v2ray_dns_mode remote_dns_doh dns_client_ip
unset _ip _mac _iprange _ipset _ip_or_mac source_list tcp_port udp_port config_file _extra_param
unset _china_ng_listen _chinadns_local_dns _direct_dns_mode chinadns_ng_default_tag dnsmasq_filter_proxy_ipv6
done
@@ -2013,9 +2059,9 @@ stop() {
ENABLED=$(config_t_get global enabled 0)
SOCKS_ENABLED=$(config_t_get global socks_enabled 0)
TCP_REDIR_PORT=1041
-TCP_NODE=$(config_t_get global tcp_node nil)
+TCP_NODE=$(config_t_get global tcp_node)
UDP_REDIR_PORT=1051
-UDP_NODE=$(config_t_get global udp_node nil)
+UDP_NODE=$(config_t_get global udp_node)
TCP_UDP=0
if [ "$UDP_NODE" == "tcp" ]; then
UDP_NODE=$TCP_NODE
@@ -2024,8 +2070,8 @@ elif [ "$UDP_NODE" == "$TCP_NODE" ]; then
TCP_UDP=1
fi
[ "$ENABLED" == 1 ] && {
- [ "$TCP_NODE" != "nil" ] && [ "$(config_get_type $TCP_NODE nil)" != "nil" ] && ENABLED_DEFAULT_ACL=1
- [ "$UDP_NODE" != "nil" ] && [ "$(config_get_type $UDP_NODE nil)" != "nil" ] && ENABLED_DEFAULT_ACL=1
+ [ -n "$TCP_NODE" ] && [ "$(config_get_type $TCP_NODE)" == "nodes" ] && ENABLED_DEFAULT_ACL=1
+ [ -n "$UDP_NODE" ] && [ "$(config_get_type $UDP_NODE)" == "nodes" ] && ENABLED_DEFAULT_ACL=1
}
ENABLED_ACLS=$(config_t_get global acl_enable 0)
[ "$ENABLED_ACLS" == 1 ] && {
diff --git a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
index 60e847dd8..704ffe83a 100644
--- a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
+++ b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
@@ -307,8 +307,8 @@ if uci:get(appname, TCP_NODE, "protocol") == "_shunt" then
local t = uci:get_all(appname, TCP_NODE)
local default_node_id = t["default_node"] or "_direct"
uci:foreach(appname, "shunt_rules", function(s)
- local _node_id = t[s[".name"]] or "nil"
- if _node_id ~= "nil" and _node_id ~= "_blackhole" then
+ local _node_id = t[s[".name"]]
+ if _node_id and _node_id ~= "_blackhole" then
if _node_id == "_default" then
_node_id = default_node_id
end
diff --git a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua
index 55153806f..40373ad68 100644
--- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua
+++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua
@@ -127,8 +127,9 @@ function copy_instance(var)
if line:find("passwall") then filter = true end
if line:find("ubus") then filter = true end
if line:find("dhcp") then filter = true end
- if line:find("server") then filter = true end
- if line:find("port") then filter = true end
+ if line:find("server=") == 1 then filter = true end
+ if line:find("port=") == 1 then filter = true end
+ if line:find("address=") == 1 or (line:find("server=") == 1 and line:find("/")) then filter = nil end
if not filter then
tinsert(conf_lines, line)
end
@@ -498,8 +499,8 @@ function add_rule(var)
local t = uci:get_all(appname, TCP_NODE)
local default_node_id = t["default_node"] or "_direct"
uci:foreach(appname, "shunt_rules", function(s)
- local _node_id = t[s[".name"]] or "nil"
- if _node_id ~= "nil" and _node_id ~= "_blackhole" then
+ local _node_id = t[s[".name"]]
+ if _node_id and _node_id ~= "_blackhole" then
if _node_id == "_default" then
_node_id = default_node_id
end
@@ -621,8 +622,9 @@ function add_rule(var)
if line:find("passwall") then filter = true end
if line:find("ubus") then filter = true end
if line:find("dhcp") then filter = true end
- if line:find("server") then filter = true end
- if line:find("port") then filter = true end
+ if line:find("server=") == 1 then filter = true end
+ if line:find("port=") == 1 then filter = true end
+ if line:find("address=") == 1 or (line:find("server=") == 1 and line:find("/")) then filter = nil end
if not filter then
tinsert(conf_lines, line)
end
diff --git a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
index 06b54e77e..17f891803 100644
--- a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
+++ b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
@@ -450,8 +450,8 @@ if uci:get(appname, TCP_NODE, "protocol") == "_shunt" then
local t = uci:get_all(appname, TCP_NODE)
local default_node_id = t["default_node"] or "_direct"
uci:foreach(appname, "shunt_rules", function(s)
- local _node_id = t[s[".name"]] or "nil"
- if _node_id ~= "nil" and _node_id ~= "_blackhole" then
+ local _node_id = t[s[".name"]]
+ if _node_id and _node_id ~= "_blackhole" then
if _node_id == "_default" then
_node_id = default_node_id
end
diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh
index 826297bf8..c5d23bac7 100755
--- a/luci-app-passwall/root/usr/share/passwall/iptables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh
@@ -198,8 +198,6 @@ load_acl() {
udp_proxy_drop_ports=${udp_proxy_drop_ports:-default}
tcp_redir_ports=${tcp_redir_ports:-default}
udp_redir_ports=${udp_redir_ports:-default}
- tcp_node=${tcp_node:-nil}
- udp_node=${udp_node:-nil}
use_direct_list=${use_direct_list:-1}
use_proxy_list=${use_proxy_list:-1}
use_block_list=${use_block_list:-1}
@@ -215,25 +213,17 @@ load_acl() {
[ "$udp_redir_ports" = "default" ] && udp_redir_ports=$UDP_REDIR_PORTS
[ -n "$(get_cache_var "ACL_${sid}_tcp_node")" ] && tcp_node=$(get_cache_var "ACL_${sid}_tcp_node")
+ [ -n "$(get_cache_var "ACL_${sid}_tcp_redir_port")" ] && tcp_port=$(get_cache_var "ACL_${sid}_tcp_redir_port")
[ -n "$(get_cache_var "ACL_${sid}_udp_node")" ] && udp_node=$(get_cache_var "ACL_${sid}_udp_node")
- [ -n "$(get_cache_var "ACL_${sid}_tcp_port")" ] && tcp_port=$(get_cache_var "ACL_${sid}_tcp_port")
- [ -n "$(get_cache_var "ACL_${sid}_udp_port")" ] && udp_port=$(get_cache_var "ACL_${sid}_udp_port")
+ [ -n "$(get_cache_var "ACL_${sid}_udp_redir_port")" ] && udp_port=$(get_cache_var "ACL_${sid}_udp_redir_port")
[ -n "$(get_cache_var "ACL_${sid}_dns_port")" ] && dns_redirect_port=$(get_cache_var "ACL_${sid}_dns_port")
+ [ -n "$tcp_node" ] && tcp_node_remark=$(config_n_get $tcp_node remarks)
+ [ -n "$udp_node" ] && udp_node_remark=$(config_n_get $udp_node remarks)
use_shunt_tcp=0
use_shunt_udp=0
- [ "$tcp_node" != "nil" ] && {
- tcp_node_remark=$(config_n_get $tcp_node remarks)
- [ "$(config_n_get $tcp_node protocol)" = "_shunt" ] && use_shunt_tcp=1
- }
- [ "$udp_node" != "nil" ] && {
- udp_node_remark=$(config_n_get $udp_node remarks)
- [ "$(config_n_get $udp_node protocol)" = "_shunt" ] && use_shunt_udp=1
- }
- [ "$udp_node" == "tcp" ] && {
- udp_node_remark=$tcp_node_remark
- use_shunt_udp=$use_shunt_tcp
- }
+ [ -n "$tcp_node" ] && [ "$(config_n_get $tcp_node protocol)" = "_shunt" ] && use_shunt_tcp=1
+ [ -n "$udp_node" ] && [ "$(config_n_get $udp_node protocol)" = "_shunt" ] && use_shunt_udp=1
[ "${use_global_config}" = "1" ] && {
tcp_node_remark=$(config_n_get $TCP_NODE remarks)
@@ -503,7 +493,7 @@ load_acl() {
local DNS_REDIRECT
[ $(config_t_get global dns_redirect "1") = "1" ] && DNS_REDIRECT=53
- if ([ "$TCP_NODE" != "nil" ] && [ -n "${TCP_PROXY_MODE}" ]) || ([ "$UDP_NODE" != "nil" ] && [ -n "${UDP_PROXY_MODE}" ]); then
+ if ([ -n "$TCP_NODE" ] && [ -n "${TCP_PROXY_MODE}" ]) || ([ -n "$UDP_NODE" ] && [ -n "${UDP_PROXY_MODE}" ]); then
[ -n "${DNS_REDIRECT_PORT}" ] && DNS_REDIRECT=${DNS_REDIRECT_PORT}
else
[ -n "${DIRECT_DNSMASQ_PORT}" ] && DNS_REDIRECT=${DIRECT_DNSMASQ_PORT}
@@ -566,7 +556,7 @@ load_acl() {
# 加载TCP默认代理模式
if [ -n "${TCP_PROXY_MODE}" ]; then
- [ "$TCP_NODE" != "nil" ] && {
+ [ -n "$TCP_NODE" ] && {
msg2="${msg}使用 TCP 节点[$(config_n_get $TCP_NODE remarks)]"
if [ -n "${is_tproxy}" ]; then
msg2="${msg2}(TPROXY:${TCP_REDIR_PORT})"
@@ -619,7 +609,7 @@ load_acl() {
# 加载UDP默认代理模式
if [ -n "${UDP_PROXY_MODE}" ]; then
- [ "$UDP_NODE" != "nil" -o "$TCP_UDP" = "1" ] && {
+ [ -n "$UDP_NODE" -o "$TCP_UDP" = "1" ] && {
msg2="${msg}使用 UDP 节点[$(config_n_get $UDP_NODE remarks)](TPROXY:${UDP_REDIR_PORT})"
$ipt_m -A PSW $(comment "默认") -p udp -d $FAKE_IP -j PSW_RULE
@@ -686,7 +676,7 @@ filter_server_port() {
filter_node() {
local node=${1}
local stream=${2}
- if [ -n "$node" ] && [ "$node" != "nil" ]; then
+ if [ -n "$node" ]; then
local address=$(config_n_get $node address)
local port=$(config_n_get $node port)
[ -z "$address" ] && [ -z "$port" ] && {
@@ -736,12 +726,12 @@ add_firewall_rule() {
local USE_PROXY_LIST_ALL=${USE_PROXY_LIST}
local USE_DIRECT_LIST_ALL=${USE_DIRECT_LIST}
local USE_BLOCK_LIST_ALL=${USE_BLOCK_LIST}
- local _TCP_NODE=$(config_t_get global tcp_node nil)
- local _UDP_NODE=$(config_t_get global udp_node nil)
+ local _TCP_NODE=$(config_t_get global tcp_node)
+ local _UDP_NODE=$(config_t_get global udp_node)
local USE_GEOVIEW=$(config_t_get global_rules enable_geoview)
- [ "$_TCP_NODE" != "nil" ] && [ "$(config_n_get $_TCP_NODE protocol)" = "_shunt" ] && USE_SHUNT_TCP=1 && USE_SHUNT_NODE=1
- [ "$_UDP_NODE" != "nil" ] && [ "$(config_n_get $_UDP_NODE protocol)" = "_shunt" ] && USE_SHUNT_UDP=1 && USE_SHUNT_NODE=1
+ [ -n "$_TCP_NODE" ] && [ "$(config_n_get $_TCP_NODE protocol)" = "_shunt" ] && USE_SHUNT_TCP=1 && USE_SHUNT_NODE=1
+ [ -n "$_UDP_NODE" ] && [ "$(config_n_get $_UDP_NODE protocol)" = "_shunt" ] && USE_SHUNT_UDP=1 && USE_SHUNT_NODE=1
[ "$_UDP_NODE" = "tcp" ] && USE_SHUNT_UDP=$USE_SHUNT_TCP
for acl_section in $(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1); do
@@ -1012,7 +1002,7 @@ add_firewall_rule() {
ip -6 rule add fwmark 1 table 100
ip -6 route add local ::/0 dev lo table 100
- [ "$TCP_UDP" = "1" ] && [ "$UDP_NODE" = "nil" ] && UDP_NODE=$TCP_NODE
+ [ "$TCP_UDP" = "1" ] && [ -z "$UDP_NODE" ] && UDP_NODE=$TCP_NODE
[ "$ENABLED_DEFAULT_ACL" == 1 ] && {
local ipt_tmp=$ipt_n
@@ -1046,7 +1036,7 @@ add_firewall_rule() {
fi
}
- if ([ "$TCP_NODE" != "nil" ] && [ -n "${LOCALHOST_TCP_PROXY_MODE}" ]) || ([ "$UDP_NODE" != "nil" ] && [ -n "${LOCALHOST_UDP_PROXY_MODE}" ]); then
+ if ([ -n "$TCP_NODE" ] && [ -n "${LOCALHOST_TCP_PROXY_MODE}" ]) || ([ -n "$UDP_NODE" ] && [ -n "${LOCALHOST_UDP_PROXY_MODE}" ]); then
[ -n "$DNS_REDIRECT_PORT" ] && {
$ipt_n -A OUTPUT $(comment "PSW") -p udp -o lo --dport 53 -j REDIRECT --to-ports $DNS_REDIRECT_PORT
$ip6t_n -A OUTPUT $(comment "PSW") -p udp -o lo --dport 53 -j REDIRECT --to-ports $DNS_REDIRECT_PORT 2>/dev/null
@@ -1078,7 +1068,7 @@ add_firewall_rule() {
}
# 加载路由器自身代理 TCP
- if [ "$TCP_NODE" != "nil" ]; then
+ if [ -n "$TCP_NODE" ]; then
_proxy_tcp_access() {
[ -n "${2}" ] || return 0
if echo "${2}" | grep -q -v ':'; then
@@ -1156,7 +1146,7 @@ add_firewall_rule() {
fi
# 加载路由器自身代理 UDP
- if [ "$UDP_NODE" != "nil" -o "$TCP_UDP" = "1" ]; then
+ if [ -n "$UDP_NODE" -o "$TCP_UDP" = "1" ]; then
_proxy_udp_access() {
[ -n "${2}" ] || return 0
if echo "${2}" | grep -q -v ':'; then
diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh
index 27ff6638e..4cf6f6ea7 100755
--- a/luci-app-passwall/root/usr/share/passwall/nftables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh
@@ -258,8 +258,6 @@ load_acl() {
udp_proxy_drop_ports=${udp_proxy_drop_ports:-default}
tcp_redir_ports=${tcp_redir_ports:-default}
udp_redir_ports=${udp_redir_ports:-default}
- tcp_node=${tcp_node:-nil}
- udp_node=${udp_node:-nil}
use_direct_list=${use_direct_list:-1}
use_proxy_list=${use_proxy_list:-1}
use_block_list=${use_block_list:-1}
@@ -275,25 +273,17 @@ load_acl() {
[ "$udp_redir_ports" = "default" ] && udp_redir_ports=$UDP_REDIR_PORTS
[ -n "$(get_cache_var "ACL_${sid}_tcp_node")" ] && tcp_node=$(get_cache_var "ACL_${sid}_tcp_node")
+ [ -n "$(get_cache_var "ACL_${sid}_tcp_redir_port")" ] && tcp_port=$(get_cache_var "ACL_${sid}_tcp_redir_port")
[ -n "$(get_cache_var "ACL_${sid}_udp_node")" ] && udp_node=$(get_cache_var "ACL_${sid}_udp_node")
- [ -n "$(get_cache_var "ACL_${sid}_tcp_port")" ] && tcp_port=$(get_cache_var "ACL_${sid}_tcp_port")
- [ -n "$(get_cache_var "ACL_${sid}_udp_port")" ] && udp_port=$(get_cache_var "ACL_${sid}_udp_port")
+ [ -n "$(get_cache_var "ACL_${sid}_udp_redir_port")" ] && udp_port=$(get_cache_var "ACL_${sid}_udp_redir_port")
[ -n "$(get_cache_var "ACL_${sid}_dns_port")" ] && dns_redirect_port=$(get_cache_var "ACL_${sid}_dns_port")
+ [ -n "$tcp_node" ] && tcp_node_remark=$(config_n_get $tcp_node remarks)
+ [ -n "$udp_node" ] && udp_node_remark=$(config_n_get $udp_node remarks)
use_shunt_tcp=0
use_shunt_udp=0
- [ "$tcp_node" != "nil" ] && {
- tcp_node_remark=$(config_n_get $tcp_node remarks)
- [ "$(config_n_get $tcp_node protocol)" = "_shunt" ] && use_shunt_tcp=1
- }
- [ "$udp_node" != "nil" ] && {
- udp_node_remark=$(config_n_get $udp_node remarks)
- [ "$(config_n_get $udp_node protocol)" = "_shunt" ] && use_shunt_udp=1
- }
- [ "$udp_node" == "tcp" ] && {
- udp_node_remark=$tcp_node_remark
- use_shunt_udp=$use_shunt_tcp
- }
+ [ -n "$tcp_node" ] && [ "$(config_n_get $tcp_node protocol)" = "_shunt" ] && use_shunt_tcp=1
+ [ -n "$udp_node" ] && [ "$(config_n_get $udp_node protocol)" = "_shunt" ] && use_shunt_udp=1
[ "${use_global_config}" = "1" ] && {
tcp_node_remark=$(config_n_get $TCP_NODE remarks)
@@ -556,7 +546,7 @@ load_acl() {
local DNS_REDIRECT
[ $(config_t_get global dns_redirect "1") = "1" ] && DNS_REDIRECT=53
- if ([ "$TCP_NODE" != "nil" ] && [ -n "${TCP_PROXY_MODE}" ]) || ([ "$UDP_NODE" != "nil" ] && [ -n "${UDP_PROXY_MODE}" ]); then
+ if ([ -n "$TCP_NODE" ] && [ -n "${TCP_PROXY_MODE}" ]) || ([ -n "$UDP_NODE" ] && [ -n "${UDP_PROXY_MODE}" ]); then
[ -n "${DNS_REDIRECT_PORT}" ] && DNS_REDIRECT=${DNS_REDIRECT_PORT}
else
[ -n "${DIRECT_DNSMASQ_PORT}" ] && DNS_REDIRECT=${DIRECT_DNSMASQ_PORT}
@@ -621,7 +611,7 @@ load_acl() {
# 加载TCP默认代理模式
if [ -n "${TCP_PROXY_MODE}" ]; then
- [ "$TCP_NODE" != "nil" ] && {
+ [ -n "$TCP_NODE" ] && {
msg2="${msg}使用 TCP 节点[$(config_n_get $TCP_NODE remarks)]"
if [ -n "${is_tproxy}" ]; then
msg2="${msg2}(TPROXY:${TCP_REDIR_PORT})"
@@ -679,7 +669,7 @@ load_acl() {
# 加载UDP默认代理模式
if [ -n "${UDP_PROXY_MODE}" ]; then
- [ "$UDP_NODE" != "nil" -o "$TCP_UDP" = "1" ] && {
+ [ -n "$UDP_NODE" -o "$TCP_UDP" = "1" ] && {
msg2="${msg}使用 UDP 节点[$(config_n_get $UDP_NODE remarks)](TPROXY:${UDP_REDIR_PORT})"
nft "add rule $NFTABLE_NAME PSW_MANGLE ip protocol udp ip daddr $FAKE_IP counter jump PSW_RULE comment \"默认\""
@@ -753,7 +743,7 @@ filter_server_port() {
filter_node() {
local node=${1}
local stream=${2}
- if [ -n "$node" ] && [ "$node" != "nil" ]; then
+ if [ -n "$node" ]; then
local address=$(config_n_get $node address)
local port=$(config_n_get $node port)
[ -z "$address" ] && [ -z "$port" ] && {
@@ -811,12 +801,12 @@ add_firewall_rule() {
local USE_PROXY_LIST_ALL=${USE_PROXY_LIST}
local USE_DIRECT_LIST_ALL=${USE_DIRECT_LIST}
local USE_BLOCK_LIST_ALL=${USE_BLOCK_LIST}
- local _TCP_NODE=$(config_t_get global tcp_node nil)
- local _UDP_NODE=$(config_t_get global udp_node nil)
+ local _TCP_NODE=$(config_t_get global tcp_node)
+ local _UDP_NODE=$(config_t_get global udp_node)
local USE_GEOVIEW=$(config_t_get global_rules enable_geoview)
- [ "$_TCP_NODE" != "nil" ] && [ "$(config_n_get $_TCP_NODE protocol)" = "_shunt" ] && USE_SHUNT_TCP=1 && USE_SHUNT_NODE=1
- [ "$_UDP_NODE" != "nil" ] && [ "$(config_n_get $_UDP_NODE protocol)" = "_shunt" ] && USE_SHUNT_UDP=1 && USE_SHUNT_NODE=1
+ [ -n "$_TCP_NODE" ] && [ "$(config_n_get $_TCP_NODE protocol)" = "_shunt" ] && USE_SHUNT_TCP=1 && USE_SHUNT_NODE=1
+ [ -n "$_UDP_NODE" ] && [ "$(config_n_get $_UDP_NODE protocol)" = "_shunt" ] && USE_SHUNT_UDP=1 && USE_SHUNT_NODE=1
[ "$_UDP_NODE" = "tcp" ] && USE_SHUNT_UDP=$USE_SHUNT_TCP
for acl_section in $(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1); do
@@ -1077,7 +1067,7 @@ add_firewall_rule() {
ip -6 route add local ::/0 dev lo table 100
}
- [ "$TCP_UDP" = "1" ] && [ "$UDP_NODE" = "nil" ] && UDP_NODE=$TCP_NODE
+ [ "$TCP_UDP" = "1" ] && [ -z "$UDP_NODE" ] && UDP_NODE=$TCP_NODE
[ "$ENABLED_DEFAULT_ACL" == 1 ] && {
msg="【路由器本机】，"
@@ -1104,7 +1094,7 @@ add_firewall_rule() {
fi
}
- if ([ "$TCP_NODE" != "nil" ] && [ -n "${LOCALHOST_TCP_PROXY_MODE}" ]) || ([ "$UDP_NODE" != "nil" ] && [ -n "${LOCALHOST_UDP_PROXY_MODE}" ]); then
+ if ([ -n "$TCP_NODE" ] && [ -n "${LOCALHOST_TCP_PROXY_MODE}" ]) || ([ -n "$UDP_NODE" ] && [ -n "${LOCALHOST_UDP_PROXY_MODE}" ]); then
[ -n "$DNS_REDIRECT_PORT" ] && {
nft "add rule $NFTABLE_NAME nat_output ip protocol udp oif lo udp dport 53 counter redirect to :$DNS_REDIRECT_PORT comment \"PSW\""
nft "add rule $NFTABLE_NAME nat_output ip protocol tcp oif lo tcp dport 53 counter redirect to :$DNS_REDIRECT_PORT comment \"PSW\""
@@ -1136,7 +1126,7 @@ add_firewall_rule() {
}
# 加载路由器自身代理 TCP
- if [ "$TCP_NODE" != "nil" ]; then
+ if [ -n "$TCP_NODE" ]; then
_proxy_tcp_access() {
[ -n "${2}" ] || return 0
if echo "${2}" | grep -q -v ':'; then
@@ -1219,7 +1209,7 @@ add_firewall_rule() {
fi
# 加载路由器自身代理 UDP
- if [ "$UDP_NODE" != "nil" -o "$TCP_UDP" = "1" ]; then
+ if [ -n "$UDP_NODE" -o "$TCP_UDP" = "1" ]; then
_proxy_udp_access() {
[ -n "${2}" ] || return 0
if echo "${2}" | grep -q -v ':'; then
diff --git a/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh b/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
index a7d403fa7..60ff4b413 100755
--- a/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
+++ b/luci-app-passwall/root/usr/share/passwall/socks_auto_switch.sh
@@ -61,8 +61,8 @@ test_proxy() {
test_node() {
local node_id=$1
- local _type=$(echo $(config_n_get ${node_id} type nil) | tr 'A-Z' 'a-z')
- [ "${_type}" != "nil" ] && {
+ local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
+ [ -n "${_type}" ] && {
local _tmp_port=$(/usr/share/${CONFIG}/app.sh get_new_port 61080 tcp,udp)
/usr/share/${CONFIG}/app.sh run_socks flag="test_node_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=test_node_${node_id}.json
local curlx="socks5h://127.0.0.1:${_tmp_port}"
@@ -101,7 +101,7 @@ test_auto_switch() {
fi
#检测主节点是否能使用
- if [ "$restore_switch" == "1" ] && [ "$main_node" != "nil" ] && [ "$now_node" != "$main_node" ]; then
+ if [ "$restore_switch" == "1" ] && [ -n "$main_node" ] && [ "$now_node" != "$main_node" ]; then
test_node ${main_node}
[ $? -eq 0 ] && {
#主节点正常，切换到主节点
@@ -159,7 +159,7 @@ start() {
LOCK_FILE=${LOCK_FILE_DIR}/${CONFIG}_socks_auto_switch_${id}.lock
LOG_EVENT_FILTER=$(uci -q get "${CONFIG}.global[0].log_event_filter" 2>/dev/null)
LOG_EVENT_CMD=$(uci -q get "${CONFIG}.global[0].log_event_cmd" 2>/dev/null)
- main_node=$(config_n_get $id node nil)
+ main_node=$(config_n_get $id node)
socks_port=$(config_n_get $id port 0)
delay=$(config_n_get $id autoswitch_testing_time 30)
sleep 5s
@@ -167,8 +167,8 @@ start() {
retry_num=$(config_n_get $id autoswitch_retry_num 1)
restore_switch=$(config_n_get $id autoswitch_restore_switch 0)
probe_url=$(config_n_get $id autoswitch_probe_url "https://www.google.com/generate_204")
- backup_node=$(config_n_get $id autoswitch_backup_node nil)
- while [ -n "$backup_node" -a "$backup_node" != "nil" ]; do
+ backup_node=$(config_n_get $id autoswitch_backup_node)
+ while [ -n "$backup_node" ]; do
[ -f "$LOCK_FILE" ] && {
sleep 6s
continue
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index 227e7ad70..d2ba44f24 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -264,7 +264,7 @@ do
currentNode = _node_id and uci:get_all(appname, _node_id) or nil,
remarks = "分流" .. e.remarks .. "节点",
set = function(o, server)
- if not server then server = "nil" end
+ if not server then server = "" end
uci:set(appname, node_id, e[".name"], server)
o.newNodeId = server
end
@@ -1263,10 +1263,10 @@ local function truncate_nodes(add_from)
if config.currentNode and config.currentNode.add_mode == "2" then
if add_from then
if config.currentNode.add_from and config.currentNode.add_from == add_from then
- config.set(config, "nil")
+ config.set(config, "")
end
else
- config.set(config, "nil")
+ config.set(config, "")
end
if config.id then
uci:delete(appname, config.id)
@@ -1400,7 +1400,7 @@ local function select_node(nodes, config)
config.set(config, server)
end
else
- config.set(config, "nil")
+ config.set(config, "")
end
end
diff --git a/luci-app-passwall/root/usr/share/passwall/tasks.sh b/luci-app-passwall/root/usr/share/passwall/tasks.sh
index 2597a4170..49760e9ff 100755
--- a/luci-app-passwall/root/usr/share/passwall/tasks.sh
+++ b/luci-app-passwall/root/usr/share/passwall/tasks.sh
@@ -30,6 +30,33 @@ do
if [ "$CFG_UPDATE_INT" -ne 0 ]; then
+ stop_week_mode=$(config_t_get global_delay stop_week_mode)
+ stop_interval_mode=$(config_t_get global_delay stop_interval_mode)
+ stop_interval_mode=$(expr "$stop_interval_mode" \* 60)
+ if [ -n "$stop_week_mode" ]; then
+ [ "$stop_week_mode" = "8" ] && {
+ [ "$(expr "$CFG_UPDATE_INT" % "$stop_interval_mode")" -eq 0 ] && /etc/init.d/$CONFIG stop > /dev/null 2>&1 &
+ }
+ fi
+
+ start_week_mode=$(config_t_get global_delay start_week_mode)
+ start_interval_mode=$(config_t_get global_delay start_interval_mode)
+ start_interval_mode=$(expr "$start_interval_mode" \* 60)
+ if [ -n "$start_week_mode" ]; then
+ [ "$start_week_mode" = "8" ] && {
+ [ "$(expr "$CFG_UPDATE_INT" % "$start_interval_mode")" -eq 0 ] && /etc/init.d/$CONFIG start > /dev/null 2>&1 &
+ }
+ fi
+
+ restart_week_mode=$(config_t_get global_delay restart_week_mode)
+ restart_interval_mode=$(config_t_get global_delay restart_interval_mode)
+ restart_interval_mode=$(expr "$restart_interval_mode" \* 60)
+ if [ -n "$restart_week_mode" ]; then
+ [ "$restart_week_mode" = "8" ] && {
+ [ "$(expr "$CFG_UPDATE_INT" % "$restart_interval_mode")" -eq 0 ] && /etc/init.d/$CONFIG restart > /dev/null 2>&1 &
+ }
+ fi
+
autoupdate=$(config_t_get global_rules auto_update)
weekupdate=$(config_t_get global_rules week_update)
hourupdate=$(config_t_get global_rules interval_update)
diff --git a/luci-app-passwall/root/usr/share/passwall/test.sh b/luci-app-passwall/root/usr/share/passwall/test.sh
index 7752a2650..1f596e929 100755
--- a/luci-app-passwall/root/usr/share/passwall/test.sh
+++ b/luci-app-passwall/root/usr/share/passwall/test.sh
@@ -56,8 +56,8 @@ test_proxy() {
url_test_node() {
result=0
local node_id=$1
- local _type=$(echo $(config_n_get ${node_id} type nil) | tr 'A-Z' 'a-z')
- [ "${_type}" != "nil" ] && {
+ local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
+ [ -n "${_type}" ] && {
if [ "${_type}" == "socks" ]; then
local _address=$(config_n_get ${node_id} address)
local _port=$(config_n_get ${node_id} port)
@@ -85,8 +85,8 @@ url_test_node() {
test_node() {
local node_id=$1
- local _type=$(echo $(config_n_get ${node_id} type nil) | tr 'A-Z' 'a-z')
- [ "${_type}" != "nil" ] && {
+ local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
+ [ -n "${_type}" ] && {
if [ "${_type}" == "socks" ]; then
local _address=$(config_n_get ${node_id} address)
local _port=$(config_n_get ${node_id} port)
diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch
index c2a238741..1311efb6c 100644
--- a/patch-luci-app-passwall.patch
+++ b/patch-luci-app-passwall.patch
@@ -20,7 +20,7 @@ index 2b72468..15c6437 100644
define Package/$(PKG_NAME)/postrm
diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua
-index 33c5319..6ddcdfd 100644
+index 6851861..669a612 100644
--- a/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
@@ -279,7 +279,7 @@ function connect_status()
@@ -33,10 +33,10 @@ index 33c5319..6ddcdfd 100644
if code ~= 0 then
local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'")
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
-index 488cd50..541167f 100644
+index 7ea652a..2b4c853 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
-@@ -467,6 +467,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")
+@@ -465,6 +465,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")
o:value("149.112.112.112", "149.112.112.112 (Quad9)")
o:value("208.67.220.220", "208.67.220.220 (OpenDNS)")
o:value("208.67.222.222", "208.67.222.222 (OpenDNS)")
@@ -133,12 +133,12 @@ index e8d76ec..a872950 100644
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
-index 8348217..19b16b7 100644
+index 551c824..2a6a814 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
-@@ -34,7 +34,7 @@ config global_haproxy
+@@ -31,7 +31,7 @@ config global_haproxy
+
config global_delay
- option auto_on '0'
option start_daemon '1'
- option start_delay '60'
+ option start_delay '15'