Merge pull request #46197 from thaJeztah/bridge_nowindows

libnetwork/drivers/bridge: rename some linux-only files

libnetwork/drivers/bridge/bridge.go → libnetwork/drivers/bridge/bridge_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/bridge_test.go → libnetwork/drivers/bridge/bridge_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/interface.go → libnetwork/drivers/bridge/interface_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/interface_test.go → libnetwork/drivers/bridge/interface_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/network_test.go → libnetwork/drivers/bridge/network_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/port_mapping.go → libnetwork/drivers/bridge/port_mapping_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/port_mapping_test.go → libnetwork/drivers/bridge/port_mapping_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_device.go → libnetwork/drivers/bridge/setup_device_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_device_test.go → libnetwork/drivers/bridge/setup_device_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_ip_tables.go → libnetwork/drivers/bridge/setup_ip_tables_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
@@ -401,16 +399,28 @@ func setupInternalNetworkRules(bridgeIface string, addr *net.IPNet, icc, insert
 
 	if addr.IP.To4() != nil {
 		version = iptables.IPv4
-		inDropRule = iptRule{table: iptables.Filter, chain: IsolationChain1, args: []string{
-			"-i", bridgeIface, "!", "-d", addr.String(), "-j", "DROP"}}
-		outDropRule = iptRule{table: iptables.Filter, chain: IsolationChain1, args: []string{
-			"-o", bridgeIface, "!", "-s", addr.String(), "-j", "DROP"}}
+		inDropRule = iptRule{
+			table: iptables.Filter,
+			chain: IsolationChain1,
+			args:  []string{"-i", bridgeIface, "!", "-d", addr.String(), "-j", "DROP"},
+		}
+		outDropRule = iptRule{
+			table: iptables.Filter,
+			chain: IsolationChain1,
+			args:  []string{"-o", bridgeIface, "!", "-s", addr.String(), "-j", "DROP"},
+		}
 	} else {
 		version = iptables.IPv6
-		inDropRule = iptRule{table: iptables.Filter, chain: IsolationChain1, args: []string{
-			"-i", bridgeIface, "!", "-o", bridgeIface, "!", "-d", addr.String(), "-j", "DROP"}}
-		outDropRule = iptRule{table: iptables.Filter, chain: IsolationChain1, args: []string{
-			"!", "-i", bridgeIface, "-o", bridgeIface, "!", "-s", addr.String(), "-j", "DROP"}}
+		inDropRule = iptRule{
+			table: iptables.Filter,
+			chain: IsolationChain1,
+			args:  []string{"-i", bridgeIface, "!", "-o", bridgeIface, "!", "-d", addr.String(), "-j", "DROP"},
+		}
+		outDropRule = iptRule{
+			table: iptables.Filter,
+			chain: IsolationChain1,
+			args:  []string{"!", "-i", bridgeIface, "-o", bridgeIface, "!", "-s", addr.String(), "-j", "DROP"},
+		}
 	}
 
 	if err := programChainRule(version, inDropRule, "DROP INCOMING", insert); err != nil {

libnetwork/drivers/bridge/setup_ip_tables_test.go → libnetwork/drivers/bridge/setup_ip_tables_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_ipv4.go → libnetwork/drivers/bridge/setup_ipv4_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_ipv4_test.go → libnetwork/drivers/bridge/setup_ipv4_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_ipv6.go → libnetwork/drivers/bridge/setup_ipv6_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_ipv6_test.go → libnetwork/drivers/bridge/setup_ipv6_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_verify.go → libnetwork/drivers/bridge/setup_verify_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (

libnetwork/drivers/bridge/setup_verify_test.go → libnetwork/drivers/bridge/setup_verify_linux_test.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (