From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Cc: Kyle Bowman <kbowman@cloudflare.com>,
Alex Forster <aforster@cloudflare.com>,
Cloudflare Kernel Team <kernel-team@cloudflare.com>
Subject: [PATCH iptables v2 6/8] extensions: libxt_NFLOG: remove extra space when saving targets with prefixes
Date: Fri, 1 Oct 2021 18:41:40 +0100 [thread overview]
Message-ID: <20211001174142.1267726-7-jeremy@azazel.net> (raw)
In-Reply-To: <20211001174142.1267726-1-jeremy@azazel.net>
When printing out NFLOG targets an extra space was inserted between
`--nflog-prefix` and the prefix itself:
$ sudo /usr/sbin/iptables -A INPUT -j NFLOG --nflog-prefix test
$ sudo /usr/sbin/iptables-save | grep NFLOG
-A INPUT -j NFLOG --nflog-prefix test
^^
Fixes: 73866357e4a7 ("iptables: do not print trailing whitespaces")
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
extensions/libxt_NFLOG.c | 2 +-
extensions/libxt_NFLOG.t | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c
index 2b78e27808f8..6137a68f8cd2 100644
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -83,7 +83,7 @@ static void NFLOG_check(struct xt_fcheck_call *cb)
static void nflog_print(const struct xt_nflog_info *info, char *prefix)
{
if (info->prefix[0] != '\0') {
- printf(" %snflog-prefix ", prefix);
+ printf(" %snflog-prefix", prefix);
xtables_save_string(info->prefix);
}
if (info->group)
diff --git a/extensions/libxt_NFLOG.t b/extensions/libxt_NFLOG.t
index 13bbf2bfc5a5..561ec8c77650 100644
--- a/extensions/libxt_NFLOG.t
+++ b/extensions/libxt_NFLOG.t
@@ -14,8 +14,8 @@
-j NFLOG --nflog-size 4294967295;=;OK
-j NFLOG --nflog-size 4294967296;;FAIL
-j NFLOG --nflog-size -1;;FAIL
--j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;=;OK
--j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;-j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;OK
+-j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;=;OK
+-j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;-j NFLOG --nflog-prefix xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;OK
-j NFLOG --nflog-threshold 1;=;OK
# ERROR: line 13 (should fail: iptables -A INPUT -j NFLOG --nflog-threshold 0
# -j NFLOG --nflog-threshold 0;;FAIL
--
2.33.0
next prev parent reply other threads:[~2021-10-01 17:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 17:41 [PATCH iptables v2 0/8] extensions: libxt_NFLOG: use nft back-end for iptables-nft Jeremy Sowden
2021-10-01 17:41 ` [PATCH iptables v2 1/8] nft: fix indentation error Jeremy Sowden
2021-10-01 17:41 ` [PATCH iptables v2 2/8] extensions: libxt_NFLOG: use nft built-in logging instead of xt_NFLOG Jeremy Sowden
2022-01-18 12:35 ` Florian Westphal
2021-10-01 17:41 ` [PATCH iptables v2 3/8] extensions: libxt_NFLOG: don't truncate log prefix on print/save Jeremy Sowden
2021-10-01 17:41 ` [PATCH iptables v2 4/8] extensions: libxt_NFLOG: disable `--nflog-range` Python test-cases Jeremy Sowden
2021-10-01 17:41 ` [PATCH iptables v2 5/8] extensions: libxt_NFLOG: fix `--nflog-prefix` " Jeremy Sowden
2021-10-01 17:41 ` Jeremy Sowden [this message]
2021-10-01 17:41 ` [PATCH iptables v2 7/8] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT` Jeremy Sowden
2021-10-01 17:41 ` [PATCH iptables v2 8/8] tests: iptables-test: correct misspelt variable Jeremy Sowden
2022-01-16 15:05 ` [PATCH iptables v2 0/8] extensions: libxt_NFLOG: use nft back-end for iptables-nft Jeremy Sowden
2022-01-16 19:08 ` Florian Westphal
2022-01-17 10:40 ` Phil Sutter
2022-01-17 21:54 ` Jeremy Sowden
2022-01-18 1:23 ` Pablo Neira Ayuso
2022-01-18 9:33 ` Jeremy Sowden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211001174142.1267726-7-jeremy@azazel.net \
--to=jeremy@azazel.net \
--cc=aforster@cloudflare.com \
--cc=kbowman@cloudflare.com \
--cc=kernel-team@cloudflare.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).