From 3e038be5915f6644432a453ee563b73ab831ccec Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Mon, 3 Aug 2015 16:37:01 -0700 Subject: [PATCH] Fix preallocated bridge networks - Because of a bug, all the statically preallocated bridge networks have /24 as network mask. Signed-off-by: Alessandro Boch Upstream-commit: dab0447ae0c6d1355cf4708743973121cd55462a Component: engine --- components/engine/hack/vendor.sh | 2 +- .../github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/hack/vendor.sh b/components/engine/hack/vendor.sh index 038f0c9d74..9bd10bde12 100755 --- a/components/engine/hack/vendor.sh +++ b/components/engine/hack/vendor.sh @@ -22,7 +22,7 @@ clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://gith clone hg code.google.com/p/gosqlite 74691fb6f837 #get libnetwork packages -clone git github.com/docker/libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db +clone git github.com/docker/libnetwork 78fc31ddc425fb379765c6b7ab5b96748bd8fc08 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/components/engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go b/components/engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go index ac4535adb9..91a9a6bcf1 100644 --- a/components/engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go +++ b/components/engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go @@ -31,9 +31,9 @@ func init() { bridgeNetworks = append(bridgeNetworks, &net.IPNet{IP: []byte{10, byte(i), 42, 1}, Mask: mask}) } // 192.168.[42-44].1/24 - mask[2] = 255 + mask24 := []byte{255, 255, 255, 0} for i := 42; i < 45; i++ { - bridgeNetworks = append(bridgeNetworks, &net.IPNet{IP: []byte{192, 168, byte(i), 1}, Mask: mask}) + bridgeNetworks = append(bridgeNetworks, &net.IPNet{IP: []byte{192, 168, byte(i), 1}, Mask: mask24}) } }