From: Phil Sutter <phil@nwl.cc>
To: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 7/9] extensions: string: Do not print default --to value
Date: Wed, 8 Jun 2022 18:27:10 +0200 [thread overview]
Message-ID: <20220608162712.31202-8-phil@nwl.cc> (raw)
In-Reply-To: <20220608162712.31202-1-phil@nwl.cc>
Default value is UINT16_MAX, not 0. Fix the conditional printing.
Fixes: c6fbf41cdd157 ("update string match to reflect new kernel implementation (Pablo Neira)")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
extensions/libxt_string.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index 739a8e7fd66b6..da05fad0f59c8 100644
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -269,7 +269,7 @@ string_print(const void *ip, const struct xt_entry_match *match, int numeric)
printf(" ALGO name %s", info->algo);
if (info->from_offset != 0)
printf(" FROM %u", info->from_offset);
- if (info->to_offset != 0)
+ if (info->to_offset != UINT16_MAX)
printf(" TO %u", info->to_offset);
if (revision > 0 && info->u.v1.flags & XT_STRING_FLAG_IGNORECASE)
printf(" ICASE");
@@ -293,7 +293,7 @@ static void string_save(const void *ip, const struct xt_entry_match *match)
printf(" --algo %s", info->algo);
if (info->from_offset != 0)
printf(" --from %u", info->from_offset);
- if (info->to_offset != 0)
+ if (info->to_offset != UINT16_MAX)
printf(" --to %u", info->to_offset);
if (revision > 0 && info->u.v1.flags & XT_STRING_FLAG_IGNORECASE)
printf(" --icase");
--
2.34.1
next prev parent reply other threads:[~2022-06-08 16:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 16:27 [iptables PATCH 0/9] Improve testsuites' code coverage Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 1/9] Makefile: Add --enable-profiling configure option Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 2/9] tests: shell: Add some more rules to 0002-verbose-output_0 Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 3/9] tests: shell: Extend iptables-xml test a bit Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 4/9] tests: shell: Extend zero counters test a bit further Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 5/9] extensions: libebt_standard.t: Test logical-{in,out} as well Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 6/9] ebtables-restore: Deny --init-table Phil Sutter
2022-06-08 16:27 ` Phil Sutter [this message]
2022-06-08 16:27 ` [iptables PATCH 8/9] extensions: string: Review parse_string() function Phil Sutter
2022-06-08 16:27 ` [iptables PATCH 9/9] extensions: string: Fix and enable tests Phil Sutter
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=20220608162712.31202-8-phil@nwl.cc \
--to=phil@nwl.cc \
--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).