From: vincent@systemli.org
To: netfilter-devel@vger.kernel.org
Cc: Nick Hainke <vincent@systemli.org>
Subject: [PATCH] treewide: use uint* instead of u_int*
Date: Mon, 16 May 2022 08:47:54 +0200 [thread overview]
Message-ID: <20220516064754.204416-1-vincent@systemli.org> (raw)
In-Reply-To: <Yn/iZyTrZvj++6ZA@orbyte.nwl.cc>
From: Nick Hainke <vincent@systemli.org>
Gcc complains about missing types. Two commits introduced u_int* instead
of uint*. Use uint treewide.
Fixes errors in the form of:
In file included from xtables-legacy-multi.c:5:
xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
| ^~~~~~~~~
| uint16_t
make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1
Fixes: c8f28cc8b841 ("extensions: libxt_conntrack: add support for
specifying port ranges")
Fixes: f647f61f273a ("xtables: Make invflags 16bit wide")
Signed-off-by: Nick Hainke <vincent@systemli.org>
---
extensions/libxt_conntrack.c | 2 +-
iptables/xshared.c | 2 +-
iptables/xshared.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 64018ce1..234085c5 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric,
static void
conntrack_dump_ports(const char *prefix, const char *opt,
- u_int16_t port_low, u_int16_t port_high)
+ uint16_t port_low, uint16_t port_high)
{
if (port_high == 0 || port_low == port_high)
printf(" %s%s %u", prefix, opt, port_low);
diff --git a/iptables/xshared.c b/iptables/xshared.c
index a8512d38..9b5e5b5b 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] =
};
void
-set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
bool invert)
{
if (*options & option)
diff --git a/iptables/xshared.h b/iptables/xshared.h
index 14568bb0..f8212988 100644
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -80,7 +80,7 @@ struct xtables_target;
#define IPT_INV_ARPHRD 0x0800
void
-set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
bool invert);
/**
--
2.36.1
next prev parent reply other threads:[~2022-05-16 6:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-14 16:33 [PATCH iptables 1/2] xtables: fix compilation with musl Nick Hainke
2022-05-14 16:33 ` [PATCH iptables 2/2] xshared: " Nick Hainke
2022-05-14 17:09 ` Phil Sutter
2022-05-16 6:47 ` vincent [this message]
2022-05-16 10:28 ` [PATCH] treewide: use uint* instead of u_int* Jan Engelhardt
2022-05-16 16:16 ` vincent
2022-05-17 8:10 ` Phil Sutter
2022-05-17 8:14 ` Jan Engelhardt
2022-05-18 13:21 ` Phil Sutter
2022-05-31 21:32 ` Nick
2022-05-14 17:04 ` [PATCH iptables 1/2] xtables: fix compilation with musl Phil Sutter
2022-05-14 19:14 ` Maciej Żenczykowski
2022-05-15 12:05 ` Phil Sutter
2022-05-15 13:40 ` Maciej Żenczykowski
2022-05-17 8:17 ` Phil Sutter
2022-05-17 8:22 ` Maciej Żenczykowski
2022-05-15 14:09 ` Florian Westphal
2022-05-15 14:13 ` Maciej Żenczykowski
2022-05-17 8:14 ` Phil Sutter
2022-05-16 6:52 ` Nick
2022-05-16 7:12 ` Maciej Żenczykowski
2022-05-16 16:24 ` [PATCH] " vincent
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=20220516064754.204416-1-vincent@systemli.org \
--to=vincent@systemli.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.