diff options
| author | Phil Sutter <phil@nwl.cc> | 2024-01-10 14:08:58 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2024-02-07 00:25:03 +0100 |
| commit | 34f085b1607364f4eaded1140060dcaf965a2649 (patch) | |
| tree | e879529b9648c1fcb8aaa36a27118e32f3ab7082 /iptables/xshared.c | |
| parent | a392cf0e9b11b01352d02e81fbd5ad4da49bce94 (diff) | |
Revert "xshared: Print protocol numbers if --numeric was given"
This reverts commit da8ecc62dd765b15df84c3aa6b83dcb7a81d4ffa.
The patch's original intention is not entirely clear anymore. If it was
to reduce delays involved by calling getprotobynumber() though, commit
b6196c7504d4d ("xshared: Prefer xtables_chain_protos lookup over
getprotoent") avoids those if --numeric flag was given already. Also,
this numeric protocol output did not cover iptables-save which is a more
relevant candidate for such optimizations anyway.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1729
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 0b2724a3..75ab2a63 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -1086,10 +1086,10 @@ void print_rule_details(unsigned int linenum, const struct xt_counters *ctrs, fputc(invflags & XT_INV_PROTO ? '!' : ' ', stdout); - if (((format & (FMT_NUMERIC | FMT_NOTABLE)) == FMT_NUMERIC) || !pname) - printf(FMT("%-4hu ", "%hu "), proto); - else + if (pname) printf(FMT("%-4s ", "%s "), pname); + else + printf(FMT("%-4hu ", "%hu "), proto); } void save_rule_details(const char *iniface, const char *outiface, |