From 986c647d5ac9bda0633cdeb927bb782d8df02269 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Mon, 28 Apr 2014 17:04:56 -0700 Subject: [PATCH] Fix bridge ip comparison Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) --- daemon/networkdriver/bridge/driver.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index 90782a5824..4828e3b9cf 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -97,8 +97,12 @@ func InitDriver(job *engine.Job) engine.Status { network = addr.(*net.IPNet) // validate that the bridge ip matches the ip specified by BridgeIP if bridgeIP != "" { - if !network.IP.Equal(net.ParseIP(bridgeIP)) { - return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bridgeIP) + bip, _, err := net.ParseCIDR(bridgeIP) + if err != nil { + return job.Error(err) + } + if !network.IP.Equal(bip) { + return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bip) } } }