banip: update 0.8.0-3

* properly initialize the 'proto' variable in the log service

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/banip/Makefile b/net/banip/Makefile
index 5070d8aa6dbfc3fdc79c4766330688392e67c2e5..edfe0182d23db3e206e2ea7c290e151dae645876 100644 (file)
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.8.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/banip/files/banip-service.sh b/net/banip/files/banip-service.sh
index 29a0436c981f85f22c6fb4fa1a7ddc6db96ea81a..bfdf4c72cc6e686ca4c67f258606e00e3091d9f7 100755 (executable)
--- a/net/banip/files/banip-service.sh
+++ b/net/banip/files/banip-service.sh
@@ -153,6 +153,7 @@ if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ]; then
        #
        "${ban_logreadcmd}" -fe "${ban_logterm%%??}" 2>/dev/null |
                while read -r line; do
+                       proto=""
                        # IPv4 log parsing
                        #
                        ip="$(printf "%s" "${line}" | "${ban_awkcmd}" 'BEGIN{RS="(([0-9]{1,3}\\.){3}[0-9]{1,3})+"}{if(!seen[RT]++)printf "%s ",RT}')"
@@ -168,15 +169,15 @@ if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ]; then
                                [ -n "${ip}" ] && proto="v6"
                        fi
                        if [ -n "${proto}" ] && ! "${ban_nftcmd}" get element inet banIP blocklist"${proto}" "{ ${ip} }" >/dev/null 2>&1; then
-                               f_log "info" "suspicious IP found '${ip}'"
+                               f_log "info" "suspicious IP${proto} found '${ip}'"
                                log_raw="$("${ban_logreadcmd}" -l "${ban_loglimit}" 2>/dev/null)"
                                log_count="$(printf "%s\n" "${log_raw}" | grep -c "found '${ip}'")"
                                if [ "${log_count}" -ge "${ban_logcount}" ]; then
                                        if "${ban_nftcmd}" add element inet banIP "blocklist${proto}" "{ ${ip} ${nft_expiry} }" >/dev/null 2>&1; then
-                                               f_log "info" "added IP '${ip}' (${nft_expiry:-"-"}) to blocklist${proto} set"
+                                               f_log "info" "added IP${proto} '${ip}' (${nft_expiry:-"-"}) to blocklist${proto} set"
                                                if [ "${ban_autoblocklist}" = "1" ] && ! grep -q "^${ip}" "${ban_blocklist}"; then
                                                        printf "%-42s%s\n" "${ip}" "# added on $(date "+%Y-%m-%d %H:%M:%S")" >>"${ban_blocklist}"
-                                                       f_log "info" "added IP '${ip}' to local blocklist"
+                                                       f_log "info" "added IP${proto} '${ip}' to local blocklist"
                                                fi
                                        fi
                                fi