From 35b22e82fa62e10950d8e0fa53a755d4abadf346 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 5 Feb 2019 18:18:02 +0100 Subject: 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 Signed-off-by: Florian Westphal --- extensions/libebt_standard.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libebt_standard.t') diff --git a/extensions/libebt_standard.t b/extensions/libebt_standard.t index 72081fd6..0d678fb2 100644 --- a/extensions/libebt_standard.t +++ b/extensions/libebt_standard.t @@ -6,6 +6,6 @@ -d de:ad:be:ef:00:00 -j CONTINUE;=;OK -d de:ad:be:ef:0:00/ff:ff:ff:ff:0:0 -j DROP;-d de:ad:be:ef:00:00/ff:ff:ff:ff:00:00 -j DROP;OK -p ARP -j ACCEPT;=;OK -! -p ARP -j ACCEPT;=;OK +-p ! ARP -j ACCEPT;=;OK -p 0 -j ACCEPT;=;FAIL -! -p 0 -j ACCEPT;=;FAIL +-p ! 0 -j ACCEPT;=;FAIL -- cgit v1.2.3