Skip to content

Commit 2605b47

Browse files
committed
Limited bridge netfilter application.
1 parent feeff4f commit 2605b47

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/bridge/setup_bridgenetfiltering.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@ func checkBridgeNetFiltering(config *networkConfiguration, i *bridgeInterface) e
6464
if err != nil {
6565
logrus.Warnf("failed to check %s forwarding: %v", ipVerName, err)
6666
} else if enabled {
67-
enabled, err := getKernelBoolParam(getBridgeNFKernelParam(ipVer))
67+
bridgeName := i.Link.Attrs().Name
68+
enabled, err := getKernelBoolParam(getBridgeNFKernelParam(ipVer, bridgeName))
6869
if err != nil || enabled {
6970
return err
7071
}
71-
return setKernelBoolParam(getBridgeNFKernelParam(ipVer), true)
72+
return setKernelBoolParam(getBridgeNFKernelParam(ipVer, bridgeName), true)
7273
}
7374
return nil
7475
}
@@ -108,12 +109,12 @@ func getForwardingKernelParam(ipVer ipVersion, iface string) string {
108109

109110
// Get kernel param path saying whether bridged IPv${ipVer} traffic shall be
110111
// passed to ip${ipVer}tables' chains.
111-
func getBridgeNFKernelParam(ipVer ipVersion) string {
112+
func getBridgeNFKernelParam(ipVer ipVersion, bridgeName string) string {
112113
switch ipVer {
113114
case ipv4:
114-
return "/proc/sys/net/bridge/bridge-nf-call-iptables"
115+
return fmt.Sprintf("/sys/class/net/%s/bridge/nf_call_iptables", bridgeName)
115116
case ipv6:
116-
return "/proc/sys/net/bridge/bridge-nf-call-ip6tables"
117+
return fmt.Sprintf("/sys/class/net/%s/bridge/nf_call_ip6tables", bridgeName)
117118
default:
118119
return ""
119120
}

0 commit comments

Comments
 (0)