Skip to content

Revert alternatives #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thaJeztah wants to merge 3 commits into from
Closed

Revert alternatives #2467

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baaf2d8
Revert "Configure iptables forward policy when ip forwarding is enabled"
thaJeztah Oct 11, 2019
57dadfc
Revert "Move hasIPTablesEnabled check into firewall_linux.go"
thaJeztah Oct 11, 2019
2dda361
Revert "controller: Check if IPTables is enabled for arrangeUserFilte…
thaJeztah Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions drivers/bridge/setup_ip_forwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ func setupIPForwarding(enableIPTables bool) error {
if err := configureIPForwarding(true); err != nil {
return fmt.Errorf("Enabling IP forwarding failed: %v", err)
}
}

// Set the default policy on forward chain to drop only if the
// daemon option iptables is not set to false.
if enableIPTables {
// When enabling ip_forward set the default policy on forward chain to
// drop only if the daemon option iptables is not set to false.
if !enableIPTables {
return nil
}
if err := iptables.SetDefaultPolicy(iptables.Filter, "FORWARD", iptables.Drop); err != nil {
if err := configureIPForwarding(false); err != nil {
logrus.Errorf("Disabling IP forwarding failed, %v", err)
Expand Down