diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-02-05 18:18:02 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2019-02-05 18:19:59 +0100 |
| commit | 35b22e82fa62e10950d8e0fa53a755d4abadf346 (patch) | |
| tree | 9eae6b69c634d607d71d9cf5d9caeb02797cf604 /extensions/libebt_stp.c | |
| parent | 148131f20421046fea028e638581e938ec985783 (diff) | |
Revert "ebtables: use extrapositioned negation consistently"
This reverts commit 5f508b76a0cebaf91965ffa678089222e2d47964.
While attempts at unifying syntax between arp-, eb- and iptables-nft
increase the opportunity for more code-sharing, they are problematic
when it comes to compatibility. Accepting the old syntax on input helps,
but due to the fact that neither arptables nor ebtables support --check
command we must expect for users to test existence of a rule by
comparing input with output. If that happens in a script, deviating from
the old syntax in output has a high chance of breaking it.
Therefore revert Florian's patch changing inversion character position
in output and review the old code for consistency - the only thing
changed on top of the actual revert is ebtables' own copy of
print_iface() to make it adhere to the intrapositioned negation scheme
used throughout ebtables.
Added extension tests by the reverted commit have been kept.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'extensions/libebt_stp.c')
| -rw-r--r-- | extensions/libebt_stp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extensions/libebt_stp.c b/extensions/libebt_stp.c index 33e4c8d9..06cf93b8 100644 --- a/extensions/libebt_stp.c +++ b/extensions/libebt_stp.c @@ -307,9 +307,8 @@ static void brstp_print(const void *ip, const struct xt_entry_match *match, for (i = 0; i < STP_NUMOPS; i++) { if (!(stpinfo->bitmask & (1 << i))) continue; - if (stpinfo->invflags & (1 << i)) - printf("! "); - printf("--%s ", brstp_opts[i].name); + printf("--%s %s", brstp_opts[i].name, + (stpinfo->invflags & (1 << i)) ? "! " : ""); if (EBT_STP_TYPE == (1 << i)) { if (stpinfo->type == BPDU_TYPE_CONFIG) printf("%s", BPDU_TYPE_CONFIG_STRING); |