diff --git a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go index 8ee035d6a3..809793ad3c 100644 --- a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go +++ b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go @@ -24,11 +24,11 @@ const ( // getIPVersion gets the IP version in use ( [ipv4], [ipv6] or [ipv4 and ipv6] ) func getIPVersion(config *networkConfiguration) ipVersion { - ipVersion := ipv4 + ipVer := ipv4 if config.AddressIPv6 != nil || config.EnableIPv6 { - ipVersion |= ipv6 + ipVer |= ipv6 } - return ipVersion + return ipVer } func setupBridgeNetFiltering(config *networkConfiguration, i *bridgeInterface) error { diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables.go index 0cfdeec93f..6f4f5fa437 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables.go +++ b/libnetwork/drivers/bridge/setup_ip_tables.go @@ -226,38 +226,37 @@ func setupIPTablesInternal(hostIP net.IP, bridgeIface string, addr *net.IPNet, i natRule := iptRule{table: iptables.Nat, chain: "POSTROUTING", preArgs: []string{"-t", "nat"}, args: natArgs} hpNatRule := iptRule{table: iptables.Nat, chain: "POSTROUTING", preArgs: []string{"-t", "nat"}, args: hpNatArgs} - ipVersion := iptables.IPv4 - + ipVer := iptables.IPv4 if addr.IP.To4() == nil { - ipVersion = iptables.IPv6 + ipVer = iptables.IPv6 } // Set NAT. if ipmasq { - if err := programChainRule(ipVersion, natRule, "NAT", enable); err != nil { + if err := programChainRule(ipVer, natRule, "NAT", enable); err != nil { return err } } if ipmasq && !hairpin { - if err := programChainRule(ipVersion, skipDNAT, "SKIP DNAT", enable); err != nil { + if err := programChainRule(ipVer, skipDNAT, "SKIP DNAT", enable); err != nil { return err } } // In hairpin mode, masquerade traffic from localhost. If hairpin is disabled or if we're tearing down // that bridge, make sure the iptables rule isn't lying around. - if err := programChainRule(ipVersion, hpNatRule, "MASQ LOCAL HOST", enable && hairpin); err != nil { + if err := programChainRule(ipVer, hpNatRule, "MASQ LOCAL HOST", enable && hairpin); err != nil { return err } // Set Inter Container Communication. - if err := setIcc(ipVersion, bridgeIface, icc, enable); err != nil { + if err := setIcc(ipVer, bridgeIface, icc, enable); err != nil { return err } // Set Accept on all non-intercontainer outgoing packets. - return programChainRule(ipVersion, outRule, "ACCEPT NON_ICC OUTGOING", enable) + return programChainRule(ipVer, outRule, "ACCEPT NON_ICC OUTGOING", enable) } func programChainRule(version iptables.IPVersion, rule iptRule, ruleDescr string, insert bool) error {