Merge pull request #670 from aboch/it
Change in bridge/setup_ip_tables.go
This commit is contained in:
commit
5e0beecbdb
|
@ -6,7 +6,6 @@ import (
|
||||||
|
|
||||||
"github.com/Sirupsen/logrus"
|
"github.com/Sirupsen/logrus"
|
||||||
"github.com/docker/libnetwork/iptables"
|
"github.com/docker/libnetwork/iptables"
|
||||||
"github.com/docker/libnetwork/netutils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// DockerChain: DOCKER iptable chain name
|
// DockerChain: DOCKER iptable chain name
|
||||||
|
@ -60,6 +59,8 @@ func setupIPChains(config *configuration) (*iptables.ChainInfo, *iptables.ChainI
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInterface) error {
|
func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInterface) error {
|
||||||
|
var err error
|
||||||
|
|
||||||
d := n.driver
|
d := n.driver
|
||||||
d.Lock()
|
d.Lock()
|
||||||
driverConfig := d.config
|
driverConfig := d.config
|
||||||
|
@ -73,14 +74,9 @@ func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInt
|
||||||
// Pickup this configuraton option from driver
|
// Pickup this configuraton option from driver
|
||||||
hairpinMode := !driverConfig.EnableUserlandProxy
|
hairpinMode := !driverConfig.EnableUserlandProxy
|
||||||
|
|
||||||
addrv4, _, err := netutils.GetIfaceAddr(config.BridgeName)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Failed to setup IP tables, cannot acquire Interface address: %s", err.Error())
|
|
||||||
}
|
|
||||||
ipnet := addrv4.(*net.IPNet)
|
|
||||||
maskedAddrv4 := &net.IPNet{
|
maskedAddrv4 := &net.IPNet{
|
||||||
IP: ipnet.IP.Mask(ipnet.Mask),
|
IP: i.bridgeIPv4.IP.Mask(i.bridgeIPv4.Mask),
|
||||||
Mask: ipnet.Mask,
|
Mask: i.bridgeIPv4.Mask,
|
||||||
}
|
}
|
||||||
if config.Internal {
|
if config.Internal {
|
||||||
if err = setupInternalNetworkRules(config.BridgeName, maskedAddrv4, true); err != nil {
|
if err = setupInternalNetworkRules(config.BridgeName, maskedAddrv4, true); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue