From 71e01e841330f43e1309c9c2cf845cad6fe69eda Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sat, 15 Feb 2025 10:59:53 +0100
Subject: [PATCH] logging_ipv[46].conf: add missing parameter 'log_blocked_ip'.

---
 conf/logging_ipv4.conf | 2 ++
 conf/logging_ipv6.conf | 2 ++
 ip6t-firewall-server   | 4 ++--
 ipt-firewall-server    | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/conf/logging_ipv4.conf b/conf/logging_ipv4.conf
index 253e204..eb13928 100644
--- a/conf/logging_ipv4.conf
+++ b/conf/logging_ipv4.conf
@@ -40,6 +40,8 @@ log_prohibited=false
 log_voip=false
 log_rejected=true
 
+log_blocked_ip=false
+
 log_ssh=false
 
 # - logging messages
diff --git a/conf/logging_ipv6.conf b/conf/logging_ipv6.conf
index aecb621..808f7be 100644
--- a/conf/logging_ipv6.conf
+++ b/conf/logging_ipv6.conf
@@ -40,6 +40,8 @@ log_prohibited=false
 log_voip=false
 log_rejected=true
 
+log_blocked_ip=false
+
 log_ssh=false
 
 # - logging messages
diff --git a/ip6t-firewall-server b/ip6t-firewall-server
index 981cda2..8c88124 100755
--- a/ip6t-firewall-server
+++ b/ip6t-firewall-server
@@ -547,9 +547,9 @@ if [[ -f "$conf_ban_ipv6_list" ]] ; then
 
          for _dev in ${ext_if_arr[@]} ; do
             if $log_blocked_ip || $log_all ; then
-               $ip6t -A INPUT -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked: "
+               $ip6t -A INPUT -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked by ban_ipv6.list: "
                if $kernel_forward_between_interfaces ; then
-                  $ip6t -A FORWARD -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked: "
+                  $ip6t -A FORWARD -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked by ban_ipv6.list: "
                fi
             fi
 
diff --git a/ipt-firewall-server b/ipt-firewall-server
index 769e01f..1fa5ff6 100755
--- a/ipt-firewall-server
+++ b/ipt-firewall-server
@@ -675,9 +675,9 @@ if [[ -f "$conf_ban_ipv4_list" ]] ; then
 
          for _dev in ${ext_if_arr[@]} ; do
             if $log_blocked_ip || $log_all ; then
-               $ipt -A INPUT -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked:"
+               $ipt -A INPUT -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked by ban_ipv4.list:"
                if $kernel_activate_forwarding ; then
-                  $ipt -A FORWARD -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked:"
+                  $ipt -A FORWARD -i $_dev -s $_ip -j $LOG_TARGET $tag_log_prefix "$log_prefix Blocked by ban_ipv4.list::"
                fi
             fi
             $ipt -A INPUT -i $_dev -s $_ip -j DROP