zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync upstream

Browse Source
This commit is contained in:
actions 2024-04-20 14:30:05 +08:00
parent 6b7f556aae
commit 149bd66b4b
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -319,6 +319,9 @@ run_ipt2socks() {
flag="${flag}_TCP"
_extra_param="${_extra_param} -T"
;;
*)
flag="${flag}_TCP_UDP"
;;
esac
_extra_param="${_extra_param} -v"
ln_run "$(first_type ipt2socks)" "ipt2socks_${flag}" $log_file -l $local_port -b 0.0.0.0 -s $socks_address -p $socks_port ${_extra_param}
@ -492,7 +495,7 @@ run_chinadns_ng() {
bind-addr 127.0.0.1
bind-port ${_listen_port}@udp
china-dns ${_dns_china}
trust-dns ${_dns_trust}
trust-dns udp://${_dns_trust}
filter-qtype 65
EOF
@ -522,7 +525,7 @@ run_chinadns_ng() {
cat <<-EOF >> ${_CONF_FILE}
group proxylist
group-dnl ${RULES_PATH}/proxy_host
group-upstream ${_dns_trust}
group-upstream udp://${_dns_trust}
group-ipset ${blacklist4_set},${blacklist6_set}
EOF
[ "${_no_ipv6_dns}" = "trust" ] && echo "no-ipv6 tag:proxylist" >> ${_CONF_FILE}
@ -751,12 +754,10 @@ run_redir() {
case "$type" in
socks)
local _socks_address=$(config_n_get $node address)
_socks_address=$(get_host_ip "ipv4" ${_socks_address})
local _socks_port=$(config_n_get $node port)
local _socks_username=$(config_n_get $node username)
local _socks_password=$(config_n_get $node password)
[ -n "${_socks_username}" ] && [ -n "${_socks_password}" ] && local _extra_param="-a ${_socks_username} -k ${_socks_password}"
ln_run "$(first_type ipt2socks)" "ipt2socks_UDP" $log_file -l $local_port -b 0.0.0.0 -s ${_socks_address} -p ${_socks_port} ${_extra_param} -U -v
run_ipt2socks flag=default proto=UDP local_port=${local_port} socks_address=${_socks_address} socks_port=${_socks_port} socks_username=${_socks_username} socks_password=${_socks_password} log_file=${log_file}
;;
sing-box)
run_singbox flag=UDP node=$node udp_redir_port=$local_port config_file=$config_file log_file=$log_file
@ -814,7 +815,6 @@ run_redir() {
socks)
_socks_flag=1
_socks_address=$(config_n_get $node address)
_socks_address=$(get_host_ip "ipv4" ${_socks_address})
_socks_port=$(config_n_get $node port)
_socks_username=$(config_n_get $node username)
_socks_password=$(config_n_get $node password)
@ -1004,18 +1004,14 @@ run_redir() {
esac
if [ -n "${_socks_flag}" ]; then
local _flag="TCP"
local _extra_param="-T"
[ "$TCP_UDP" = "1" ] && {
_flag="TCP_UDP"
_extra_param=""
UDP_REDIR_PORT=$TCP_REDIR_PORT
UDP_NODE="nil"
}
local _socks_tproxy="-R"
[ "$tcp_proxy_way" = "tproxy" ] && _socks_tproxy=""
_extra_param="${_extra_param} ${_socks_tproxy}"
[ -n "${_socks_username}" ] && [ -n "${_socks_password}" ] && _extra_param="-a ${_socks_username} -k ${_socks_password} ${_extra_param}"
ln_run "$(first_type ipt2socks)" "ipt2socks_${_flag}" $log_file -l $local_port -b 0.0.0.0 -s ${_socks_address} -p ${_socks_port} ${_extra_param} -v
local _socks_tproxy=""
[ "$tcp_proxy_way" = "tproxy" ] && _socks_tproxy="1"
run_ipt2socks flag=default proto=${_flag} tcp_tproxy=${_socks_tproxy} local_port=${local_port} socks_address=${_socks_address} socks_port=${_socks_port} socks_username=${_socks_username} socks_password=${_socks_password} log_file=${log_file}
fi
[ -z "$tcp_node_socks_flag" ] && {

6
luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua
View File

@ -220,7 +220,7 @@ if not fs.access(CACHE_DNS_PATH) then
--直连（白名单）列表
if USE_DIRECT_LIST == "1" then
if fs.access("/usr/share/passwall/rules/direct_host") then
fwd_dns = TUN_DNS
fwd_dns = LOCAL_DNS
if USE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then
fwd_dns = nil
end
@ -229,7 +229,7 @@ if not fs.access(CACHE_DNS_PATH) then
for line in io.lines("/usr/share/passwall/rules/direct_host") do
if line ~= "" and not line:find("#") then
add_excluded_domain(line)
set_domain_dns(line, LOCAL_DNS)
set_domain_dns(line, fwd_dns)
set_domain_ipset(line, setflag_4 .. "passwall_whitelist," .. setflag_6 .. "passwall_whitelist6")
end
end
@ -258,7 +258,7 @@ if not fs.access(CACHE_DNS_PATH) then
if REMOTE_FAKEDNS == "1" then
ipset_flag = nil
end
set_domain_dns(line, TUN_DNS)
set_domain_dns(line, fwd_dns)
set_domain_ipset(line, ipset_flag)
end
end