summaryrefslogtreecommitdiffstats
path: root/src/rule.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-10-29 14:15:14 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-10-29 18:19:28 +0100
commit92abc51d3580dc719fdcbca8d36fdcf5a3751be5 (patch)
tree8eb5df7c0dadd6ea34e45553a6feb30ec8b710ad /src/rule.c
parentbaa4e0e3fa5ff9ad6e3c97b0347ad23058c545d9 (diff)
src: add -y to priority base chain nummerically
By default base chains are printed using default hook priority definitions. Add -y option to print them as numbers. Acked-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r--src/rule.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/rule.c b/src/rule.c
index 33cbf0e2..524db41e 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -946,8 +946,9 @@ int std_prio_lookup(const char *std_prio_name, int family, int hook)
return NF_IP_PRI_LAST;
}
-static const char *prio2str(char *buf, size_t bufsize, int family, int hook,
- int prio, int numeric)
+static const char *prio2str(const struct output_ctx *octx,
+ char *buf, size_t bufsize, int family, int hook,
+ int prio)
{
const struct prio_tag *prio_arr;
const char *std_prio_str;
@@ -963,7 +964,7 @@ static const char *prio2str(char *buf, size_t bufsize, int family, int hook,
arr_size = array_size(std_prios);
}
- if (numeric != NFT_NUMERIC_ALL) {
+ if (!nft_output_numeric_prio(octx)) {
for (i = 0; i < arr_size; ++i) {
std_prio = prio_arr[i].val;
std_prio_str = prio_arr[i].str;
@@ -1004,9 +1005,9 @@ static void chain_print_declaration(const struct chain *chain,
if (chain->dev != NULL)
nft_print(octx, " device %s", chain->dev);
nft_print(octx, " priority %s; policy %s;\n",
- prio2str(priobuf, sizeof(priobuf),
+ prio2str(octx, priobuf, sizeof(priobuf),
chain->handle.family, chain->hooknum,
- chain->priority.num, octx->numeric),
+ chain->priority.num),
chain_policy2str(chain->policy));
}
}
@@ -1035,9 +1036,9 @@ void chain_print_plain(const struct chain *chain, struct output_ctx *octx)
if (chain->flags & CHAIN_F_BASECHAIN) {
nft_print(octx, " { type %s hook %s priority %s; policy %s; }",
chain->type, chain->hookstr,
- prio2str(priobuf, sizeof(priobuf),
+ prio2str(octx, priobuf, sizeof(priobuf),
chain->handle.family, chain->hooknum,
- chain->priority.num, octx->numeric),
+ chain->priority.num),
chain_policy2str(chain->policy));
}
if (nft_output_handle(octx))
@@ -1950,9 +1951,8 @@ static void flowtable_print_declaration(const struct flowtable *flowtable,
nft_print(octx, "%s%shook %s priority %s%s",
opts->tab, opts->tab,
hooknum2str(NFPROTO_NETDEV, flowtable->hooknum),
- prio2str(priobuf, sizeof(priobuf), NFPROTO_NETDEV,
- flowtable->hooknum, flowtable->priority.num,
- octx->numeric),
+ prio2str(octx, priobuf, sizeof(priobuf), NFPROTO_NETDEV,
+ flowtable->hooknum, flowtable->priority.num),
opts->stmt_separator);
nft_print(octx, "%s%sdevices = { ", opts->tab, opts->tab);