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

luci: fix nftset elements add

Browse Source
This commit is contained in:
ShanStone 2023-05-08 11:05:15 +08:00 committed by sbwml
parent 2fb02e7783
commit f469378142
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.66-2 PKG_VERSION:=4.66-3
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

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

@ -124,11 +124,21 @@ destroy_nftset() {
insert_nftset() { insert_nftset() {
local nftset_name="${1}"; shift local nftset_name="${1}"; shift
local nftset_elements local nftset_elements
for element in $@ for element in $@
do do
nftset_elements="$element,$nftset_elements" nftset_elements="$element,$nftset_elements"
done done
[ -n "${nftset_elements}" ] && nft "add element inet fw4 $nftset_name { $nftset_elements }" [ -n "${nftset_elements}" ] && {
mkdir -p $TMP_PATH2/nftset
cat > "$TMP_PATH2/nftset/$nftset_name" <<-EOF
define $nftset_name = {$nftset_elements}
add element inet fw4 $nftset_name \$$nftset_name
EOF
nft -f "$TMP_PATH2/nftset/$nftset_name"
rm -rf "$TMP_PATH2/nftset"
}
} }
gen_nftset() { gen_nftset() {