From 426dc1ffa86735e946fb37af9833c3493010831a Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Tue, 17 Dec 2024 16:37:54 +0100 Subject: [PATCH] fixup! reforis: update to version 3.2.1 --- .../files/sentinel-firewall.nftables.sh | 2 +- collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh b/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh index cfeeb0e1f..93f985767 100755 --- a/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh +++ b/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh @@ -13,7 +13,7 @@ wl_list_cb() { local val="$1" if echo "$val" | grep -q "^[0-9.]*$"; then nft add element inet turris-sentinel dynfw_4_wl "{ $val }" - elif echo "$val" | grep -q "^[0-9a-fA-F/:]*$"; then + elif echo "$val" | grep -q "^[0-9a-fA-F:]*/*[0-9]*$"; then nft add element inet turris-sentinel dynfw_6_wl "{ $val }" else echo "Invalid ip address $val" >&2 diff --git a/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults b/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults index d4d2065dc..72edd62f3 100755 --- a/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults +++ b/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults @@ -6,9 +6,5 @@ set -e uci -q delete firewall.sentinel_dynfw_client || : uci -q delete firewall.sentinel_dynfw_client_ipset || : - -# Enable for default wan interface -config_firewall_default_enable "sentinel_dynfw" - # Always reload firewall to use latest version of sentinel-firewall script /etc/init.d/firewall reload