cwx/small-packages
1
0 Fork 0
mirror of https://github.com/caiwx86/small-packages.git synced 2026-10-31 00:55:13 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

update 2026-09-24 03:28:54

Browse Source
This commit is contained in:
action committed 2026-09-24 03:28:54 +08:00
1 parent e22304fb46
commit 3d5ff73d1e
2 files changed
+53 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-passwall/root/usr/share/passwall/iptables.sh
+28 -24
View File
@@ -842,33 +842,37 @@ update_wan_sets() {
[ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH" [ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH"
local WAN_IP=$(get_wan_ips ip4) (
[ -n "$WAN_IP" ] && { flock -x 9 || exit 1
ipset -F "$IPSET_WAN"
for wan_ip in $WAN_IP; do
ipset -! add "$IPSET_WAN" "$wan_ip"
done
[ "$log" = "log" ] && {
local wan_ip
for wan_ip in $WAN_IP; do
echolog " - [$?]加入WAN IPv4到ipset[$IPSET_WAN]：${wan_ip}"
done
}
}
local WAN6_IP=$(get_wan_ips ip6) local WAN_IP=$(get_wan_ips ip4)
[ -n "$WAN6_IP" ] && { [ -n "$WAN_IP" ] && {
ipset -F "$IPSET_WAN6" # ipset -F "$IPSET_WAN"
for wan6_ip in $WAN6_IP; do for wan_ip in $WAN_IP; do
ipset -! add "$IPSET_WAN6" "$wan6_ip" ipset -! add "$IPSET_WAN" "$wan_ip"
done
[ "$log" = "log" ] && {
local wan6_ip
for wan6_ip in $WAN6_IP; do
echolog " - [$?]加入WAN IPv6到ipset[$IPSET_WAN6]：${wan6_ip}"
done done
[ "$log" = "log" ] && {
local wan_ip
for wan_ip in $WAN_IP; do
echolog " - [$?]加入WAN IPv4到ipset[$IPSET_WAN]：${wan_ip}"
done
}
} }
}
local WAN6_IP=$(get_wan_ips ip6)
[ -n "$WAN6_IP" ] && {
# ipset -F "$IPSET_WAN6"
for wan6_ip in $WAN6_IP; do
ipset -! add "$IPSET_WAN6" "$wan6_ip"
done
[ "$log" = "log" ] && {
local wan6_ip
for wan6_ip in $WAN6_IP; do
echolog " - [$?]加入WAN IPv6到ipset[$IPSET_WAN6]：${wan6_ip}"
done
}
}
) 9>"${LOCK_PATH}/${CONFIG}_update_wan_sets.lock"
} }
set_tproxy_sysctl() { set_tproxy_sysctl() {
luci-app-passwall/root/usr/share/passwall/nftables.sh
+25 -21
View File
@@ -931,29 +931,33 @@ update_wan_sets() {
[ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH" [ -z "$(command -v get_wan_ips)" ] && . "$UTILS_PATH"
local WAN_IP=$(get_wan_ips ip4) (
[ -n "$WAN_IP" ] && { flock -x 9 || exit 1
nft flush set $NFTABLE_NAME $NFTSET_WAN
echo "$WAN_IP" | insert_nftset $NFTSET_WAN
[ "$log" = "log" ] && {
local wan_ip
for wan_ip in $WAN_IP; do
echolog " - [$?]加入WAN IPv4到nftset[$NFTSET_WAN]：${wan_ip}"
done
}
}
local WAN6_IP=$(get_wan_ips ip6) local WAN_IP=$(get_wan_ips ip4)
[ -n "${WAN6_IP}" ] && { [ -n "$WAN_IP" ] && {
nft flush set $NFTABLE_NAME $NFTSET_WAN6 # nft flush set $NFTABLE_NAME $NFTSET_WAN
echo "$WAN6_IP" | insert_nftset $NFTSET_WAN6 echo "$WAN_IP" | insert_nftset $NFTSET_WAN
[ "$log" = "log" ] && { [ "$log" = "log" ] && {
local wan6_ip local wan_ip
for wan6_ip in $WAN6_IP; do for wan_ip in $WAN_IP; do
echolog " - [$?]加入WAN IPv6到nftset[$NFTSET_WAN6]：${wan6_ip}" echolog " - [$?]加入WAN IPv4到nftset[$NFTSET_WAN]：${wan_ip}"
done done
}
} }
}
local WAN6_IP=$(get_wan_ips ip6)
[ -n "${WAN6_IP}" ] && {
# nft flush set $NFTABLE_NAME $NFTSET_WAN6
echo "$WAN6_IP" | insert_nftset $NFTSET_WAN6
[ "$log" = "log" ] && {
local wan6_ip
for wan6_ip in $WAN6_IP; do
echolog " - [$?]加入WAN IPv6到nftset[$NFTSET_WAN6]：${wan6_ip}"
done
}
}
) 9>"${LOCK_PATH}/${CONFIG}_update_wan_sets.lock"
} }
set_tproxy_sysctl() { set_tproxy_sysctl() {