dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 17:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use firewaller.IPVersion instead of iptables.IPVersion for gwmode

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-02-14 11:10:41 +00:00
parent 3cbb1ae736
commit b0777be89e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnetwork/drivers/bridge/bridge_linux.go
View File

@@ -402,11 +402,11 @@ func parseErr(label, value, errString string) error {
}
func (n *bridgeNetwork) newFirewallerNetwork(ctx context.Context) (firewaller.Network, error) {
config4, err := makeNetworkConfigFam(n.config.HostIPv4, n.bridge.bridgeIPv4, n.gwMode(iptables.IPv4))
config4, err := makeNetworkConfigFam(n.config.HostIPv4, n.bridge.bridgeIPv4, n.gwMode(firewaller.IPv4))
if err != nil {
return nil, err
}
config6, err := makeNetworkConfigFam(n.config.HostIPv6, n.bridge.bridgeIPv6, n.gwMode(iptables.IPv6))
config6, err := makeNetworkConfigFam(n.config.HostIPv6, n.bridge.bridgeIPv6, n.gwMode(firewaller.IPv6))
if err != nil {
return nil, err
}
@@ -450,10 +450,10 @@ func (n *bridgeNetwork) getNATDisabled() (ipv4, ipv6 bool) {
return n.config.GwModeIPv4.routed(), n.config.GwModeIPv6.routed()
}
func (n *bridgeNetwork) gwMode(v iptables.IPVersion) gwMode {
func (n *bridgeNetwork) gwMode(v firewaller.IPVersion) gwMode {
n.Lock()
defer n.Unlock()
if v == iptables.IPv4 {
if v == firewaller.IPv4 {
return n.config.GwModeIPv4
}
return n.config.GwModeIPv6