From 84705f15d9b0226fa005cada11cad2ad5aad5179 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Tue, 9 Feb 2016 21:46:50 -0800 Subject: [PATCH] Vendor libnetwork v0.6.1-rc2 - Fixes #20132 #20140 #20019 Signed-off-by: Madhu Venugopal --- hack/vendor.sh | 2 +- vendor/src/github.com/docker/libnetwork/CHANGELOG.md | 5 +++++ .../docker/libnetwork/drivers/bridge/setup_ip_tables.go | 5 ++++- vendor/src/github.com/docker/libnetwork/resolver.go | 1 + vendor/src/github.com/docker/libnetwork/store.go | 3 ++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index a0ea6c2996..c6dfc04e9f 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -29,7 +29,7 @@ clone git github.com/RackSec/srslog 6eb773f331e46fbba8eecb8e794e635e75fc04de clone git github.com/imdario/mergo 0.2.1 #get libnetwork packages -clone git github.com/docker/libnetwork v0.6.1-rc1 +clone git github.com/docker/libnetwork v0.6.1-rc2 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 diff --git a/vendor/src/github.com/docker/libnetwork/CHANGELOG.md b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md index 1735a29938..2c66eaa575 100644 --- a/vendor/src/github.com/docker/libnetwork/CHANGELOG.md +++ b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.6.1-rc2 (2016-02-09) +- Fixes https://github.com/docker/docker/issues/20132 +- Fixes https://github.com/docker/docker/issues/20140 +- Fixes https://github.com/docker/docker/issues/20019 + ## 0.6.1-rc1 (2016-02-05) - Fixes https://github.com/docker/docker/issues/20026 diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go index f5ceed2130..16d61588f3 100644 --- a/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go +++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go @@ -115,7 +115,7 @@ func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInt return iptables.ProgramChain(filterChain, config.BridgeName, hairpinMode, false) }) - n.portMapper.SetIptablesChain(filterChain, n.getNetworkBridgeName()) + n.portMapper.SetIptablesChain(natChain, n.getNetworkBridgeName()) } if err := ensureJumpRule("FORWARD", IsolationChain); err != nil { @@ -148,6 +148,9 @@ func setupIPTablesInternal(bridgeIface string, addr net.Addr, icc, ipmasq, hairp if err := programChainRule(natRule, "NAT", enable); err != nil { return err } + } + + if ipmasq && !hairpin { if err := programChainRule(skipDNAT, "SKIP DNAT", enable); err != nil { return err } diff --git a/vendor/src/github.com/docker/libnetwork/resolver.go b/vendor/src/github.com/docker/libnetwork/resolver.go index 01d3483f08..e0a5e49aad 100644 --- a/vendor/src/github.com/docker/libnetwork/resolver.go +++ b/vendor/src/github.com/docker/libnetwork/resolver.go @@ -229,6 +229,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) { resp, _, err = c.Exchange(query, addr) if err == nil { + resp.Compress = true break } log.Errorf("external resolution failed, %s", err) diff --git a/vendor/src/github.com/docker/libnetwork/store.go b/vendor/src/github.com/docker/libnetwork/store.go index 89248800c9..dbfdaa0371 100644 --- a/vendor/src/github.com/docker/libnetwork/store.go +++ b/vendor/src/github.com/docker/libnetwork/store.go @@ -104,7 +104,8 @@ func (c *controller) getNetworksForScope(scope string) ([]*network, error) { ec := &endpointCnt{n: n} err = store.GetObject(datastore.Key(ec.Key()...), ec) if err != nil { - return nil, fmt.Errorf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err) + log.Warnf("Could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err) + continue } n.epCnt = ec