mirror of
https://github.com/kenzok8/small-package
synced 2025-01-09 08:59:26 +08:00
update-10.07
This commit is contained in:
github-actions[bot]
parent
4f86e9c65d
commit
b99ad56714
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=aliyundrive-webdav
|
||||
PKG_VERSION:=0.4.1
|
||||
PKG_VERSION:=0.4.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-aliyundrive-webdav
|
||||
PKG_VERSION:=0.4.1
|
||||
PKG_VERSION:=0.4.2
|
||||
PKG_RELEASE:=1
|
||||
PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
|
||||
|
||||
|
||||
@ -283,11 +283,12 @@ end
|
||||
local function historychecktime()
|
||||
local CONFIG_FILE = uci:get("openclash", "config", "config_path")
|
||||
if not CONFIG_FILE then return "0" end
|
||||
local HISTORY_PATH = "/etc/openclash/history/" .. fs.filename(fs.basename(CONFIG_FILE))
|
||||
if not nixio.fs.access(HISTORY_PATH) then
|
||||
local HISTORY_PATH_OLD = "/etc/openclash/history/" .. fs.filename(fs.basename(CONFIG_FILE))
|
||||
local HISTORY_PATH = "/etc/openclash/history/" .. fs.filename(fs.basename(CONFIG_FILE)) .. ".db"
|
||||
if not nixio.fs.access(HISTORY_PATH) and not nixio.fs.access(HISTORY_PATH_OLD) then
|
||||
return "0"
|
||||
else
|
||||
return os.date("%Y-%m-%d %H:%M:%S",fs.mtime(HISTORY_PATH))
|
||||
return os.date("%Y-%m-%d %H:%M:%S",fs.mtime(HISTORY_PATH)) or os.date("%Y-%m-%d %H:%M:%S",fs.mtime(HISTORY_PATH_OLD))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1318,37 +1318,48 @@ firewall_rule_exclude()
|
||||
return
|
||||
fi
|
||||
|
||||
dest_port=$(echo $dest_port |sed "s/-/:/g" 2>/dev/null)
|
||||
|
||||
if [ -z "$family" ] || [ "$family" == "ipv4" ]; then
|
||||
if [ -z "$en_mode_tun" ] || [ "$en_mode_tun" -eq 3 ]; then
|
||||
if $e_tcp ; then
|
||||
iptables -t nat -I openclash_output -p tcp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
iptables -t mangle -I openclash_output -p udp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p udp --dport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
for i in $dest_port; do
|
||||
if $e_tcp ; then
|
||||
iptables -t nat -I openclash_output -p tcp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
iptables -t nat -I openclash -p tcp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
iptables -t mangle -I openclash_output -p udp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p udp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
elif [ "$en_mode_tun" -ne 3 ]; then
|
||||
if $e_tcp ; then
|
||||
iptables -t mangle -I openclash_output -p tcp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p tcp --dport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
iptables -t mangle -I openclash_output -p udp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p udp --dport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
for i in $dest_port; do
|
||||
if $e_tcp ; then
|
||||
iptables -t mangle -I openclash_output -p tcp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p tcp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
iptables -t mangle -I openclash_output -p udp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
iptables -t mangle -I openclash -p udp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$ipv6_enable" -eq 1 ] && [ -n "$(ip6tables -t mangle -L 2>&1 | grep -o 'Chain')" ]; then
|
||||
if [ -z "$family" ] || [ "$family" == "ipv6" ]; then
|
||||
if $e_tcp ; then
|
||||
ip6tables -t mangle -I openclash -p tcp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash_output -p tcp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
ip6tables -t mangle -I openclash -p udp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash_output -p udp --sport "$dest_port" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
for i in $dest_port; do
|
||||
if $e_tcp ; then
|
||||
ip6tables -t mangle -I openclash -p tcp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash -p tcp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash_output -p tcp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
if $e_udp ; then
|
||||
ip6tables -t mangle -I openclash -p udp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash -p udp --dport "$i" -j RETURN >/dev/null 2>&1
|
||||
ip6tables -t mangle -I openclash_output -p udp --sport "$i" -j RETURN >/dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@ -22,8 +22,8 @@ yml_other_set()
|
||||
Value_1 = YAML.load_file(i)
|
||||
if Value_1 != false then
|
||||
if Value_1.class.to_s == 'Hash' then
|
||||
if Value_1['script'] then
|
||||
if Value.key?('script') and not Value['script'].to_a.empty? then
|
||||
if Value_1['script'] and Value_1['script'].class.to_s != 'Array' then
|
||||
if Value.key?('script') and not Value_1['script'].to_a.empty? then
|
||||
if Value['script'].key?('code') and Value_1['script'].key?('code') then
|
||||
Value['script']['code'].merge!(Value_1['script']['code']).uniq
|
||||
elsif Value_1['script'].key?('code') then
|
||||
@ -48,10 +48,10 @@ yml_other_set()
|
||||
Value_1 = YAML.load_file('/etc/openclash/custom/openclash_custom_rules.list')
|
||||
if Value_1 != false then
|
||||
if Value_1.class.to_s == 'Hash' then
|
||||
if not Value_1['rules'].to_a.empty? then
|
||||
if not Value_1['rules'].to_a.empty? and Value_1['rules'].class.to_s == 'Array' then
|
||||
Value_2 = Value_1['rules'].to_a.reverse!
|
||||
end
|
||||
else
|
||||
elsif Value_1.class.to_s == 'Array'
|
||||
Value_2 = Value_1.reverse!
|
||||
end
|
||||
if defined? Value_2 then
|
||||
@ -66,10 +66,10 @@ yml_other_set()
|
||||
ruby_add_index = Value['rules'].index(Value['rules'].grep(/(GEOIP|MATCH|FINAL)/).first)
|
||||
ruby_add_index ||= -1
|
||||
if Value_3.class.to_s == 'Hash' then
|
||||
if not Value_3['rules'].to_a.empty? then
|
||||
if not Value_3['rules'].to_a.empty? and Value_3['rules'].class.to_s == 'Array' then
|
||||
Value_4 = Value_3['rules'].to_a.reverse!
|
||||
end
|
||||
else
|
||||
elsif Value_3.class.to_s == 'Array'
|
||||
Value_4 = Value_3.reverse!
|
||||
end
|
||||
if defined? Value_4 then
|
||||
@ -83,13 +83,14 @@ yml_other_set()
|
||||
Value_1 = YAML.load_file('/etc/openclash/custom/openclash_custom_rules.list')
|
||||
if Value_1 != false then
|
||||
if Value_1.class.to_s == 'Hash' then
|
||||
if not Value_1['rules'].to_a.empty? then
|
||||
if not Value_1['rules'].to_a.empty? and Value_1['rules'].class.to_s == 'Array' then
|
||||
Value['rules'] = Value_1['rules']
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
else
|
||||
elsif Value_1.class.to_s == 'Array'
|
||||
Value['rules'] = Value_1
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
end
|
||||
if File::exist?('/etc/openclash/custom/openclash_custom_rules_2.list') then
|
||||
@ -97,27 +98,29 @@ yml_other_set()
|
||||
if Value_2 != false then
|
||||
if Value['rules'].to_a.empty? then
|
||||
if Value_2.class.to_s == 'Hash' then
|
||||
if not Value_2['rules'].to_a.empty? then
|
||||
if not Value_2['rules'].to_a.empty? and Value_2['rules'].class.to_s == 'Array' then
|
||||
Value['rules'] = Value_2['rules']
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
else
|
||||
elsif Value_2.class.to_s == 'Array'
|
||||
Value['rules'] = Value_2
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
else
|
||||
ruby_add_index = Value['rules'].index(Value['rules'].grep(/(GEOIP|MATCH|FINAL)/).first)
|
||||
ruby_add_index ||= -1
|
||||
if Value_2.class.to_s == 'Hash' then
|
||||
if not Value_2['rules'].to_a.empty? then
|
||||
if not Value_2['rules'].to_a.empty? and Value_2['rules'].class.to_s == 'Array' then
|
||||
Value_3 = Value_2['rules'].to_a.reverse!
|
||||
end
|
||||
else
|
||||
elsif Value_2.class.to_s == 'Array'
|
||||
Value_3 = Value_2.reverse!
|
||||
end
|
||||
if defined? Value_3 then
|
||||
Value_3.each{|x| Value['rules'].insert(ruby_add_index,x)}
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
end
|
||||
Value['rules'] = Value['rules'].uniq
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-passwall
|
||||
PKG_VERSION:=4.36
|
||||
PKG_VERSION:=4.37
|
||||
PKG_RELEASE:=1
|
||||
#20210928
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@ local api = require "luci.model.cbi.passwall.api.api"
|
||||
local var = api.get_args(arg)
|
||||
local node_section = var["-node"]
|
||||
local proto = var["-proto"]
|
||||
local proxy_way = var["-proxy_way"]
|
||||
local redir_port = var["-redir_port"]
|
||||
local local_socks_address = var["-local_socks_address"] or "0.0.0.0"
|
||||
local local_socks_port = var["-local_socks_port"]
|
||||
@ -261,6 +262,7 @@ if node_section then
|
||||
port = tonumber(redir_port),
|
||||
protocol = "dokodemo-door",
|
||||
settings = {network = proto, followRedirect = true},
|
||||
streamSettings = {sockopt = {tproxy = proxy_way}},
|
||||
sniffing = {enabled = true, destOverride = {"http", "tls"}}
|
||||
})
|
||||
end
|
||||
|
||||
@ -91,6 +91,22 @@ if os.execute("lsmod | grep -i REDIRECT >/dev/null") == 0 and os.execute("lsmod
|
||||
o.default = "redirect"
|
||||
o:value("redirect", "REDIRECT")
|
||||
o:value("tproxy", "TPROXY")
|
||||
o:depends("ipv6_tproxy", false)
|
||||
function o.formvalue(self, section)
|
||||
local ipv6_tproxy = ListValue.formvalue(o_ipv6_tproxy, section)
|
||||
if ipv6_tproxy == "1" then
|
||||
return "tproxy"
|
||||
end
|
||||
return ListValue.formvalue(self, section)
|
||||
end
|
||||
|
||||
---- IPv6 TProxy
|
||||
o_ipv6_tproxy = s:option(Flag, "ipv6_tproxy", translate("IPv6 TProxy"),
|
||||
"<font color='red'>" .. translate(
|
||||
"Experimental feature. Make sure that your node supports IPv6.") ..
|
||||
"</font>")
|
||||
o_ipv6_tproxy.default = 0
|
||||
o_ipv6_tproxy.rmempty = false
|
||||
end
|
||||
|
||||
--[[
|
||||
@ -118,14 +134,6 @@ s = m:section(TypedSection, "global_other", translate("Other Settings"))
|
||||
s.anonymous = true
|
||||
s.addremove = false
|
||||
|
||||
---- IPv6 TProxy
|
||||
o = s:option(Flag, "ipv6_tproxy", translate("IPv6 TProxy"),
|
||||
"<font color='red'>" .. translate(
|
||||
"Experimental feature.Make sure that your node supports IPv6.") ..
|
||||
"</font>")
|
||||
o.default = 0
|
||||
o.rmempty = false
|
||||
|
||||
o = s:option(MultiValue, "status", translate("Status info"))
|
||||
o:value("big_icon", translate("Big icon")) -- 大图标
|
||||
o:value("show_check_port", translate("Show node check")) -- 显示节点检测
|
||||
|
||||
@ -1168,7 +1168,7 @@ msgstr "目前最多只能设置%s个节点，用于给访问控制使用。"
|
||||
msgid "IPv6 TProxy"
|
||||
msgstr "IPv6透明代理(TProxy)"
|
||||
|
||||
msgid "Experimental feature.Make sure that your node supports IPv6."
|
||||
msgid "Experimental feature. Make sure that your node supports IPv6."
|
||||
msgstr "实验特性，请确保你的节点支持IPv6"
|
||||
|
||||
msgid "Status info"
|
||||
|
||||
@ -33,11 +33,11 @@ config global_forwarding
|
||||
option udp_redir_ports '1:65535'
|
||||
option accept_icmp '0'
|
||||
option tcp_proxy_way 'redirect'
|
||||
|
||||
option ipv6_tproxy '0'
|
||||
|
||||
config global_other
|
||||
option status 'big_icon show_check_port show_ip111'
|
||||
option nodes_ping 'auto_ping tcping'
|
||||
option ipv6_tproxy '0'
|
||||
|
||||
config global_rules
|
||||
option auto_update '0'
|
||||
@ -79,7 +79,7 @@ config auto_switch
|
||||
option connect_timeout '3'
|
||||
option retry_num '3'
|
||||
option shunt_logic '1'
|
||||
|
||||
|
||||
config nodes '696cd32c1d5149ee95fd1b3accbad6df'
|
||||
option remarks '分流总节点'
|
||||
option type 'Xray'
|
||||
@ -93,7 +93,7 @@ config nodes '696cd32c1d5149ee95fd1b3accbad6df'
|
||||
option China 'nil'
|
||||
option default_node 'nil'
|
||||
option domainStrategy 'IPIfNonMatch'
|
||||
|
||||
|
||||
config shunt_rules 'AD'
|
||||
option remarks 'AD'
|
||||
option domain_list 'geosite:category-ads'
|
||||
@ -101,7 +101,7 @@ config shunt_rules 'AD'
|
||||
config shunt_rules 'BT'
|
||||
option remarks 'BT'
|
||||
option protocol 'bittorrent'
|
||||
|
||||
|
||||
config shunt_rules 'Telegram'
|
||||
option remarks 'Telegram'
|
||||
option ip_list '149.154.160.0/20
|
||||
|
||||
@ -303,13 +303,13 @@ load_config() {
|
||||
DNS_FORWARD=$(config_t_get global dns_forward 8.8.4.4:53 | sed 's/:/#/g')
|
||||
DNS_CACHE=$(config_t_get global dns_cache 0)
|
||||
CHINADNS_NG=$(config_t_get global chinadns_ng 1)
|
||||
|
||||
|
||||
DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label')
|
||||
[ -z "${DEFAULT_DNS}" ] && DEFAULT_DNS=$(echo -n $(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v -E "0.0.0.0|127.0.0.1|::" | head -2) | tr ' ' ',')
|
||||
LOCAL_DNS="${DEFAULT_DNS:-119.29.29.29}"
|
||||
|
||||
PROXY_IPV6=$(config_t_get global_other ipv6_tproxy 0)
|
||||
|
||||
|
||||
PROXY_IPV6=$(config_t_get global_forwarding ipv6_tproxy 0)
|
||||
|
||||
export V2RAY_LOCATION_ASSET=$(config_t_get global_rules v2ray_location_asset "/usr/share/xray/")
|
||||
export XRAY_LOCATION_ASSET=$V2RAY_LOCATION_ASSET
|
||||
mkdir -p /var/etc $TMP_PATH $TMP_BIN_PATH $TMP_ID_PATH $TMP_PORT_PATH $TMP_ROUTE_PATH $TMP_ACL_PATH $TMP_PATH2
|
||||
@ -337,7 +337,7 @@ run_ipt2socks() {
|
||||
}
|
||||
|
||||
run_v2ray() {
|
||||
local flag node redir_type redir_port socks_address socks_port socks_username socks_password http_address http_port http_username http_password log_file config_file
|
||||
local flag node proxy_way redir_type redir_port socks_address socks_port socks_username socks_password http_address http_port http_username http_password log_file config_file
|
||||
local _extra_param=""
|
||||
local proto="tcp,udp"
|
||||
eval_set_val $@
|
||||
@ -352,13 +352,15 @@ run_v2ray() {
|
||||
UDP)
|
||||
flag="${flag}_UDP"
|
||||
proto="udp"
|
||||
proxy_way="tproxy"
|
||||
;;
|
||||
TCP)
|
||||
flag="${flag}_TCP"
|
||||
proto="tcp"
|
||||
proxy_way=$tcp_proxy_way
|
||||
;;
|
||||
esac
|
||||
lua $API_GEN_V2RAY -node $node -proto $proto -redir_port $redir_port -local_socks_address $socks_address -local_socks_port $socks_port -local_http_address $http_address -local_http_port $http_port ${_extra_param} > $config_file
|
||||
lua $API_GEN_V2RAY -node $node -proto $proto -redir_port $redir_port -proxy_way $proxy_way -local_socks_address $socks_address -local_socks_port $socks_port -local_http_address $http_address -local_http_port $http_port ${_extra_param} > $config_file
|
||||
ln_start_bin "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $log_file -config="$config_file"
|
||||
}
|
||||
|
||||
@ -563,7 +565,7 @@ run_redir() {
|
||||
v2ray|\
|
||||
xray)
|
||||
local loglevel=$(config_t_get global loglevel "warning")
|
||||
lua $API_GEN_V2RAY -node $node -proto udp -redir_port $local_port -loglevel $loglevel > $config_file
|
||||
lua $API_GEN_V2RAY -node $node -proto udp -redir_port $local_port -proxy_way tproxy -loglevel $loglevel > $config_file
|
||||
ln_start_bin "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $log_file -config="$config_file"
|
||||
;;
|
||||
trojan-go)
|
||||
@ -627,14 +629,14 @@ run_redir() {
|
||||
ln_start_bin "$(first_type $(config_t_get global_app kcptun_client_file) kcptun-client)" "kcptun_TCP" $log_file $kcptun_params
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if [ "$tcp_proxy_way" = "redirect" ]; then
|
||||
can_ipt=$(echo "$REDIRECT_LIST" | grep "$type")
|
||||
elif [ "$tcp_proxy_way" = "tproxy" ]; then
|
||||
can_ipt=$(echo "$TPROXY_LIST" | grep "$type")
|
||||
fi
|
||||
[ -z "$can_ipt" ] && type="socks"
|
||||
|
||||
|
||||
case "$type" in
|
||||
socks)
|
||||
_socks_flag=1
|
||||
@ -675,7 +677,7 @@ run_redir() {
|
||||
UDP_NODE="nil"
|
||||
}
|
||||
_extra_param="${_extra_param} ${proto}"
|
||||
lua $API_GEN_V2RAY -node $node -redir_port $local_port -loglevel $loglevel ${_extra_param} > $config_file
|
||||
lua $API_GEN_V2RAY -node $node -redir_port $local_port -proxy_way $tcp_proxy_way -loglevel $loglevel ${_extra_param} > $config_file
|
||||
ln_start_bin "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $log_file -config="$config_file"
|
||||
;;
|
||||
trojan-go)
|
||||
@ -841,7 +843,7 @@ node_switch() {
|
||||
break
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
[ "$3" != "0" ] && {
|
||||
local tcp_node=$(config_t_get global tcp_node nil)
|
||||
[ "$(config_n_get $tcp_node protocol nil)" = "_shunt" ] && {
|
||||
@ -857,7 +859,7 @@ node_switch() {
|
||||
|
||||
run_redir node=$node bind=0.0.0.0 local_port=$port config_file=$config_file REDIR_TYPE=$1 log_file=$log_file
|
||||
echo $node > $TMP_ID_PATH/${1}
|
||||
|
||||
|
||||
[ "$3" != "0" ] && [ "$(config_n_get $node protocol nil)" = "_shunt" ] && {
|
||||
echo $(config_n_get $node default_node nil) > $TMP_ID_PATH/${1}_default
|
||||
echo $(config_n_get $node main_node nil) > $TMP_ID_PATH/${1}_main
|
||||
@ -1062,7 +1064,7 @@ start_dns() {
|
||||
_doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}')
|
||||
_doh_bootstrap=$(echo $up_trust_doh | cut -d ',' -sf 2-)
|
||||
[ "${DNS_CACHE}" == "0" ] && local _extra_param="-dns_cache 0"
|
||||
|
||||
|
||||
if [ "$up_trust_doh_dns" = "socks" ]; then
|
||||
use_tcp_node_resolve_dns=0
|
||||
socks_server=$(echo $(config_t_get global socks_server 127.0.0.1:1080) | sed "s/#/:/g")
|
||||
@ -1102,10 +1104,10 @@ start_dns() {
|
||||
echolog " - 域名解析：使用UDP协议自定义DNS（$TUN_DNS）解析..."
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
[ "${use_tcp_node_resolve_dns}" = "1" ] && echolog " * 请确认上游 DNS 支持 TCP 查询，如非直连地址，确保 TCP 代理打开，并且已经正确转发！"
|
||||
[ "${use_udp_node_resolve_dns}" = "1" ] && echolog " * 要求代理 DNS 请求，如上游 DNS 非直连地址，确保 UDP 代理打开，并且已经正确转发！"
|
||||
|
||||
|
||||
[ -n "$chnlist" ] && [ "$CHINADNS_NG" = "1" ] && [ -n "$(first_type chinadns-ng)" ] && [ -s "${RULES_PATH}/chnlist" ] && {
|
||||
china_ng_listen_port=$(expr $dns_listen_port + 1)
|
||||
china_ng_listen="127.0.0.1#${china_ng_listen_port}"
|
||||
@ -1317,7 +1319,7 @@ start_haproxy() {
|
||||
if [ "$export" != "0" ]; then
|
||||
add_ip2route ${bip} ${export} > /dev/null 2>&1 &
|
||||
fi
|
||||
|
||||
|
||||
haproxy_items="${haproxy_items}${IFS}${bip}:${bport}"
|
||||
echolog " | - 出口节点：${bip}:${bport}，权重：${lbweight}"
|
||||
done
|
||||
@ -1371,7 +1373,7 @@ start() {
|
||||
load_config
|
||||
start_haproxy
|
||||
start_socks
|
||||
|
||||
|
||||
[ "$NO_PROXY" == 1 ] || {
|
||||
if [ -z "$(command -v iptables)" ] && [ -z "$(command -v ipset)" ]; then
|
||||
echolog "系统未安装iptables或ipset，无法透明代理！"
|
||||
|
||||
@ -190,7 +190,7 @@ load_acl() {
|
||||
sid=$(uci -q show "${CONFIG}.${item}" | grep "=acl_rule" | awk -F '=' '{print $1}' | awk -F '.' '{print $2}')
|
||||
eval $(uci -q show "${CONFIG}.${item}" | cut -d'.' -sf 3-)
|
||||
[ -z "${ip_mac}" ] && continue
|
||||
|
||||
|
||||
for i in ${ip_mac}; do
|
||||
ip_or_mac=$(lua_api "ip_or_mac(\"${i}\")")
|
||||
if [ "${ip_or_mac}" = "ip" ] || [ "${ip_or_mac}" = "mac" ]; then
|
||||
@ -240,7 +240,7 @@ load_acl() {
|
||||
fi
|
||||
eval node_${tcp_node}_$(echo -n "${dns_forward}" | md5sum | cut -d " " -f1)=${_dns_port}
|
||||
}
|
||||
|
||||
|
||||
dnsmasq_port=$(get_new_port $(expr $dnsmasq_port + 1))
|
||||
redirect_dns_port=$dnsmasq_port
|
||||
mkdir -p $TMP_ACL_PATH/$sid
|
||||
@ -275,7 +275,7 @@ load_acl() {
|
||||
eval node_${tcp_node}_redir_port=$redir_port
|
||||
tcp_port=$redir_port
|
||||
config_file=$TMP_ACL_PATH/${tcp_node}_SOCKS_${socks_port}.json
|
||||
|
||||
|
||||
local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
|
||||
if [ -n "${type}" ] && ([ "${type}" = "v2ray" ] || [ "${type}" = "xray" ]); then
|
||||
config_file=$(echo $config_file | sed "s/SOCKS/TCP_UDP_SOCKS/g")
|
||||
@ -318,7 +318,7 @@ load_acl() {
|
||||
eval node_${udp_node}_redir_port=$redir_port
|
||||
udp_port=$redir_port
|
||||
config_file=$TMP_ACL_PATH/${udp_node}_SOCKS_${socks_port}.json
|
||||
|
||||
|
||||
local type=$(echo $(config_n_get $udp_node type) | tr 'A-Z' 'a-z')
|
||||
if [ -n "${type}" ] && ([ "${type}" = "v2ray" ] || [ "${type}" = "xray" ]); then
|
||||
config_file=$(echo $config_file | sed "s/SOCKS/TCP_UDP_SOCKS/g")
|
||||
@ -337,7 +337,7 @@ load_acl() {
|
||||
fi
|
||||
udp_node_remark=$(config_n_get $udp_node remarks)
|
||||
}
|
||||
|
||||
|
||||
for i in ${ip_mac_list}; do
|
||||
ip_or_mac=$(lua_api "ip_or_mac(\"${i}\")")
|
||||
if [ "${ip_or_mac}" = "ip" ]; then
|
||||
@ -348,12 +348,12 @@ load_acl() {
|
||||
unset ip
|
||||
fi
|
||||
[ -z "${ip}${mac}" ] && continue
|
||||
|
||||
|
||||
[ -n "$ip" ] && msg="备注：$remarks，IP：$ip，"
|
||||
[ -n "$mac" ] && msg="备注：$remarks，MAC：$mac，"
|
||||
ipt_tmp=$ipt_n
|
||||
[ -n "${is_tproxy}" ] && ipt_tmp=$ipt_m
|
||||
|
||||
|
||||
[ -n "$tcp_port" ] && {
|
||||
if [ "$tcp_proxy_mode" != "disable" ]; then
|
||||
[ -n "$redirect_dns_port" ] && $ipt_n -A PSW_REDIRECT $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") --dport 53 -j REDIRECT --to-ports $redirect_dns_port
|
||||
@ -374,7 +374,7 @@ load_acl() {
|
||||
$ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $tcp_port $is_tproxy)
|
||||
$ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $tcp_port $is_tproxy)
|
||||
$ipt_tmp -A PSW $(comment "$remarks") -p tcp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") $(get_redirect_ipt $tcp_proxy_mode $tcp_port $is_tproxy)
|
||||
|
||||
|
||||
[ "$accept_icmp" = "1" ] && {
|
||||
$ipt_n -A PSW $(comment "$remarks") -p icmp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -d $FAKE_IP $(REDIRECT $tcp_port)
|
||||
$ipt_n -A PSW $(comment "$remarks") -p icmp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(dst $IPSET_SHUNTLIST) $(REDIRECT $tcp_port)
|
||||
@ -392,10 +392,10 @@ load_acl() {
|
||||
fi
|
||||
echolog " - ${msg2}"
|
||||
}
|
||||
|
||||
|
||||
$ipt_tmp -A PSW $(comment "$remarks") $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p tcp -j RETURN
|
||||
$ip6t_m -A PSW $(comment "$remarks") $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p tcp -j RETURN 2>/dev/null
|
||||
|
||||
|
||||
[ -n "$udp_port" ] && {
|
||||
if [ "$udp_proxy_mode" != "disable" ]; then
|
||||
msg2="${msg}使用UDP节点[$udp_node_remark] [$(get_action_chain_name $udp_proxy_mode)]"
|
||||
@ -411,11 +411,11 @@ load_acl() {
|
||||
$ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $udp_port TPROXY)
|
||||
$ipt_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(get_redirect_ipt $udp_proxy_mode $udp_port TPROXY)
|
||||
|
||||
if [ "$PROXY_IPV6" == "1" ]; then
|
||||
$ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $udp_port TPROXY) 2>/dev/null
|
||||
$ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $udp_port TPROXY) 2>/dev/null
|
||||
$ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(get_redirect_ip6t $udp_proxy_mode $udp_port TPROXY) 2>/dev/null
|
||||
fi
|
||||
# if [ "$PROXY_IPV6" == "1" ]; then
|
||||
# $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $udp_port TPROXY) 2>/dev/null
|
||||
# $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $udp_port TPROXY) 2>/dev/null
|
||||
# $ip6t_m -A PSW $(comment "$remarks") -p udp $(factor $ip "-s") $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") $(get_redirect_ip6t $udp_proxy_mode $udp_port TPROXY) 2>/dev/null
|
||||
# fi
|
||||
else
|
||||
msg2="${msg}不代理UDP"
|
||||
fi
|
||||
@ -456,7 +456,7 @@ load_acl() {
|
||||
$ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $TCP_REDIR_PORT $is_tproxy)
|
||||
$ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $TCP_REDIR_PORT $is_tproxy)
|
||||
$ipt_tmp -A PSW $(comment "默认") -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $TCP_PROXY_MODE $TCP_REDIR_PORT $is_tproxy)
|
||||
|
||||
|
||||
[ "$accept_icmp" = "1" ] && {
|
||||
$ipt_n -A PSW $(comment "默认") -p icmp -d $FAKE_IP $(REDIRECT $TCP_REDIR_PORT)
|
||||
$ipt_n -A PSW $(comment "默认") -p icmp $(dst $IPSET_SHUNTLIST) $(REDIRECT $TCP_REDIR_PORT)
|
||||
@ -494,11 +494,11 @@ load_acl() {
|
||||
$ipt_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $(REDIRECT $UDP_REDIR_PORT TPROXY)
|
||||
$ipt_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY)
|
||||
|
||||
if [ "$PROXY_IPV6" == "1" ]; then
|
||||
$ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY)
|
||||
$ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY)
|
||||
$ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY)
|
||||
fi
|
||||
# if [ "$PROXY_IPV6" == "1" ]; then
|
||||
# $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY)
|
||||
# $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $UDP_REDIR_PORT TPROXY)
|
||||
# $ip6t_m -A PSW $(comment "默认") -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY)
|
||||
# fi
|
||||
|
||||
echolog "${msg}"
|
||||
}
|
||||
@ -577,7 +577,7 @@ filter_node() {
|
||||
msg="[$?]$(echo ${2} | tr 'a-z' 'A-Z')${msg2}使用链${ADD_INDEX}，节点（${type}）：${address}:${port}"
|
||||
#echolog " - ${msg}"
|
||||
}
|
||||
|
||||
|
||||
local proxy_protocol=$(config_n_get $proxy_node protocol)
|
||||
local proxy_type=$(echo $(config_n_get $proxy_node type nil) | tr 'A-Z' 'a-z')
|
||||
[ "$proxy_type" == "nil" ] && echolog " - 节点配置不正常，略过！：${proxy_node}" && return 0
|
||||
@ -601,7 +601,7 @@ filter_node() {
|
||||
:<<!
|
||||
local default_node_address=$(get_host_ip ipv4 $(config_n_get $default_node address) 1)
|
||||
local default_node_port=$(config_n_get $default_node port)
|
||||
|
||||
|
||||
local shunt_ids=$(uci show $CONFIG | grep "=shunt_rules" | awk -F '.' '{print $2}' | awk -F '=' '{print $1}')
|
||||
for shunt_id in $shunt_ids; do
|
||||
#local shunt_proxy=$(config_n_get $proxy_node "${shunt_id}_proxy" 0)
|
||||
@ -677,7 +677,7 @@ add_firewall_rule() {
|
||||
ipset -! -R <<-EOF
|
||||
$(gen_laniplist_6 | sed -e "s/^/add $IPSET_LANIPLIST6 /")
|
||||
EOF
|
||||
|
||||
|
||||
# 忽略特殊IP段
|
||||
local lan_ifname lan_ip
|
||||
lan_ifname=$(uci -q -p /var/state get network.lan.ifname)
|
||||
@ -712,14 +712,14 @@ add_firewall_rule() {
|
||||
ipset -! add $IPSET_WHITELIST6 $ispip6 >/dev/null 2>&1 &
|
||||
#echolog " - 追加到白名单：${ispip6}"
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
# 过滤所有节点IP
|
||||
filter_vpsip > /dev/null 2>&1 &
|
||||
filter_haproxy > /dev/null 2>&1 &
|
||||
|
||||
|
||||
local accept_icmp=$(config_t_get global_forwarding accept_icmp 0)
|
||||
|
||||
|
||||
local tcp_proxy_way=$(config_t_get global_forwarding tcp_proxy_way redirect)
|
||||
if [ "$tcp_proxy_way" = "redirect" ]; then
|
||||
unset is_tproxy
|
||||
@ -743,10 +743,10 @@ add_firewall_rule() {
|
||||
$ipt_n -A PSW_OUTPUT $(dst $IPSET_VPSIPLIST) -j RETURN
|
||||
$ipt_n -A PSW_OUTPUT $(dst $IPSET_WHITELIST) -j RETURN
|
||||
$ipt_n -A PSW_OUTPUT -m mark --mark 0xff -j RETURN
|
||||
|
||||
|
||||
$ipt_n -N PSW_REDIRECT
|
||||
$ipt_n -I PREROUTING 1 -j PSW_REDIRECT
|
||||
|
||||
|
||||
# 据说能提升性能？
|
||||
PR_INDEX=$(RULE_LAST_INDEX "$ipt_m" PREROUTING mwan3 1)
|
||||
$ipt_m -N PSW_DIVERT
|
||||
@ -773,7 +773,7 @@ add_firewall_rule() {
|
||||
|
||||
ip rule add fwmark 1 lookup 100
|
||||
ip route add local 0.0.0.0/0 dev lo table 100
|
||||
|
||||
|
||||
# 据说能提升性能？
|
||||
$ip6t_m -N PSW_DIVERT
|
||||
$ip6t_m -A PSW_DIVERT -j MARK --set-mark 1
|
||||
@ -812,7 +812,7 @@ add_firewall_rule() {
|
||||
blist_r=$(REDIRECT 1 MARK)
|
||||
p_r=$(get_redirect_ipt $LOCALHOST_TCP_PROXY_MODE 1 MARK)
|
||||
fi
|
||||
|
||||
|
||||
[ "$accept_icmp" = "1" ] && {
|
||||
$ipt_n -A OUTPUT -p icmp -j PSW_OUTPUT
|
||||
$ipt_n -A PSW_OUTPUT -p icmp -d $FAKE_IP $(REDIRECT $TCP_REDIR_PORT)
|
||||
@ -820,7 +820,7 @@ add_firewall_rule() {
|
||||
$ipt_n -A PSW_OUTPUT -p icmp $(dst $IPSET_BLACKLIST) $(REDIRECT $TCP_REDIR_PORT)
|
||||
$ipt_n -A PSW_OUTPUT -p icmp $(get_redirect_ipt $TCP_PROXY_MODE $TCP_REDIR_PORT)
|
||||
}
|
||||
|
||||
|
||||
_proxy_tcp_access() {
|
||||
[ -n "${2}" ] || return 0
|
||||
ipset -q test $IPSET_LANIPLIST ${2}
|
||||
@ -836,7 +836,7 @@ add_firewall_rule() {
|
||||
fi
|
||||
echolog " - [$?]将上游 DNS 服务器 ${2}:${3} 加入到路由器自身代理的 TCP 转发链"
|
||||
}
|
||||
|
||||
|
||||
[ "$use_tcp_node_resolve_dns" == 1 ] && hosts_foreach DNS_FORWARD _proxy_tcp_access 53
|
||||
$ipt_tmp -A OUTPUT -p tcp -j PSW_OUTPUT
|
||||
[ "$TCP_NO_REDIR_PORTS" != "disable" ] && {
|
||||
@ -846,12 +846,12 @@ add_firewall_rule() {
|
||||
$ip6t_m -A PSW_OUTPUT -p tcp -m multiport --sport $TCP_NO_REDIR_PORTS -j RETURN
|
||||
echolog " - [$?]不代理TCP 端口：$TCP_NO_REDIR_PORTS"
|
||||
}
|
||||
|
||||
|
||||
$ipt_tmp -A PSW_OUTPUT -p tcp -d $FAKE_IP $blist_r
|
||||
$ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $blist_r
|
||||
$ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST) $blist_r
|
||||
$ipt_tmp -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $p_r
|
||||
|
||||
|
||||
if [ -n "${is_tproxy}" ]; then
|
||||
$ipt_m -A PSW $(comment "本机") -p tcp -i lo -d $FAKE_IP $(REDIRECT $TCP_REDIR_PORT TPROXY)
|
||||
$ipt_m -A PSW $(comment "本机") -p tcp -i lo $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST) $(REDIRECT $TCP_REDIR_PORT TPROXY)
|
||||
@ -864,7 +864,7 @@ add_firewall_rule() {
|
||||
$ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT 1 MARK)
|
||||
$ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT 1 MARK)
|
||||
$ip6t_m -A PSW_OUTPUT -p tcp $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_TCP_PROXY_MODE 1 MARK)
|
||||
|
||||
|
||||
$ip6t_m -A PSW $(comment "本机") -p tcp -i lo $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $TCP_REDIR_PORT $is_tproxy)
|
||||
$ip6t_m -A PSW $(comment "本机") -p tcp -i lo $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $TCP_REDIR_PORT $is_tproxy)
|
||||
$ip6t_m -A PSW $(comment "本机") -p tcp -i lo $(factor $TCP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_TCP_PROXY_MODE $TCP_REDIR_PORT $is_tproxy)
|
||||
@ -946,16 +946,16 @@ add_firewall_rule() {
|
||||
$ipt_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ipt $LOCALHOST_UDP_PROXY_MODE $UDP_REDIR_PORT TPROXY)
|
||||
$ipt_m -A PSW $(comment "本机") -p udp -i lo -j RETURN
|
||||
|
||||
if [ "$PROXY_IPV6" == "1" ]; then
|
||||
$ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT 1 MARK)
|
||||
$ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT 1 MARK)
|
||||
$ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_UDP_PROXY_MODE 1 MARK)
|
||||
|
||||
$ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $UDP_REDIR_PORT $is_tproxy)
|
||||
$ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $UDP_REDIR_PORT $is_tproxy)
|
||||
$ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_UDP_PROXY_MODE $UDP_REDIR_PORT $is_tproxy)
|
||||
$ip6t_m -A PSW $(comment "本机") -p udp -i lo -j RETURN
|
||||
fi
|
||||
# if [ "$PROXY_IPV6" == "1" ]; then
|
||||
# $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT 1 MARK)
|
||||
# $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT 1 MARK)
|
||||
# $ip6t_m -A PSW_OUTPUT -p udp $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_UDP_PROXY_MODE 1 MARK)
|
||||
|
||||
# $ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_SHUNTLIST6) $(REDIRECT $UDP_REDIR_PORT $is_tproxy)
|
||||
# $ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(dst $IPSET_BLACKLIST6) $(REDIRECT $UDP_REDIR_PORT $is_tproxy)
|
||||
# $ip6t_m -A PSW $(comment "本机") -p udp -i lo $(factor $UDP_REDIR_PORTS "-m multiport --dport") $(get_redirect_ip6t $LOCALHOST_UDP_PROXY_MODE $UDP_REDIR_PORT $is_tproxy)
|
||||
# $ip6t_m -A PSW $(comment "本机") -p udp -i lo -j RETURN
|
||||
# fi
|
||||
fi
|
||||
|
||||
# 加载ACLS
|
||||
@ -979,13 +979,13 @@ del_firewall_rule() {
|
||||
$ipt -X $chain 2>/dev/null
|
||||
done
|
||||
done
|
||||
|
||||
|
||||
ip rule del fwmark 1 lookup 100 2>/dev/null
|
||||
ip route del local 0.0.0.0/0 dev lo table 100 2>/dev/null
|
||||
|
||||
ip -6 rule del fwmark 1 table 100 2>/dev/null
|
||||
ip -6 route del local ::/0 dev lo table 100 2>/dev/null
|
||||
|
||||
|
||||
destroy_ipset $IPSET_LANIPLIST
|
||||
destroy_ipset $IPSET_VPSIPLIST
|
||||
#destroy_ipset $IPSET_SHUNTLIST
|
||||
@ -994,7 +994,7 @@ del_firewall_rule() {
|
||||
#destroy_ipset $IPSET_BLACKLIST
|
||||
destroy_ipset $IPSET_BLOCKLIST
|
||||
destroy_ipset $IPSET_WHITELIST
|
||||
|
||||
|
||||
destroy_ipset $IPSET_LANIPLIST6
|
||||
destroy_ipset $IPSET_VPSIPLIST6
|
||||
#destroy_ipset $IPSET_SHUNTLIST6
|
||||
@ -1003,14 +1003,14 @@ del_firewall_rule() {
|
||||
#destroy_ipset $IPSET_BLACKLIST6
|
||||
destroy_ipset $IPSET_BLOCKLIST6
|
||||
destroy_ipset $IPSET_WHITELIST6
|
||||
|
||||
|
||||
echolog "删除相关防火墙规则完成。"
|
||||
}
|
||||
|
||||
flush_ipset() {
|
||||
del_firewall_rule
|
||||
destroy_ipset $IPSET_VPSIPLIST $IPSET_SHUNTLIST $IPSET_GFW $IPSET_CHN $IPSET_BLACKLIST $IPSET_BLOCKLIST $IPSET_WHITELIST $IPSET_LANIPLIST
|
||||
destroy_ipset $IPSET_VPSIPLIST6 $IPSET_SHUNTLIST6 $IPSET_GFW6 $IPSET_CHN6 $IPSET_BLACKLIST6 $IPSET_BLOCKLIST6 $IPSET_WHITELIST6 $IPSET_LANIPLIST6
|
||||
destroy_ipset $IPSET_VPSIPLIST6 $IPSET_SHUNTLIST6 $IPSET_GFW6 $IPSET_CHN6 $IPSET_BLACKLIST6 $IPSET_BLOCKLIST6 $IPSET_WHITELIST6 $IPSET_LANIPLIST6
|
||||
/etc/init.d/passwall reload
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user