diff options
| author | Phil Sutter <phil@nwl.cc> | 2022-07-28 12:31:36 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-07-29 11:53:54 +0200 |
| commit | da8ecc62dd765b15df84c3aa6b83dcb7a81d4ffa (patch) | |
| tree | 1f1f4503f9bf6d600fa0fa9921a160af3f45b2e7 /iptables/xshared.c | |
| parent | ba98dc47073b46c3a514039baaddcebecb4e738d (diff) | |
xshared: Print protocol numbers if --numeric was given
This is much trickier than expected: On one hand, proto_to_name() is
used to lookup protocol extensions so must resolve despite FMT_NUMERIC
being set. On the other, --verbose implies --numeric but changing the
output there is probably a bad idea. Luckily the latter situation is
identified by FMT_NOTABLE bit.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xshared.c')
| -rw-r--r-- | iptables/xshared.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/iptables/xshared.c b/iptables/xshared.c index ccec4ff1..69515789 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -1092,10 +1092,10 @@ void print_rule_details(unsigned int linenum, const struct xt_counters *ctrs, fputc(invflags & XT_INV_PROTO ? '!' : ' ', stdout); - if (pname) - printf(FMT("%-4s ", "%s "), pname); - else + if (((format & (FMT_NUMERIC | FMT_NOTABLE)) == FMT_NUMERIC) || !pname) printf(FMT("%-4hu ", "%hu "), proto); + else + printf(FMT("%-4s ", "%s "), pname); } void save_rule_details(const char *iniface, unsigned const char *iniface_mask, |