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

luci: fixed https://github.com/xiaorouji/openwrt-passwall/issues/2716

Browse Source
This commit is contained in:
xiaorouji 2023-08-26 14:42:51 +08:00 committed by sbwml
parent 1fcb682b2e
commit 028eb3d81d
2 changed files with 6 additions and 5 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.68-4 PKG_VERSION:=4.68-5
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

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

@ -183,10 +183,10 @@ get_redirect_ipv6() {
echo "ip6 daddr @$NFTSET_GFW6 $(REDIRECT $2 $3)" echo "ip6 daddr @$NFTSET_GFW6 $(REDIRECT $2 $3)"
;; ;;
chnroute) chnroute)
echo "ip6 daddr != $NFTSET_CHN6 $(REDIRECT $2 $3)" echo "ip6 daddr != @$NFTSET_CHN6 $(REDIRECT $2 $3)"
;; ;;
returnhome) returnhome)
echo "ip6 daddr $NFTSET_CHN6 $(REDIRECT $2 $3)" echo "ip6 daddr @$NFTSET_CHN6 $(REDIRECT $2 $3)"
;; ;;
esac esac
} }
@ -1144,8 +1144,9 @@ del_firewall_rule() {
flush_nftset() { flush_nftset() {
del_firewall_rule del_firewall_rule
destroy_nftset $NFTSET_VPSLIST $NFTSET_SHUNTLIST $NFTSET_GFW $NFTSET_CHN $NFTSET_BLACKLIST $NFTSET_BLOCKLIST $NFTSET_WHITELIST $NFTSET_LANLIST for _name in $(nft -a list sets | grep -E "passwall" | awk -F 'set ' '{print $2}' | awk '{print $1}'); do
destroy_nftset $NFTSET_VPSLIST6 $NFTSET_SHUNTLIST6 $NFTSET_GFW6 $NFTSET_CHN6 $NFTSET_BLACKLIST6 $NFTSET_BLOCKLIST6 $NFTSET_WHITELIST6 $NFTSET_LANLIST6 destroy_nftset ${_name}
done
rm -rf /tmp/etc/passwall_tmp/dnsmasq* rm -rf /tmp/etc/passwall_tmp/dnsmasq*
/etc/init.d/passwall reload /etc/init.d/passwall reload
} }