Browse code

Merge pull request #33273 from cpuguy83/update_libnet_vendor_17.03

[17.03] Update libnetwork vendor

Kenfe-Mickaƫl Laventure authored on 2017/05/19 05:01:19
Showing 3 changed files
... ...
@@ -23,7 +23,7 @@ github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5
23 23
 github.com/imdario/mergo 0.2.1
24 24
 
25 25
 #get libnetwork packages
26
-github.com/docker/libnetwork ce28404512e8fac9b8103b9072e75cf8d4339302
26
+github.com/docker/libnetwork 57248dc8d53e7b6cf3124db8f22bf8bbf5d363cb
27 27
 github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
28 28
 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
29 29
 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
... ...
@@ -741,7 +741,9 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...
741 741
 
742 742
 	joinCluster(network)
743 743
 	if !c.isDistributedControl() {
744
+		c.Lock()
744 745
 		arrangeIngressFilterRule()
746
+		c.Unlock()
745 747
 	}
746 748
 
747 749
 	return network, nil
... ...
@@ -114,7 +114,10 @@ func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInt
114 114
 		n.portMapper.SetIptablesChain(natChain, n.getNetworkBridgeName())
115 115
 	}
116 116
 
117
-	if err := ensureJumpRule("FORWARD", IsolationChain); err != nil {
117
+	d.Lock()
118
+	err = ensureJumpRule("FORWARD", IsolationChain)
119
+	d.Unlock()
120
+	if err != nil {
118 121
 		return err
119 122
 	}
120 123