kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #42503 from thaJeztah/bridge_redundant_list 

libnetwork/bridge: remove unused "others" argument from isolateNetwork()
This commit is contained in:
Justin Cormack 2021-06-10 10:51:19 +01:00 committed by GitHub
parent b57e71941e 508a0979d9
commit 9459423e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libnetwork/drivers/bridge/bridge.go
View File

@ -324,7 +324,7 @@ func (n *bridgeNetwork) getEndpoint(eid string) (*bridgeEndpoint, error) {
// Install/Removes the iptables rules needed to isolate this network
// from each of the other networks
func (n *bridgeNetwork) isolateNetwork(others []*bridgeNetwork, enable bool) error {
func (n *bridgeNetwork) isolateNetwork(enable bool) error {
n.Lock()
thisConfig := n.config
n.Unlock()
@ -673,8 +673,6 @@ func (d *driver) checkConflict(config *networkConfiguration) error {
func (d *driver) createNetwork(config *networkConfiguration) (err error) {
defer osl.InitOSContext()()
networkList := d.getNetworks()
// Initialize handle when needed
d.Lock()
if d.nlh == nil {
@ -714,16 +712,15 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) {
// Add inter-network communication rules.
setupNetworkIsolationRules := func(config *networkConfiguration, i *bridgeInterface) error {
if err := network.isolateNetwork(networkList, true); err != nil {
if err = network.isolateNetwork(networkList, false); err != nil {
if err := network.isolateNetwork(true); err != nil {
if err = network.isolateNetwork(false); err != nil {
logrus.Warnf("Failed on removing the inter-network iptables rules on cleanup: %v", err)
}
return err
}
// register the cleanup function
network.registerIptCleanFunc(func() error {
nwList := d.getNetworks()
return network.isolateNetwork(nwList, false)
return network.isolateNetwork(false)
})
return nil
}