diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 17:37:47 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-29 15:07:34 +0100 |
commit | a42d2865bc7e96fe63276e22acd523d996aaf0a4 (patch) | |
tree | b0779465bba8cf7562628ae884278fed73963362 /include/nftables/libnftables.h | |
parent | f27fc14cbd3097e98c4d3549ff93c9284134b866 (diff) |
src: Revert --literal, add -S/--service
This is a partial revert of b0f6a45b25dd1 ("src: add --literal option")
which was added during the development cycle before 0.9.1 is released.
After looking at patch: https://patchwork.ozlabs.org/patch/969864/ that
allows to print priority, uid, gid and protocols as numerics, I decided
to revisit this to provide individual options to turn on literal
printing.
What I'm proposing is to provide a good default for everyone, and
provide options to turn on literal/numeric printing.
This patch adds nft_ctx_output_{set,get}_flags() and define two flags to
enable reverse DNS lookups and to print ports as service names.
This patch introduces -S/--services, to print service names as per
/etc/services.
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/nftables/libnftables.h')
-rw-r--r-- | include/nftables/libnftables.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/nftables/libnftables.h b/include/nftables/libnftables.h index dee099f2..321441b0 100644 --- a/include/nftables/libnftables.h +++ b/include/nftables/libnftables.h @@ -33,12 +33,6 @@ enum nft_numeric_level { NFT_NUMERIC_ALL, }; -enum nft_literal_level { - NFT_LITERAL_NONE, - NFT_LITERAL_PORT, - NFT_LITERAL_ADDR, -}; - /** * Possible flags to pass to nft_ctx_new() */ @@ -49,12 +43,19 @@ void nft_ctx_free(struct nft_ctx *ctx); bool nft_ctx_get_dry_run(struct nft_ctx *ctx); void nft_ctx_set_dry_run(struct nft_ctx *ctx, bool dry); + +enum { + NFT_CTX_OUTPUT_REVERSEDNS = (1 << 0), + NFT_CTX_OUTPUT_SERVICE = (1 << 1), +}; + +unsigned int nft_ctx_output_get_flags(struct nft_ctx *ctx); +void nft_ctx_output_set_flags(struct nft_ctx *ctx, unsigned int flags); + enum nft_numeric_level nft_ctx_output_get_numeric(struct nft_ctx *ctx); void nft_ctx_output_set_numeric(struct nft_ctx *ctx, enum nft_numeric_level level); bool nft_ctx_output_get_stateless(struct nft_ctx *ctx); void nft_ctx_output_set_stateless(struct nft_ctx *ctx, bool val); -enum nft_literal_level nft_ctx_output_get_literal(struct nft_ctx *ctx); -void nft_ctx_output_set_literal(struct nft_ctx *ctx, enum nft_literal_level val); unsigned int nft_ctx_output_get_debug(struct nft_ctx *ctx); void nft_ctx_output_set_debug(struct nft_ctx *ctx, unsigned int mask); bool nft_ctx_output_get_handle(struct nft_ctx *ctx); |