* [PATCH nft] src: extend --stateless to suppress output of non-dynamic set elements.
@ 2019-10-20 19:44 Jeremy Sowden
2019-10-21 7:50 ` Jeremy Sowden
0 siblings, 1 reply; 2+ messages in thread
From: Jeremy Sowden @ 2019-10-20 19:44 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Devel
Currently, --stateless only suppresses the output of the contents of
dynamic sets. Extend it to support an optional parameter which may be
`dynamic` (the current behaviour) or `all`. If it is `all`, `nft list`
will also omit the elements of sets which are not marked `dynamic`.
Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1374
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
doc/libnftables.adoc | 7 +++++--
include/nftables.h | 5 +++++
include/nftables/libnftables.h | 1 +
src/main.c | 15 +++++++++++++--
src/rule.c | 3 ++-
5 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/doc/libnftables.adoc b/doc/libnftables.adoc
index ea9626afa101..f32926ac8db1 100644
--- a/doc/libnftables.adoc
+++ b/doc/libnftables.adoc
@@ -99,8 +99,11 @@ NFT_CTX_OUTPUT_REVERSEDNS::
NFT_CTX_OUTPUT_SERVICE::
Print port numbers as services as described in the /etc/services file.
NFT_CTX_OUTPUT_STATELESS::
- If stateless output has been requested, then stateful data is not printed.
- Stateful data refers to those objects that carry run-time data, e.g. the *counter* statement holds packet and byte counter values, making it stateful.
+ If stateless output has been requested, then dynamic stateful data is not printed.
+ Dynamic stateful data refers to those objects that carry run-time data, e.g. the *counter* statement holds packet and byte counter values, making it stateful.
+NFT_CTX_OUTPUT_STATELESS_ALL::
+ If stateless output has been requested, then all stateful data is not printed.
+ Stateful data refers to dynamic stateful data described above and statically defined container objects like sets.
NFT_CTX_OUTPUT_HANDLE::
Upon insertion into the ruleset, some elements are assigned a unique handle for identification purposes.
For example, when deleting a table or chain, it may be identified either by name or handle.
diff --git a/include/nftables.h b/include/nftables.h
index 1ecf5ef5269c..d566989a01ec 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -50,6 +50,11 @@ static inline bool nft_output_stateless(const struct output_ctx *octx)
return octx->flags & NFT_CTX_OUTPUT_STATELESS;
}
+static inline bool nft_output_stateless_all(const struct output_ctx *octx)
+{
+ return octx->flags & NFT_CTX_OUTPUT_STATELESS_ALL;
+}
+
static inline bool nft_output_handle(const struct output_ctx *octx)
{
return octx->flags & NFT_CTX_OUTPUT_HANDLE;
diff --git a/include/nftables/libnftables.h b/include/nftables/libnftables.h
index 7a7a46f3358a..92e0b30ceb87 100644
--- a/include/nftables/libnftables.h
+++ b/include/nftables/libnftables.h
@@ -56,6 +56,7 @@ enum {
NFT_CTX_OUTPUT_NUMERIC_ALL = (NFT_CTX_OUTPUT_NUMERIC_PROTO |
NFT_CTX_OUTPUT_NUMERIC_PRIO |
NFT_CTX_OUTPUT_NUMERIC_SYMBOL),
+ NFT_CTX_OUTPUT_STATELESS_ALL = (1 << 11),
};
unsigned int nft_ctx_output_get_flags(struct nft_ctx *ctx);
diff --git a/src/main.c b/src/main.c
index f77d8a820a02..7b802f59b6ff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -45,7 +45,7 @@ enum opt_vals {
OPT_NUMERIC_TIME = 't',
OPT_INVALID = '?',
};
-#define OPTSTRING "hvcf:iI:jvnsNaeSupypt"
+#define OPTSTRING "hvcf:iI:jvns::NaeSupypt"
static const struct option options[] = {
{
@@ -76,6 +76,7 @@ static const struct option options[] = {
{
.name = "stateless",
.val = OPT_STATELESS,
+ .has_arg = 2,
},
{
.name = "reversedns",
@@ -238,7 +239,17 @@ int main(int argc, char * const *argv)
output_flags |= NFT_CTX_OUTPUT_NUMERIC_TIME;
break;
case OPT_STATELESS:
- output_flags |= NFT_CTX_OUTPUT_STATELESS;
+ if (!optarg || strcmp(optarg, "dynamic") == 0)
+ output_flags |= NFT_CTX_OUTPUT_STATELESS;
+ else if (strcmp(optarg, "all") == 0) {
+ output_flags |= NFT_CTX_OUTPUT_STATELESS;
+ output_flags |= NFT_CTX_OUTPUT_STATELESS_ALL;
+ } else {
+ fprintf(stderr,
+ "invalid stateless parameter `%s'\n",
+ optarg);
+ exit(EXIT_FAILURE);
+ }
break;
case OPT_IP2NAME:
output_flags |= NFT_CTX_OUTPUT_REVERSEDNS;
diff --git a/src/rule.c b/src/rule.c
index 55894cbdb766..827ccb7e5c56 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -538,7 +538,8 @@ static void do_set_print(const struct set *set, struct print_fmt_options *opts,
{
set_print_declaration(set, opts, octx);
- if (set->flags & NFT_SET_EVAL && nft_output_stateless(octx)) {
+ if (nft_output_stateless_all(octx) ||
+ (set->flags & NFT_SET_EVAL && nft_output_stateless(octx))) {
nft_print(octx, "%s}%s", opts->tab, opts->nl);
return;
}
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nft] src: extend --stateless to suppress output of non-dynamic set elements.
2019-10-20 19:44 [PATCH nft] src: extend --stateless to suppress output of non-dynamic set elements Jeremy Sowden
@ 2019-10-21 7:50 ` Jeremy Sowden
0 siblings, 0 replies; 2+ messages in thread
From: Jeremy Sowden @ 2019-10-21 7:50 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Devel
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
On 2019-10-20, at 20:44:03 +0100, Jeremy Sowden wrote:
> Currently, --stateless only suppresses the output of the contents of
> dynamic sets. Extend it to support an optional parameter which may be
> `dynamic` (the current behaviour) or `all`. If it is `all`, `nft
> list` will also omit the elements of sets which are not marked
> `dynamic`.
>
> Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1374
> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> ---
> doc/libnftables.adoc | 7 +++++--
> include/nftables.h | 5 +++++
> include/nftables/libnftables.h | 1 +
> src/main.c | 15 +++++++++++++--
> src/rule.c | 3 ++-
> 5 files changed, 26 insertions(+), 5 deletions(-)
Haven't updated the man-page. Will send out v2 shortly.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-21 7:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-20 19:44 [PATCH nft] src: extend --stateless to suppress output of non-dynamic set elements Jeremy Sowden
2019-10-21 7:50 ` Jeremy Sowden
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.