banip: update 0.9.6-3

* fixed concurrent, too high nft loads during feed processing (seen in LuCI frontend)

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2024-06-01 16:06:59 +02:00
parent 8c7e0d56f3
commit 3584187f69
2 changed files with 4 additions and 4 deletions

View File

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=banip PKG_NAME:=banip
PKG_VERSION:=0.9.6 PKG_VERSION:=0.9.6
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

View File

@@ -332,7 +332,7 @@ f_conf() {
f_actual() { f_actual() {
local nft monitor ppid pids pid local nft monitor ppid pids pid
if "${ban_nftcmd}" list chain inet banIP pre-routing >/dev/null 2>&1; then if "${ban_nftcmd}" -t list set inet banIP allowlistv4MAC >/dev/null 2>&1; then
nft="$(f_char "1")" nft="$(f_char "1")"
else else
nft="$(f_char "0")" nft="$(f_char "0")"
@@ -632,7 +632,7 @@ f_nftinit() {
# nft header (tables and chains) # nft header (tables and chains)
# #
printf "%s\n\n" "#!/usr/sbin/nft -f" printf "%s\n\n" "#!/usr/sbin/nft -f"
if "${ban_nftcmd}" list chain inet banIP pre-routing >/dev/null 2>&1; then if "${ban_nftcmd}" -t list set inet banIP allowlistv4MAC >/dev/null 2>&1; then
printf "%s\n" "delete table inet banIP" printf "%s\n" "delete table inet banIP"
fi fi
printf "%s\n" "add table inet banIP" printf "%s\n" "add table inet banIP"
@@ -1292,7 +1292,7 @@ f_getstatus() {
else else
json_get_var value "${key}" >/dev/null 2>&1 json_get_var value "${key}" >/dev/null 2>&1
if [ "${key}" = "status" ]; then if [ "${key}" = "status" ]; then
value="${value} ($(f_actual))" [ "${value}" = "active" ] && value="${value} ($(f_actual))" || value="${value}"
fi fi
fi fi
if [ "${key}" != "wan_interfaces" ] && [ "${key}" != "vlan_allow" ] && [ "${key}" != "vlan_block" ]; then if [ "${key}" != "wan_interfaces" ] && [ "${key}" != "vlan_allow" ] && [ "${key}" != "vlan_block" ]; then