fw4: fix formatting of default log prefix

[project/firewall4.git] / root / usr / share / ucode / fw4.uc

diff --git a/root/usr/share/ucode/fw4.uc b/root/usr/share/ucode/fw4.uc
index a7837ed4088e977eea96c841951733b91c30c821..2a1e397c2e84c9437319232760c528c36dd3e148 100644 (file)
--- a/root/usr/share/ucode/fw4.uc
+++ b/root/usr/share/ucode/fw4.uc
@@ -2295,7 +2295,7 @@ return {
 
                switch (this.parse_bool(rule.log)) {
                case true:
-                       rule.log = rule.name;
+                       rule.log = `${rule.name}: `;
                        break;
 
                case false:
@@ -2595,7 +2595,7 @@ return {
 
                switch (this.parse_bool(redir.log)) {
                case true:
-                       redir.log = redir.name;
+                       redir.log = `${redir.name}: `;
                        break;
 
                case false:
@@ -2973,6 +2973,9 @@ return {
 
                        mark: [ "mark" ],
 
+                       counter: [ "bool", "1" ],
+                       log: [ "string" ],
+
                        target: [ "target", "masquerade" ]
                });
 
@@ -3013,6 +3016,15 @@ return {
                        return;
                }
 
+               switch (this.parse_bool(snat.log)) {
+               case true:
+                       snat.log = `${snat.name}: `;
+                       break;
+
+               case false:
+                       delete snat.log;
+               }
+
                let add_rule = (family, proto, saddrs, daddrs, raddrs, sport, dport, rport, snat) => {
                        let n = {
                                ...snat,