52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
|
From b51aef061378b34fa9544b1af34021d89a76547a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Thu, 26 Jan 2023 03:27:16 +0100
|
||
|
|
Subject: [PATCH] ebtables-translate: Print flush command after parsing is
|
||
|
|
finished
|
||
|
|
|
||
|
|
Otherwise, bad calls like 'ebtables-translate -F -F' produce wrong
|
||
|
|
output instead of an error message.
|
||
|
|
|
||
|
|
Conflict: NA
|
||
|
|
Reference: https://git.netfilter.org/iptables/commit?id=b51aef061378b34fa9544b1af34021d89a76547a
|
||
|
|
|
||
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||
|
|
---
|
||
|
|
iptables/xtables-eb-translate.c | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c
|
||
|
|
index 99347c0c..da7e5e3d 100644
|
||
|
|
--- a/iptables/xtables-eb-translate.c
|
||
|
|
+++ b/iptables/xtables-eb-translate.c
|
||
|
|
@@ -247,13 +247,6 @@ static int do_commandeb_xlate(struct nft_handle *h, int argc, char *argv[], char
|
||
|
|
ret = 1;
|
||
|
|
break;
|
||
|
|
case 'F': /* Flush */
|
||
|
|
- if (p.chain) {
|
||
|
|
- printf("flush chain bridge %s %s\n", p.table, p.chain);
|
||
|
|
- } else {
|
||
|
|
- printf("flush table bridge %s\n", p.table);
|
||
|
|
- }
|
||
|
|
- ret = 1;
|
||
|
|
- break;
|
||
|
|
case 'Z': /* Zero counters */
|
||
|
|
if (c == 'Z') {
|
||
|
|
if ((flags & OPT_ZERO) || (flags & OPT_COMMAND && command != 'L'))
|
||
|
|
@@ -506,6 +499,13 @@ print_zero:
|
||
|
|
|
||
|
|
if (command == 'P') {
|
||
|
|
return 0;
|
||
|
|
+ } else if (command == 'F') {
|
||
|
|
+ if (p.chain) {
|
||
|
|
+ printf("flush chain bridge %s %s\n", p.table, p.chain);
|
||
|
|
+ } else {
|
||
|
|
+ printf("flush table bridge %s\n", p.table);
|
||
|
|
+ }
|
||
|
|
+ ret = 1;
|
||
|
|
} else if (command == 'A') {
|
||
|
|
ret = nft_rule_eb_xlate_add(h, &p, &cs, true);
|
||
|
|
if (!ret)
|
||
|
|
--
|
||
|
|
2.23.0
|