0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2603 from bboehmke/ipv6_portmapper_chain

Browse source 
Fixed IPv6 portmapper iptables chain initialization
This commit is contained in:
Arko Dasgupta 2020-12-11 10:39:35 -08:00 • committed by GitHub
commit 09be71b900
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnetwork/drivers/bridge/setup_ip_tables.go
View file

@ -178,7 +178,11 @@ func (n *bridgeNetwork) setupIPTables(ipVersion iptables.IPVersion, maskedAddr *
return iptable.ProgramChain(filterChain, config.BridgeName, hairpinMode, false)
})
n.portMapper.SetIptablesChain(natChain, n.getNetworkBridgeName())
if ipVersion == iptables.IPv4 {
n.portMapper.SetIptablesChain(natChain, n.getNetworkBridgeName())
} else {
n.portMapperV6.SetIptablesChain(natChain, n.getNetworkBridgeName())
}
}
d.Lock()

4
libnetwork/iptables/iptables.go
View file

@ -533,8 +533,10 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
}
path := iptablesPath
commandName := "iptables"
if iptable.Version == IPv6 {
path = ip6tablesPath
commandName = "ip6tables"
}
logrus.Debugf("%s, %v", path, args)
@ -542,7 +544,7 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
startTime := time.Now()
output, err := exec.Command(path, args...).CombinedOutput()
if err != nil {
return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
return nil, fmt.Errorf("iptables failed: %s %v: %s (%s)", commandName, strings.Join(args, " "), output, err)
}
return filterOutput(startTime, output, args...), err