|
 |
c8bceb |
From e3cdea87bc0758ede348be31cd32e69428ed1571 Mon Sep 17 00:00:00 2001
|
|
|
c8bceb |
From: Eric Garver <eric@garver.life>
|
|
|
c8bceb |
Date: Fri, 20 Sep 2019 08:39:05 -0400
|
|
|
c8bceb |
Subject: [PATCH 106/109] fix: Revert "ebtables: drop support for broute table"
|
|
|
c8bceb |
|
|
|
c8bceb |
This reverts commit 0e78dea21ffb03ea2e51df6158471b9cbd6652c9.
|
|
|
c8bceb |
|
|
|
c8bceb |
Apparently there _are_ users of this table. Let's revert this change and
|
|
|
c8bceb |
be a little smarter about not attempting to use the table if it's not
|
|
|
c8bceb |
available (ebtables-nft). We'll still fail if the user has direct rules
|
|
|
c8bceb |
for this table, but at least the default ruleset will work.
|
|
|
c8bceb |
|
|
|
c8bceb |
(cherry picked from commit ca34c9e051807d62371d5e980210f11859cab360)
|
|
|
c8bceb |
(cherry picked from commit b80835f5af8ad5c4c39cc8b78ec5314963926a8f)
|
|
|
c8bceb |
---
|
|
|
c8bceb |
src/firewall-config.in | 4 ++++
|
|
|
c8bceb |
src/firewall/core/ebtables.py | 1 +
|
|
|
c8bceb |
2 files changed, 5 insertions(+)
|
|
|
c8bceb |
|
|
|
c8bceb |
diff --git a/src/firewall-config.in b/src/firewall-config.in
|
|
|
c8bceb |
index 0bb7b05abdad..84c573fc1338 100755
|
|
|
c8bceb |
--- a/src/firewall-config.in
|
|
|
c8bceb |
+++ b/src/firewall-config.in
|
|
|
c8bceb |
@@ -7653,6 +7653,8 @@ class FirewallConfig(object):
|
|
|
c8bceb |
self.directChainDialogTableCombobox.append_text("mangle")
|
|
|
c8bceb |
self.directChainDialogTableCombobox.append_text("raw")
|
|
|
c8bceb |
self.directChainDialogTableCombobox.append_text("security")
|
|
|
c8bceb |
+ else:
|
|
|
c8bceb |
+ self.directChainDialogTableCombobox.append_text("broute")
|
|
|
c8bceb |
|
|
|
c8bceb |
combobox_select_text(self.directChainDialogTableCombobox, old_table)
|
|
|
c8bceb |
|
|
|
c8bceb |
@@ -7807,6 +7809,8 @@ class FirewallConfig(object):
|
|
|
c8bceb |
self.directRuleDialogTableCombobox.append_text("mangle")
|
|
|
c8bceb |
self.directRuleDialogTableCombobox.append_text("raw")
|
|
|
c8bceb |
self.directRuleDialogTableCombobox.append_text("security")
|
|
|
c8bceb |
+ else:
|
|
|
c8bceb |
+ self.directRuleDialogTableCombobox.append_text("broute")
|
|
|
c8bceb |
|
|
|
c8bceb |
combobox_select_text(self.directRuleDialogTableCombobox, old_table)
|
|
|
c8bceb |
|
|
|
c8bceb |
diff --git a/src/firewall/core/ebtables.py b/src/firewall/core/ebtables.py
|
|
|
c8bceb |
index df4c31743cd7..65688571ce31 100644
|
|
|
c8bceb |
--- a/src/firewall/core/ebtables.py
|
|
|
c8bceb |
+++ b/src/firewall/core/ebtables.py
|
|
|
c8bceb |
@@ -31,6 +31,7 @@ from firewall.errors import FirewallError, INVALID_IPV
|
|
|
c8bceb |
import string
|
|
|
c8bceb |
|
|
|
c8bceb |
BUILT_IN_CHAINS = {
|
|
|
c8bceb |
+ "broute": [ "BROUTING" ],
|
|
|
c8bceb |
"nat": [ "PREROUTING", "POSTROUTING", "OUTPUT" ],
|
|
|
c8bceb |
"filter": [ "INPUT", "OUTPUT", "FORWARD" ],
|
|
|
c8bceb |
}
|
|
|
c8bceb |
--
|
|
|
c8bceb |
2.20.1
|
|
|
c8bceb |
|